Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-16 02:05:53 +01:00
Code Issues Packages Projects Releases Activity

add memberId to entity_changes to avoid having to resend all changes second time

Browse Source
This commit is contained in:
zadam
2022-01-09 20:16:39 +01:00
parent c448d34a38
commit 7159b13c9d
25 changed files with 11520 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/public/app/setup.js
View File

@@ -21,6 +21,7 @@ function SetupModel() {
this.syncServerHost = ko.observable();
this.syncProxy = ko.observable();
this.password = ko.observable();
this.instanceType = utils.isElectron() ? "desktop" : "server";
@@ -48,19 +49,13 @@ function SetupModel() {
this.finish = async () => {
const syncServerHost = this.syncServerHost();
const syncProxy = this.syncProxy();
const username = this.username();
const password = this.password1();
const password = this.password();
if (!syncServerHost) {
showAlert("Trilium server address can't be empty");
return;
}
if (!username) {
showAlert("Username can't be empty");
return;
}
if (!password) {
showAlert("Password can't be empty");
return;
@@ -70,7 +65,6 @@ function SetupModel() {
const resp = await $.post('api/setup/sync-from-server', {
syncServerHost: syncServerHost,
syncProxy: syncProxy,
username: username,
password: password
});