rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #464 from standardnotes/hotfix/3.3.11

Browse Source 
check backup file version first before importing
This commit is contained in:
Baptiste Grob
2020-09-09 17:34:37 +02:00
committed by GitHub
parent a43d33aa59 990b76324e
commit 7cfa95520b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/directives/views/accountMenu.js
View File

@@ -346,7 +346,7 @@ class AccountMenuCtrl extends PureCtrl {
if (!data) { if (!data) {
return; return;
} }
const version = data?.auth_params?.version || data?.keyParams?.version; const version = data.version || data.auth_params?.version || data?.keyParams?.version;
if (!protocolManager.supportedVersions().includes(version)) { if (!protocolManager.supportedVersions().includes(version)) {
this.setState({ importData: null }); this.setState({ importData: null });
this.alertManager.alert({ text: STRING_IMPORT_FAILED_NEWER_BACKUP }); this.alertManager.alert({ text: STRING_IMPORT_FAILED_NEWER_BACKUP });

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "standard-notes-web", "name": "standard-notes-web",
"version": "3.3.6", "version": "3.3.11",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "standard-notes-web", "name": "standard-notes-web",
"version": "3.3.10", "version": "3.3.11",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"repository": { "repository": {
"type": "git", "type": "git",