zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-22 08:36:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
689 commits 38 branches 306 tags 138 MiB
Commit graph

265 commits

Author SHA1 Message Date
azivner 372cce8f8e fixed "add date" for ckeditor 2017-12-09 14:17:03 -05:00
azivner 5001e7e630 removed summernote 2017-12-09 14:12:56 -05:00
azivner d2a5921489 add links in ckeditor 2017-12-09 14:11:35 -05:00
azivner 7ca043ebc6 Merge branch 'master' into ckeditor 2017-12-09 11:56:36 -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 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 d467fbdff3 better styling of parent list 2017-12-06 20:19:41 -05:00
azivner 0c6521545a fix for cloned notes at root level + better logging 2017-12-06 20:11:45 -05:00
azivner a0bbd8c853 throwException instead of throwing exceptions manually (includes stacktrace) 2017-12-06 19:53:23 -05:00
azivner 33ab709209 spacing between action buttons and pointer cursor 2017-12-04 18:21:57 -05:00
azivner 6546548848 implemented initial setup of the app 2017-12-03 22:29:23 -05:00
azivner 502e5cbbdf Merge branch 'master' into ckeditor 2017-12-03 17:47:40 -05:00
azivner 3a26054619 fixes to recent changes 2017-12-03 17:46:56 -05:00
azivner 34f1eb930c recent notes are reloaded if synced 2017-12-03 10:42:23 -05:00
azivner 28bc443914 using WSS protocol when on HTTPS instead of WS 2017-12-03 10:12:16 -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 7b6ccab894 some fixes for CKEditor 2017-12-02 13:54:16 -05:00
azivner a85bb649cb basic CKEditor integration 2017-12-02 10:37:12 -05:00
azivner 0521deb304 unifying API paths to lower-case 2017-12-01 22:47:23 -05:00
azivner cba9d8b5c1 logging JS errors to backend logs 2017-12-01 22:28:22 -05:00
azivner 07070e2222 grey-scaled loading circles 2017-11-30 23:56:11 -05:00
azivner 0bd5296aa1 multiline style (but still colored) 2017-11-30 23:53:15 -05:00
azivner 7bdf269095 migration now works also in electron 2017-11-30 19:58:00 -05:00
azivner 719f553054 fixed removing from recent notes 2017-11-30 00:08:59 -05:00
azivner 7c7a5f19f5 better algorithm to find note if note path is invalid 2017-11-30 00:02:32 -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 8bd76721ad prefixes are now displayed also in all autocompletes and recent notes 2017-11-29 22:03:03 -05:00
azivner 69f77ac439 update note title in tree real time instead of waiting for save event 2017-11-29 21:13:12 -05:00
azivner 3386cd790e cleaned up images and links which are not used nor supported 2017-11-29 20:47:01 -05:00
azivner a9460957da prototype of executing requests without network calls in electron 2017-11-28 22:01:02 -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 14001f67d8 fix updating note title when switching to another note 2017-11-28 19:38:33 -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 4d95eb0762 some fixes in note moving 2017-11-28 15:17:11 -05:00
azivner 0cab4e3edd CTRL-C CTRL-V now clones the note 2017-11-28 11:36:32 -05:00
azivner 7038636d2e fix setting title 2017-11-28 10:17:30 -05:00
azivner 40a522a9aa alt-l shouldn't bring up edit tree prefix dialog 2017-11-27 18:19:04 -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 8b5988e13c sync fix to prefix and some usability improvements 2017-11-26 23:10:23 -05:00
azivner 37a105db4d fix prefix when renaming note 2017-11-26 22:40:14 -05:00
azivner 160c1c455c initial implementation of tree prefix 2017-11-26 22:34:25 -05:00
azivner b4e6245f7b fix 2017-11-26 21:00:42 -05:00
azivner 9fcafe44d5 fix 2017-11-26 19:56:08 -05:00
azivner a92df38479 tweaks to time values 2017-11-26 17:04:18 -05:00
azivner abb122e2a9 websocket reconnection 2017-11-26 13:22:26 -05:00
azivner 3a30aba42b using bootstrap notify for notifications 2017-11-26 12:56:07 -05:00
azivner 3e6acb17cc sync WS message is now kind of ping - if there's no ping from server we display error message 2017-11-26 08:24:27 -05:00
azivner 8766e9ae4a cleanup of status code 2017-11-25 18:38:29 -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 f799d3076b sync / transaction fixes for recent notes 2017-11-24 00:09:53 -05:00
azivner c72e5ef93b moved search into separate file 2017-11-23 21:10:37 -05:00
azivner 5b2c18dab7 refactoring and check for existing clone in a parent 2017-11-23 20:49:24 -05:00
azivner 45a293e25a simplification of prepareNoteTreeInner 2017-11-23 20:12:39 -05:00
azivner f6aae68063 moved isNewNoteCreated into note_editor 2017-11-23 19:40:47 -05:00
azivner 0ec6d4baa8 simplification of internal structure/methods in note_tree 2017-11-23 19:29:25 -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 b96e434345 fixing encrypt / decrypt subtree 2017-11-22 20:46:42 -05:00
azivner ab433b472e fix broken sending expanded to server 2017-11-22 20:29:22 -05:00
azivner 16818e7583 correctly updating title for all clone nodes 2017-11-22 19:58:56 -05:00
azivner 4e0d83e9de basic ExtClones integration. Other "clones" are now marked as bold when their clone is activated 2017-11-22 19:40:06 -05:00
azivner d7644de666 tree now shows list of different cloned notes 2017-11-21 20:04:06 -05:00
azivner 84a9e9067d notes with multiple parents are now marked with dashed underline 2017-11-21 18:39:56 -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 34b13c7936 electron shortcuts fixes 2017-11-20 23:10:04 -05:00
azivner 4c0315d2bf fix deleting notes 2017-11-19 23:12:39 -05:00
azivner aeeb35101e fixed recent changes 2017-11-19 22:48:07 -05:00
azivner 8a1c477b8a removed glob.allNoteIds which wasn't used anymore 2017-11-19 22:32:59 -05:00
azivner d98a5b6299 more actions on jump to note dialog 2017-11-19 22:31:30 -05:00
azivner c8aaf6085d fixed jump to note 2017-11-19 20:36:13 -05:00
azivner 658f4872af fixed autocomplete 2017-11-19 19:39: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 14787e0283 note expansion fix 2017-11-19 16:43:49 -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 f18d25911b removed notes_parent, instead using notes_tree 2017-11-19 11:28:46 -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 35d5289cca jump to note works with lazy loaded note tree 2017-11-17 22:52:24 -05:00
azivner eb20e1f31f jump to note now has full list of notes 2017-11-17 22:37:11 -05:00
azivner 7b2c79b754 lazy loading of tree 2017-11-17 21:31:54 -05:00
azivner 92027af426 updated icon (solid background) 2017-11-16 22:28:19 -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 c371ffb597 fix browser error 2017-11-16 19:25:27 -05:00
azivner dd5a142fdd hiding protected session dialog when moving over to unprotected note 2017-11-15 00:10:11 -05:00
azivner 9cf935efd1 protect/unprotect subtree 2017-11-15 00:04:26 -05:00
azivner c2ad14ba18 more cleanup 2017-11-14 23:01:23 -05:00
azivner 98a2322b37 refreshing protected session when loading and saving protected notes 2017-11-14 22:50:56 -05:00
azivner 892aa39d46 renamed encryption session timeout to protected session timeout 2017-11-14 22:44:45 -05:00
azivner 4aa70d3574 renamed encryption module to protected_session 2017-11-14 22:36:36 -05:00
azivner b28df3f093 more cleanups 2017-11-14 22:34:33 -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 fbce84e779 added build date & revision 2017-11-13 23:35:23 -05:00
azivner 50b789fc39 server side encryption WIP 2017-11-12 21:40:26 -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 4efa00f36b cosmetic cleanup, mostly in encryption 2017-11-08 22:33:08 -05:00
Adam Zivner d18223deec added missing icon 2017-11-07 18:36:47 -05:00
azivner 3c6287e39f changed icon 2017-11-06 23:52:54 -05:00
azivner 43a6a52ead hide loader only once the initial note is loaded 2017-11-06 22:21:11 -05:00
azivner 0869caa03c added loader to hide ugly loading/repositioning etc. 2017-11-06 20:13:36 -05:00
azivner a73afa9ded fix password change 2017-11-06 19:48:02 -05:00
azivner 8c996a75ef reloading tree now doesn't force note reload 2017-11-05 10:06:49 -05:00
azivner df7a39776d fixed bug with start node when reloading the tree 2017-11-05 09:52:28 -05:00
azivner 3fb30a0b5c persisted recent notes 2017-11-04 23:46:50 -04:00
azivner 30df3cba1c tree utils as a module 2017-11-04 22:18:36 -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 b64ef6311c use native concat instead of own reimplementation 2017-11-04 21:10:19 -04:00
azivner b192336113 fixed unloading the encrypted page after encryption timeout by simply reloading the app completely plus some unrelated refactorings 2017-11-04 21:02:56 -04:00
azivner 9c88fc6060 encryption settings loading moved from tree to encryption module 2017-11-04 19:57:40 -04:00
azivner dfaa59b0a9 clipboard is now owned by note tree 2017-11-04 19:49:26 -04:00
azivner 19c5404d02 "use strict" for all frontend files (backend was done earlier) 2017-11-04 19:38:50 -04:00
azivner 60a3abdea9 status converted to module 2017-11-04 19:35:39 -04:00
azivner ad7803f9dc context menu converted to module 2017-11-04 19:33:39 -04:00
azivner 9880a4d6f6 tree converted to module 2017-11-04 19:28:49 -04:00
azivner e7f0187b29 encryption converted to module 2017-11-04 18:18:55 -04:00
azivner b44c685f23 note converted to module 2017-11-04 17:54:27 -04:00
azivner adc7d15819 link module 2017-11-04 17:07:03 -04:00
azivner 819ae7c4c0 more generic handling of links to note 2017-11-04 17:03:15 -04:00
azivner c723bfc3ac add link converted to module 2017-11-04 14:43:20 -04:00
azivner 979acc8b4a moved dialog scripts into separate folder 2017-11-04 14:35:53 -04:00
azivner 819c01bb04 converted settings to module(s) 2017-11-04 14:31:53 -04:00
azivner fd48a97c6d converted event log to module 2017-11-04 14:02:43 -04:00
azivner 1d0e96a314 converted jump to note to module 2017-11-04 13:59:43 -04:00
azivner 394fd6f527 converted note history to module 2017-11-04 13:55:46 -04:00
azivner 6d82a0e03f converted recent changes to module 2017-11-04 13:39:26 -04:00
azivner af5ecd1869 refactoring recent notes into encapsulated module 2017-11-04 13:21:41 -04:00
azivner 869bccea18 event log now shows full path of notes and works with encryption 2017-11-04 11:44:42 -04:00
azivner ee07d2d2d8 fixes in recent changes and handling encrypted notes 2017-11-04 11:32:05 -04:00
azivner 44cfff09d9 moved all global variables into glob object 2017-11-04 00:05:08 -04:00
azivner 3892666961 added event log dialog 2017-11-03 23:00:35 -04:00
azivner e35c2dd4ad event_log - entity and logging sync info 2017-11-03 22:08:27 -04:00
azivner bd71547258 when reloading tree after sync, decrypt tree items if in encryption context 2017-11-03 21:20:06 -04:00
azivner cf45594d89 don't alert in case of updated note in current editor 2017-11-03 20:50:48 -04:00
azivner 702d47e6b0 initial decallbackization and promisification of frontend 2017-11-03 20:01:32 -04:00
azivner ac0e5ada6e also de-encryption of note history plus bug fixes 2017-11-02 23:55:22 -04:00
azivner 471f7c669d encryption of note history if the note is encrypted 2017-11-02 23:36:58 -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