Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.4' into dev

pull/5509/head
Laurent Cozic 2021-09-29 20:11:40 +01:00
parent e96713d8cf acc5959284
commit 0d3ecffed9
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app-mobile/android/app/build.gradle
View File

@ -141,7 +141,7 @@ android {
applicationId "net.cozic.joplin"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2097650
versionCode 2097651
versionName "2.5.0"
ndk {
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"

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

@ -486,7 +486,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
CURRENT_PROJECT_VERSION = 73;
CURRENT_PROJECT_VERSION = 74;
DEVELOPMENT_TEAM = A9BXAFS6CT;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Joplin/Info.plist;
@ -514,7 +514,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
CURRENT_PROJECT_VERSION = 73;
CURRENT_PROJECT_VERSION = 74;
DEVELOPMENT_TEAM = A9BXAFS6CT;
INFOPLIST_FILE = Joplin/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@ -659,7 +659,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 73;
CURRENT_PROJECT_VERSION = 74;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = A9BXAFS6CT;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -690,7 +690,7 @@
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 73;
CURRENT_PROJECT_VERSION = 74;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = A9BXAFS6CT;
GCC_C_LANGUAGE_STANDARD = gnu11;

1
packages/app-mobile/root.tsx
View File

@ -498,6 +498,7 @@ async function initialize(dispatch: Function) {
let locale = NativeModules.I18nManager.localeIdentifier;
if (!locale) locale = defaultLocale();
Setting.setValue('locale', closestSupportedLocale(locale));
Setting.setValue('sync.target', 0);
Setting.setValue('firstStart', 0);
}

1
packages/lib/BaseApplication.ts
View File

@ -790,6 +790,7 @@ export default class BaseApplication {
Setting.setValue('sync.interval', 3600);
}
Setting.setValue('sync.target', 0);
Setting.setValue('firstStart', 0);
} else {
setLocale(Setting.value('locale'));

2
packages/lib/models/Setting.ts
View File

@ -319,7 +319,7 @@ class Setting extends BaseModel {
},
'sync.target': {
value: 0,
value: 7, // Dropbox
type: SettingItemType.Int,
isEnum: true,
public: true,

4
readme/changelog_android.md
View File

@ -1,5 +1,9 @@
# Joplin Android app changelog
## [android-v2.4.3](https://github.com/laurent22/joplin/releases/tag/android-v2.4.3) - 2021-09-29T18:47:24Z
- Fixed: Fix default sync target (4b39d30)
## [android-v2.4.2](https://github.com/laurent22/joplin/releases/tag/android-v2.4.2) (Pre-release) - 2021-09-22T17:02:37Z
- Improved: Allow disabling any master key, including default or active one (9407efd)