azivner
|
50ff5da947
|
per-browser source id so we support having notecase opened in multiple tabs/windows
|
2017-12-16 20:48:34 -05:00 |
|
azivner
|
03d86209ca
|
changed order of syncs to maybe improve racing problems
|
2017-12-16 12:30:37 -05:00 |
|
azivner
|
0c0e95b91e
|
fix pulling changes
|
2017-12-16 12:21:56 -05:00 |
|
azivner
|
5b08dfefd3
|
db anonymization implementation
|
2017-12-16 00:05:37 -05:00 |
|
azivner
|
0fbb3f08e5
|
extra sync consistency check for extra sync rows
|
2017-12-15 22:16:28 -05:00 |
|
azivner
|
3132daa466
|
better logging of sync
|
2017-12-15 21:49:46 -05:00 |
|
azivner
|
df69dbb2e1
|
if note doesn't exist we don't try to activate it
|
2017-12-15 21:36:21 -05:00 |
|
azivner
|
6edaf0ed00
|
split hash checks per table with recent notes not reported into frontend as error
|
2017-12-15 21:14:10 -05:00 |
|
azivner
|
206a6dd6e7
|
set last synced push to avoid full sync after DB upgrade
|
2017-12-14 23:38:03 -05:00 |
|
azivner
|
6e783f4686
|
success log message if all consistency checks pass
|
2017-12-14 23:30:38 -05:00 |
|
azivner
|
612c7d9144
|
more cleanups
|
2017-12-14 23:28:50 -05:00 |
|
azivner
|
92992a3e2a
|
cleanup inconsistencies from prod DB. Show error message on frontend in case of inconsistencies
|
2017-12-14 23:21:03 -05:00 |
|
azivner
|
2e11494cac
|
filling up missing sync rows
|
2017-12-14 22:47:55 -05:00 |
|
azivner
|
d1329de760
|
implemented consistency checks
|
2017-12-14 22:16:26 -05:00 |
|
azivner
|
581f406a24
|
sql console implementation
|
2017-12-14 20:38:56 -05:00 |
|
azivner
|
45fba6d7f8
|
save sync records even if sync isn't configured, but don't put them as outstanding pushes (should be still available for pulls)
|
2017-12-14 07:57:31 -05:00 |
|
azivner
|
55bf903623
|
fix storing date_modified for note
|
2017-12-13 23:27:02 -05:00 |
|
azivner
|
b0cbe91784
|
implementation of forcing full (re)sync
|
2017-12-13 23:03:48 -05:00 |
|
azivner
|
17c90262c2
|
create sync records only if sync is configured. This will prevent sync conflicts after document fork.
|
2017-12-13 20:34:21 -05:00 |
|
azivner
|
643069e8d6
|
sync check failure is now shown as error message in frontend
|
2017-12-12 23:47:17 -05:00 |
|
azivner
|
64e8777ed5
|
small clarification of the sync logs
|
2017-12-12 23:39:02 -05:00 |
|
azivner
|
f71d71104a
|
set db as ready only if migration fully succeeded
|
2017-12-12 23:35:41 -05:00 |
|
azivner
|
c24d9a0afa
|
added search for electron + sourcemap for jquery
|
2017-12-12 21:40:55 -05:00 |
|
azivner
|
f68ffe1581
|
fixes for dates in sync
|
2017-12-10 15:45:17 -05:00 |
|
azivner
|
cba457bd61
|
using ISO8601 format instead of custom
|
2017-12-10 15:31:43 -05:00 |
|
azivner
|
021f02bd8c
|
converted all timestamps to string representation
|
2017-12-10 12:56:59 -05:00 |
|
azivner
|
e3b708c322
|
expanding server request timeout for long tree requests
|
2017-12-10 00:02:13 -05:00 |
|
azivner
|
f55f0a4ed3
|
make sure entity IDs are generated only with alphanumeric characters (base62)
|
2017-12-09 20:44:06 -05:00 |
|
azivner
|
d2a5921489
|
add links in ckeditor
|
2017-12-09 14:11:35 -05:00 |
|
azivner
|
4187ff36fb
|
generating all IDs with secure method (important now since it's used as salt for encryption)
|
2017-12-07 22:57:39 -05:00 |
|
azivner
|
b81f1ed93a
|
fix saving history for encrypted notes
|
2017-12-06 23:39:43 -05:00 |
|
azivner
|
6fad30e9af
|
renamed start_note_tree_id option to startNotePath
|
2017-12-06 23:15:53 -05:00 |
|
azivner
|
f1256423ac
|
fix handling of note history - when saving note history we save previous state, not current
|
2017-12-06 22:31:28 -05:00 |
|
azivner
|
4f47c4d6e9
|
better fix for migration in electron + electron upgrade to 1.8.2 beta 3
|
2017-12-06 21:15:46 -05:00 |
|
azivner
|
bbd1774815
|
fix migration in electron build
|
2017-12-06 20:58:59 -05:00 |
|
azivner
|
a0bbd8c853
|
throwException instead of throwing exceptions manually (includes stacktrace)
|
2017-12-06 19:53:23 -05:00 |
|
azivner
|
a7831ebfcd
|
log data dir location
|
2017-12-06 19:42:23 -05:00 |
|
azivner
|
3789ead2da
|
creating new starting page when creating database
|
2017-12-04 00:17:08 -05:00 |
|
azivner
|
6546548848
|
implemented initial setup of the app
|
2017-12-03 22:29:23 -05:00 |
|
azivner
|
a3f57622ff
|
distinguishing between when DB is just connected and when it's ready for queries (validated)
|
2017-12-03 19:18:33 -05:00 |
|
azivner
|
15faefe8a3
|
recent notes are now keyed by note tree id which simplifies things
|
2017-12-03 10:06:53 -05:00 |
|
azivner
|
119d085856
|
export subtree to filesystem
|
2017-12-02 21:48:22 -05:00 |
|
azivner
|
cba9d8b5c1
|
logging JS errors to backend logs
|
2017-12-01 22:28:22 -05:00 |
|
azivner
|
02e5d20d44
|
https support (with custom ca) for sync
|
2017-12-01 20:39:48 -05:00 |
|
azivner
|
ff3f14c3e2
|
websocket requires logged in session in upgrade request
|
2017-11-30 23:50:42 -05:00 |
|
azivner
|
5f3a11af47
|
even though trilium APIs are still exposed in electron, they require login if not called directly from electron
|
2017-11-30 23:29:21 -05:00 |
|
azivner
|
81719f84a0
|
not creating note history immediatelly after creating a note since it's empty at that point which is useless
|
2017-11-30 22:49:40 -05:00 |
|
azivner
|
471821ebe5
|
separated electron routing into separate file
|
2017-11-30 20:51:35 -05:00 |
|
azivner
|
7bdf269095
|
migration now works also in electron
|
2017-11-30 19:58:00 -05:00 |
|
azivner
|
d0a0366b05
|
more complete support for network-less electron frontend-backend communication including protected session
|
2017-11-29 23:30:35 -05:00 |
|
azivner
|
e6629b2c93
|
cosmetic sync related changes
|
2017-11-29 21:04:30 -05:00 |
|
azivner
|
6d603eda86
|
drop links and images tables
|
2017-11-29 20:48:58 -05:00 |
|
azivner
|
3386cd790e
|
cleaned up images and links which are not used nor supported
|
2017-11-29 20:47:01 -05:00 |
|
azivner
|
d019d0a690
|
Merge branch 'master' into stable
|
2017-11-29 20:30:56 -05:00 |
|
azivner
|
e47027cbef
|
recent notes are kept only for one day
|
2017-11-29 20:30:47 -05:00 |
|
azivner
|
54c0ff15b3
|
using server.method() instead of direct call to $.ajax - preparation for electron without network requests
|
2017-11-28 20:52:38 -05:00 |
|
azivner
|
cd90200272
|
fixed sync
|
2017-11-28 18:33:23 -05:00 |
|
azivner
|
91c2f9e7cb
|
websocket stuff separated into messaging.js
|
2017-11-28 17:52:47 -05:00 |
|
azivner
|
3d84f5c3b0
|
synchronization of transactions using promise so only one can be active
|
2017-11-28 17:24:08 -05:00 |
|
azivner
|
fd764f6163
|
separate DB connection for each transaction (just for the record, will be reverted probably)
|
2017-11-28 17:04:47 -05:00 |
|
azivner
|
b809971fd1
|
using dotted underlining for cloned notes because dashed looks ugly in chrome
|
2017-11-27 18:16:42 -05:00 |
|
azivner
|
1231e02449
|
show 0 changes to sync for instances without configured sync
|
2017-11-26 23:16:47 -05:00 |
|
azivner
|
8b5988e13c
|
sync fix to prefix and some usability improvements
|
2017-11-26 23:10:23 -05:00 |
|
azivner
|
160c1c455c
|
initial implementation of tree prefix
|
2017-11-26 22:34:25 -05:00 |
|
azivner
|
cb31e0acf2
|
broadcast messages to all clients, send also number of outstanding syncs
|
2017-11-25 18:31:38 -05:00 |
|
azivner
|
992238f0b3
|
websocket reimplementation of status requests
|
2017-11-25 17:43:05 -05:00 |
|
azivner
|
f433b30089
|
removed audit_log
|
2017-11-24 20:51:44 -05:00 |
|
azivner
|
1a36daa088
|
sync fixes
|
2017-11-23 23:54:54 -05:00 |
|
azivner
|
acba72ec4c
|
cloning in context menu (copy & paste) and a lot of related refactoring and fixes
|
2017-11-22 23:16:54 -05:00 |
|
azivner
|
c1fca4764b
|
fixed password change (broken since migration to CBC encryption)
|
2017-11-22 20:57:06 -05:00 |
|
azivner
|
705aff93ec
|
fix undefined variable
|
2017-11-22 20:36:07 -05:00 |
|
azivner
|
5cec7a497b
|
fix pulling recent notes by note path (which contains '/' so needs to be escaped)
|
2017-11-21 22:18:37 -05:00 |
|
azivner
|
79a803ccc9
|
added content hash check
|
2017-11-21 22:11:27 -05:00 |
|
azivner
|
163a03663f
|
app info is now logged after startup
|
2017-11-21 00:25:53 -05:00 |
|
azivner
|
a3030f845b
|
unified SQL syntax to uppercase
|
2017-11-20 23:51:28 -05:00 |
|
azivner
|
51ad89ce63
|
Merge branch 'stable'
|
2017-11-20 23:37:27 -05:00 |
|
azivner
|
b998c936ba
|
don't save backups with colons in filenames, doesn't work on windows
|
2017-11-20 19:43:48 -05:00 |
|
azivner
|
3a55d08152
|
don't save backups with colons in filenames, doesn't work on windows
|
2017-11-20 19:38:30 -05:00 |
|
azivner
|
4c0315d2bf
|
fix deleting notes
|
2017-11-19 23:12:39 -05:00 |
|
azivner
|
e992087720
|
recovery if note path changes, plus change of note path after note move
|
2017-11-19 18:16:50 -05:00 |
|
azivner
|
3610926804
|
adding clone from recent notes dialog
|
2017-11-19 16:35:35 -05:00 |
|
azivner
|
00151beded
|
fixed recent notes
|
2017-11-19 12:06:48 -05:00 |
|
azivner
|
b22eb2db1e
|
support for note path
|
2017-11-19 08:47:22 -05:00 |
|
azivner
|
cc3c9d6428
|
parent-child relationship is now stored in notes_parent table
|
2017-11-18 18:57:50 -05:00 |
|
azivner
|
9a819cafed
|
sync changes for note_tree_id and fixed recent notes
|
2017-11-18 17:17:46 -05:00 |
|
azivner
|
5fb94fcbbd
|
notes_tree now has note_tree_id so we stricly distinguish between working on notes or note trees
|
2017-11-18 17:05:50 -05:00 |
|
azivner
|
dec9cad106
|
cleaned up "CBC" from methods since we don't have CTR
|
2017-11-18 12:53:17 -05:00 |
|
azivner
|
6b226a319c
|
cleaned up old CTR encryption methods
|
2017-11-18 12:48:54 -05:00 |
|
azivner
|
2f2969b2a1
|
all DB operations now wait for DB connection
|
2017-11-17 19:09:51 -05:00 |
|
azivner
|
c4a9aaa52d
|
fix error when saving unprotected notes
|
2017-11-17 18:56:52 -05:00 |
|
azivner
|
e53926738c
|
sync fixes
|
2017-11-16 22:18:25 -05:00 |
|
azivner
|
b2d1ca1c28
|
we now remember past source ids so app restart won't change anything in sync operation
|
2017-11-16 21:50:00 -05:00 |
|
azivner
|
9e7fcdfe15
|
experimental implementation of sync toggle
|
2017-11-16 20:08:04 -05:00 |
|
azivner
|
7e3fd2f63e
|
added app and db versions to about dialog in settings
|
2017-11-16 20:03:44 -05:00 |
|
azivner
|
fed1cab2c9
|
F5 now reloads and ctrl-shift-i shows up dev tools
|
2017-11-16 19:43:34 -05:00 |
|
azivner
|
379431eefd
|
fixed encryption of note history
|
2017-11-16 00:22:00 -05:00 |
|
azivner
|
c190c738a2
|
data key is not encrypted with aes-cbc as well
|
2017-11-15 23:39:50 -05:00 |
|
azivner
|
5313ac47e6
|
changing from AES-256-CTR to AES-128-CBC for note encryption
|
2017-11-15 22:13:45 -05:00 |
|
azivner
|
2533b8e121
|
use native node crypto for sha256
|
2017-11-15 18:23:19 -05:00 |
|
azivner
|
9cf935efd1
|
protect/unprotect subtree
|
2017-11-15 00:04:26 -05:00 |
|
azivner
|
892aa39d46
|
renamed encryption session timeout to protected session timeout
|
2017-11-14 22:44:45 -05:00 |
|
azivner
|
0a0421ec7e
|
note history decryption now works, more cleanup
|
2017-11-14 22:21:56 -05:00 |
|
azivner
|
ff411f00b1
|
server side WIP - saving encrypted note now works, changing terminology of "encrypted note" to "protected note"
|
2017-11-14 21:54:12 -05:00 |
|
azivner
|
c18799b938
|
Merge branch 'stable'
|
2017-11-13 23:42:23 -05:00 |
|
azivner
|
82614c1c73
|
fix build script
|
2017-11-13 23:41:44 -05:00 |
|
azivner
|
fbce84e779
|
added build date & revision
|
2017-11-13 23:35:23 -05:00 |
|
azivner
|
f9056c6754
|
proxy support
|
2017-11-13 19:45:13 -05:00 |
|
azivner
|
ec49bf0cca
|
server side encryption WIP
|
2017-11-10 22:55:19 -05:00 |
|
azivner
|
8f1eedfe0d
|
refactoring of password change and preparations for server side encryption
|
2017-11-09 23:25:23 -05:00 |
|
azivner
|
433982e7bc
|
- changing note parent must change date_modified otherwise it will trigger a conflict
- when syncing note tree we don't overwrite is_expanded status
|
2017-11-09 21:11:33 -05:00 |
|
azivner
|
a3b2e705ce
|
refactoring of sync code
|
2017-11-09 20:52:47 -05:00 |
|
azivner
|
5d5ea6a5c2
|
configurable sync timeout
|
2017-11-09 20:06:33 -05:00 |
|
azivner
|
4efa00f36b
|
cosmetic cleanup, mostly in encryption
|
2017-11-08 22:33:08 -05:00 |
|
azivner
|
a73afa9ded
|
fix password change
|
2017-11-06 19:48:02 -05:00 |
|
azivner
|
e1251222cc
|
sync fix and more logging
|
2017-11-06 19:23:35 -05:00 |
|
azivner
|
1c501beea9
|
sync debugging tweaks etc.
|
2017-11-05 21:56:42 -05:00 |
|
azivner
|
2a9a8da045
|
sync fixes
|
2017-11-05 20:37:25 -05:00 |
|
azivner
|
ba24281f22
|
fixed bug where migrations were not processed sequentially
|
2017-11-05 18:59:58 -05:00 |
|
azivner
|
b890c9982b
|
some tweaks mainly for electron support
|
2017-11-05 17:58:55 -05:00 |
|
azivner
|
0481b1b79c
|
more granular detection of changes which forces less disruptive realoding. Refactoring of audit functions
|
2017-11-05 10:41:54 -05:00 |
|
azivner
|
ae23f2ea84
|
added sync for recent notes
|
2017-11-05 00:16:02 -04:00 |
|
azivner
|
3fb30a0b5c
|
persisted recent notes
|
2017-11-04 23:46:50 -04:00 |
|
azivner
|
900f169dab
|
tree changes as a module
|
2017-11-04 22:10:41 -04:00 |
|
azivner
|
68c2edea45
|
better reporting of sync error when "sync now"
|
2017-11-04 21:21:09 -04:00 |
|
azivner
|
e35c2dd4ad
|
event_log - entity and logging sync info
|
2017-11-03 22:08:27 -04:00 |
|
azivner
|
cf45594d89
|
don't alert in case of updated note in current editor
|
2017-11-03 20:50:48 -04:00 |
|
azivner
|
4073f6a967
|
removed ID from options, opt_name is now new primary key
|
2017-11-02 23:02:35 -04:00 |
|
azivner
|
a7f95e95e9
|
proper syncing of note positions
|
2017-11-02 22:55:22 -04:00 |
|
azivner
|
c3d776ae13
|
sync of options
|
2017-11-02 20:48:02 -04:00 |
|
azivner
|
40e27cd6f7
|
removed id from notes_history, new primary key is note_history_id
|
2017-11-02 19:23:52 -04:00 |
|
azivner
|
9e3515b122
|
fixed sync bug
|
2017-11-01 23:39:17 -04:00 |
|
azivner
|
a5735961a4
|
don't push changes to server which have been pulled from it
|
2017-11-01 23:16:21 -04:00 |
|
azivner
|
1cf247f164
|
more fine grained handling of conflicts without having to reload whole page most of the time
|
2017-11-01 22:36:26 -04:00 |
|
azivner
|
962c078bbc
|
number of sync changes to push next to "sync now" button
|
2017-11-01 20:31:44 -04:00 |
|
azivner
|
72905a9854
|
sync cleanup
|
2017-11-01 00:47:39 -04:00 |
|
azivner
|
0e8fcbc0f5
|
better error handling / logging of sync events
|
2017-11-01 00:39:07 -04:00 |
|
azivner
|
7af6b69331
|
sync fixes
|
2017-10-31 20:44:32 -04:00 |
|
azivner
|
0df7b0bfcf
|
sync fixes
|
2017-10-31 20:09:07 -04:00 |
|
azivner
|
15abee3ed0
|
incremental pull implementation
|
2017-10-31 19:34:58 -04:00 |
|
azivner
|
43940f1140
|
added sourceId to sync, fixes to sync etc.
|
2017-10-31 00:15:49 -04:00 |
|
azivner
|
d88d562d63
|
created sync table
|
2017-10-30 18:44:26 -04:00 |
|
azivner
|
8630b3685d
|
incremental push sync
|
2017-10-29 22:22:30 -04:00 |
|
azivner
|
de3d1b3e39
|
better transaction handling with rollback on exception
|
2017-10-29 18:50:28 -04:00 |
|
azivner
|
afadd6ec06
|
added date_modified to options as preparation for options syncing
|
2017-10-29 16:14:59 -04:00 |
|
azivner
|
af13b28cab
|
fixes for sync
|
2017-10-29 14:55:48 -04:00 |
|
azivner
|
d613200925
|
"sync now" button
|
2017-10-29 11:22:41 -04:00 |
|
azivner
|
c28b7775a5
|
API auth (untested)
|
2017-10-28 22:17:00 -04:00 |
|
azivner
|
eb6f9f8f81
|
added document_secret as basis for API authentication
|
2017-10-28 19:55:55 -04:00 |
|
azivner
|
724f4b43b7
|
added document_id for sync identification
|
2017-10-28 13:19:12 -04:00 |
|
azivner
|
c5f80051ae
|
backup is now triggered after start of the app and with timer
|
2017-10-28 12:23:11 -04:00 |
|