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

Merge branch 'develop' into fix/subscription-info-display

Browse Source
This commit is contained in:
Antonella Sgarlatta
2021-10-12 17:51:59 -03:00
committed by GitHub
parent 7bed9a52f7 e856ce7bfd
commit 821891d2bc
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/directives/views/revisionPreviewModal.ts
View File

@@ -102,7 +102,7 @@ class RevisionPreviewModalCtrl extends PureViewCtrl implements RevisionPreviewSc
}); });
} else { } else {
this.application.changeAndSaveItem(this.uuid, (mutator) => { this.application.changeAndSaveItem(this.uuid, (mutator) => {
mutator.setContent(this.content); mutator.unsafe_setCustomContent(this.content);
}, true, PayloadSource.RemoteActionRetrieved); }, true, PayloadSource.RemoteActionRetrieved);
} }
this.dismiss(); this.dismiss();

4
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "standard-notes-web", "name": "standard-notes-web",
"version": "3.8.22", "version": "3.8.25",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -73,7 +73,7 @@
"@reach/listbox": "^0.16.1", "@reach/listbox": "^0.16.1",
"@standardnotes/features": "1.6.1", "@standardnotes/features": "1.6.1",
"@standardnotes/sncrypto-web": "1.5.2", "@standardnotes/sncrypto-web": "1.5.2",
"@standardnotes/snjs": "2.14.11", "@standardnotes/snjs": "2.14.13",
"mobx": "^6.3.2", "mobx": "^6.3.2",
"mobx-react-lite": "^3.2.0", "mobx-react-lite": "^3.2.0",
"preact": "^10.5.12", "preact": "^10.5.12",

8
yarn.lock
View File

@@ -2149,10 +2149,10 @@
"@standardnotes/sncrypto-common" "^1.5.2" "@standardnotes/sncrypto-common" "^1.5.2"
libsodium-wrappers "^0.7.8" libsodium-wrappers "^0.7.8"
"@standardnotes/snjs@2.14.11": "@standardnotes/snjs@2.14.13":
version "2.14.11" version "2.14.13"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.14.11.tgz#e80a23df763c44d463fe6b73ea0b12522afad9e7" resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.14.13.tgz#791935559538bf51484159d87651b667dc2dcebd"
integrity sha512-L33rhU/NK2ev+o8QXWbVT7jZtVwIwvNwT46N/3Lv5RQXkY7wa1yxO08NHt4BfHqrmXI3mF5qnBH3mcYoOtBY7A== integrity sha512-nLmP8BvN8zqc7i6mspr2UKhGxdHFZhW0+uUbGu3yjLiMAnfQpxx8pLP9uWdshx+5Cc8cCzCBq+ekA0OZt4UK3Q==
dependencies: dependencies:
"@standardnotes/auth" "3.7.2" "@standardnotes/auth" "3.7.2"
"@standardnotes/common" "1.2.0" "@standardnotes/common" "1.2.0"