self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00
Code Issues Releases Activity

Merge branch 'release-3.4' into dev

Browse Source
This commit is contained in:
Laurent Cozic
2025-10-21 16:36:53 +02:00
parent 98c5a9c096 3d5d82081a
commit 5f6382fbc0
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app-mobile/components/screens/ConfigScreen/ConfigScreen.tsx
View File

@@ -629,7 +629,7 @@ class ConfigScreenComponent extends BaseScreenComponent<ConfigScreenProps, Confi
); );
} }
addSettingLink('donate_link', _('Make a donation'), 'https://joplinapp.org/donate/'); if (Platform.OS !== 'ios') addSettingLink('donate_link', _('Make a donation'), 'https://joplinapp.org/donate/');
addSettingLink('website_link', _('Joplin website'), 'https://joplinapp.org/'); addSettingLink('website_link', _('Joplin website'), 'https://joplinapp.org/');
addSettingLink('privacy_link', _('Privacy Policy'), 'https://joplinapp.org/privacy/'); addSettingLink('privacy_link', _('Privacy Policy'), 'https://joplinapp.org/privacy/');

6
packages/app-mobile/contentScripts/markdownEditorBundle/useWebViewSetup.ts
View File

@@ -61,6 +61,12 @@ const useWebViewSetup = ({
// Since the editor content is included in editorOptions, for large documents, // Since the editor content is included in editorOptions, for large documents,
// creating the initial injected JS is potentially expensive. // creating the initial injected JS is potentially expensive.
afterLoadFinishedJs.current = () => ` afterLoadFinishedJs.current = () => `
if (typeof window.markdownEditorBundle === 'undefined') {
${shim.injectedJs('markdownEditorBundle')};
window.markdownEditorBundle = markdownEditorBundle;
markdownEditorBundle.setUpLogger();
}
if (!window.cm) { if (!window.cm) {
const parentClassName = ${JSON.stringify(editorOptions?.parentElementOrClassName)}; const parentClassName = ${JSON.stringify(editorOptions?.parentElementOrClassName)};
const foundParent = !!parentClassName && document.getElementsByClassName(parentClassName).length > 0; const foundParent = !!parentClassName && document.getElementsByClassName(parentClassName).length > 0;

8
packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
View File

@@ -535,7 +535,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements; CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
CURRENT_PROJECT_VERSION = 145; CURRENT_PROJECT_VERSION = 146;
DEVELOPMENT_TEAM = A9BXAFS6CT; DEVELOPMENT_TEAM = A9BXAFS6CT;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = Joplin/Info.plist; INFOPLIST_FILE = Joplin/Info.plist;
@@ -570,7 +570,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements; CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
CURRENT_PROJECT_VERSION = 145; CURRENT_PROJECT_VERSION = 146;
DEVELOPMENT_TEAM = A9BXAFS6CT; DEVELOPMENT_TEAM = A9BXAFS6CT;
INFOPLIST_FILE = Joplin/Info.plist; INFOPLIST_FILE = Joplin/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.6; IPHONEOS_DEPLOYMENT_TARGET = 15.6;
@@ -771,7 +771,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements; CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 145; CURRENT_PROJECT_VERSION = 146;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = A9BXAFS6CT; DEVELOPMENT_TEAM = A9BXAFS6CT;
GCC_C_LANGUAGE_STANDARD = gnu11; GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -814,7 +814,7 @@
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements; CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 145; CURRENT_PROJECT_VERSION = 146;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = A9BXAFS6CT; DEVELOPMENT_TEAM = A9BXAFS6CT;
GCC_C_LANGUAGE_STANDARD = gnu11; GCC_C_LANGUAGE_STANDARD = gnu11;

2
packages/lib/WebDavApi.js
View File

@@ -350,7 +350,7 @@ class WebDavApi {
// https://github.com/facebook/react-native/issues/30176 // https://github.com/facebook/react-native/issues/30176
if (!headers['Content-Type']) { if (!headers['Content-Type']) {
if (method === 'PROPFIND') headers['Content-Type'] = 'text/xml'; if (method === 'PROPFIND') headers['Content-Type'] = 'text/xml';
if (method === 'PUT') headers['Content-Type'] = 'text/plain'; if (method === 'PUT') headers['Content-Type'] = 'application/octet-stream';
} }
// React-native has caching enabled by at least on Android (see https://github.com/laurent22/joplin/issues/4706 and the related PR). // React-native has caching enabled by at least on Android (see https://github.com/laurent22/joplin/issues/4706 and the related PR).

5
readme/about/changelog/ios.md
View File

@@ -1,5 +1,10 @@
# Joplin iOS Changelog # Joplin iOS Changelog
## [ios-v13.4.4](https://github.com/laurent22/joplin/releases/tag/ios-v13.4.4) - 2025-10-21T14:16:55Z
- Improved: Removed donation link since Apple is blocking the release because of this (cff96b1)
- Fixed: Change default content-type for Webdav connector to application/octet-stream (#13053) (#12249 by [@pedr](https://github.com/pedr))
## [ios-v13.4.3](https://github.com/laurent22/joplin/releases/tag/ios-v13.4.3) - 2025-09-09T08:25:07Z ## [ios-v13.4.3](https://github.com/laurent22/joplin/releases/tag/ios-v13.4.3) - 2025-09-09T08:25:07Z
- Fixed: Fix "scan notebook" tool on iOS (#13114) (#13111 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator)) - Fixed: Fix "scan notebook" tool on iOS (#13114) (#13111 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))