self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

All: Add mechanism to lock and upgrade sync targets (#3524)

Browse Source
This commit is contained in:
Laurent
2020-08-02 12:28:50 +01:00
committed by GitHub
parent 88f22fabf7
commit 0c147236a3
138 changed files with 3686 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReactNativeClient/lib/models/Setting.js
View File

@ -86,6 +86,12 @@ class Setting extends BaseModel {
},
},
'sync.upgradeState': {
value: Setting.SYNC_UPGRADE_STATE_IDLE,
type: Setting.TYPE_INT,
public: false,
},
'sync.2.path': {
value: '',
type: Setting.TYPE_STRING,
@ -1324,6 +1330,10 @@ Setting.SHOULD_REENCRYPT_NO = 0; // Data doesn't need to be re-encrypted
Setting.SHOULD_REENCRYPT_YES = 1; // Data should be re-encrypted
Setting.SHOULD_REENCRYPT_NOTIFIED = 2; // Data should be re-encrypted, and user has been notified
Setting.SYNC_UPGRADE_STATE_IDLE = 0; // Doesn't need to be upgraded
Setting.SYNC_UPGRADE_STATE_SHOULD_DO = 1; // Should be upgraded, but waiting for user to confirm
Setting.SYNC_UPGRADE_STATE_MUST_DO = 2; // Must be upgraded - on next restart, the upgrade will start
Setting.custom_css_files = {
JOPLIN_APP: 'userchrome.css',
RENDERED_MARKDOWN: 'userstyle.css',
@ -1344,7 +1354,7 @@ Setting.constants_ = {
templateDir: '',
tempDir: '',
flagOpenDevTools: false,
syncVersion: 1,
syncVersion: 2,
};
Setting.autoSaveEnabled = true;