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

Merge branch 'release/3.8.5' into main

Browse Source
This commit is contained in:
Antonella Sgarlatta
2021-06-17 15:51:55 -03:00
parent b214111ff3 25e46ff2f1
commit 2d4969d6df
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/directives/views/accountMenu.ts
View File

@@ -228,8 +228,7 @@ class AccountMenuCtrl extends PureViewCtrl<unknown, AccountMenuState> {
onHostInputChange() { onHostInputChange() {
const url = this.getState().formData.url!; const url = this.getState().formData.url!;
this.application!.setHost(url); this.application!.setCustomHost(url);
this.application!.setNextVersionHost(url);
} }
refreshEncryptionStatus() { refreshEncryptionStatus() {

5
app/assets/javascripts/services/autolock_service.ts
View File

@@ -1,5 +1,4 @@
import { ApplicationService } from '@standardnotes/snjs'; import { ApplicationService } from '@standardnotes/snjs';
import { isDesktopApplication } from '@/utils';
const MILLISECONDS_PER_SECOND = 1000; const MILLISECONDS_PER_SECOND = 1000;
const POLL_INTERVAL = 50; const POLL_INTERVAL = 50;
@@ -18,9 +17,7 @@ export class AutolockService extends ApplicationService {
private lockAfterDate?: Date private lockAfterDate?: Date
onAppLaunch() { onAppLaunch() {
if (!isDesktopApplication()) { this.beginPolling();
this.beginPolling();
}
return super.onAppLaunch(); return super.onAppLaunch();
} }

2
package.json
View File

@@ -71,7 +71,7 @@
"@reach/checkbox": "^0.13.2", "@reach/checkbox": "^0.13.2",
"@reach/dialog": "^0.13.0", "@reach/dialog": "^0.13.0",
"@standardnotes/sncrypto-web": "1.2.10", "@standardnotes/sncrypto-web": "1.2.10",
"@standardnotes/snjs": "2.7.1", "@standardnotes/snjs": "2.7.3",
"mobx": "^6.1.6", "mobx": "^6.1.6",
"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

@@ -1936,10 +1936,10 @@
"@standardnotes/sncrypto-common" "^1.2.7" "@standardnotes/sncrypto-common" "^1.2.7"
libsodium-wrappers "^0.7.8" libsodium-wrappers "^0.7.8"
"@standardnotes/snjs@2.7.1": "@standardnotes/snjs@2.7.3":
version "2.7.1" version "2.7.3"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.1.tgz#e8073942fe9a8f762989ab75df94407b9934ea3e" resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.3.tgz#3b8d4bbcb0d841e02726193c4540d1b11d772249"
integrity sha512-kCZU4Tx6vNYcEeh22ax8Vfr/LYEbgAqI9nSC6jB8MTg6nJzCuh4b/nngW+yVUz91phu156XN0YeMyj7HJ3DWVw== integrity sha512-YzD9/lxUS4nn922gR03/UHL9shqsyqikx+4Ud9v4IqtGEwKpusny4ecKPtvdbot/nedqEKpMZzrqT7xeNiRKqQ==
dependencies: dependencies:
"@standardnotes/auth" "^2.0.0" "@standardnotes/auth" "^2.0.0"
"@standardnotes/sncrypto-common" "^1.2.9" "@standardnotes/sncrypto-common" "^1.2.9"