Commit Graph

  • 17c90262c2 create sync records only if sync is configured. This will prevent sync conflicts after document fork. azivner 2017-12-13 20:34:21 -05:00
  • 2fa57b79fd Merge branch 'master' into stable azivner 2017-12-12 23:57:40 -05:00
  • b7ffc33c94 0.0.2 version azivner 2017-12-12 23:57:26 -05:00
  • 643069e8d6 sync check failure is now shown as error message in frontend azivner 2017-12-12 23:47:17 -05:00
  • 64e8777ed5 small clarification of the sync logs azivner 2017-12-12 23:39:02 -05:00
  • f71d71104a set db as ready only if migration fully succeeded azivner 2017-12-12 23:35:41 -05:00
  • 513689b175 fix azivner 2017-12-12 22:26:40 -05:00
  • 4596d56ae8 fix bug causing non-working autocomplete after creating new note azivner 2017-12-12 22:20:03 -05:00
  • c24d9a0afa added search for electron + sourcemap for jquery azivner 2017-12-12 21:40:55 -05:00
  • bdeaa2829d added doc folder azivner 2017-12-10 23:21:47 -05:00
  • fa8b5d41dd update schema azivner 2017-12-10 22:16:20 -05:00
  • da9b3c420e Merge remote-tracking branch 'origin/master' azivner 2017-12-10 21:46:25 -05:00
  • d025b2b3fb using space-around instead of space-evenly for tree actions because that one is supported in Chrome 59 used in electron azivner 2017-12-10 21:46:12 -05:00
  • 1aca42979e
    licensing under AGPL v3 zadam 2017-12-10 21:13:39 -05:00
  • 8a3ea412f9 use protect/unprotect terminology in button azivner 2017-12-10 15:47:21 -05:00
  • f68ffe1581 fixes for dates in sync azivner 2017-12-10 15:45:17 -05:00
  • cba457bd61 using ISO8601 format instead of custom azivner 2017-12-10 15:31:43 -05:00
  • 021f02bd8c converted all timestamps to string representation azivner 2017-12-10 12:56:59 -05:00
  • e3b708c322 expanding server request timeout for long tree requests azivner 2017-12-10 00:02:13 -05:00
  • 2fdd4c37e5 using change event instead of changesDone because the latter seems to trigger also on e.g. just selection azivner 2017-12-09 21:56:48 -05:00
  • 7483f11d10 more consistent handling of tree data structures when creating new note azivner 2017-12-09 21:53:21 -05:00
  • 3abbe2d970 realoding tree after deletion (too many changes in data model) azivner 2017-12-09 21:42:22 -05:00
  • f55f0a4ed3 make sure entity IDs are generated only with alphanumeric characters (base62) azivner 2017-12-09 20:44:06 -05:00
  • 372cce8f8e fixed "add date" for ckeditor azivner 2017-12-09 14:17:03 -05:00
  • 5001e7e630 removed summernote azivner 2017-12-09 14:12:56 -05:00
  • d2a5921489 add links in ckeditor azivner 2017-12-09 14:11:35 -05:00
  • 7ca043ebc6 Merge branch 'master' into ckeditor azivner 2017-12-09 11:56:36 -05:00
  • 4187ff36fb generating all IDs with secure method (important now since it's used as salt for encryption) azivner 2017-12-07 22:57:39 -05:00
  • b81f1ed93a fix saving history for encrypted notes azivner 2017-12-06 23:39:43 -05:00
  • 6fad30e9af renamed start_note_tree_id option to startNotePath azivner 2017-12-06 23:15:53 -05:00
  • f1256423ac fix handling of note history - when saving note history we save previous state, not current azivner 2017-12-06 22:31:28 -05:00
  • 4f47c4d6e9 better fix for migration in electron + electron upgrade to 1.8.2 beta 3 azivner 2017-12-06 21:15:46 -05:00
  • bbd1774815 fix migration in electron build azivner 2017-12-06 20:58:59 -05:00
  • d467fbdff3 better styling of parent list azivner 2017-12-06 20:19:41 -05:00
  • 0c6521545a fix for cloned notes at root level + better logging azivner 2017-12-06 20:11:45 -05:00
  • a0bbd8c853 throwException instead of throwing exceptions manually (includes stacktrace) azivner 2017-12-06 19:53:23 -05:00
  • a7831ebfcd log data dir location azivner 2017-12-06 19:42:23 -05:00
  • 23e8e20d44 border around tree actions azivner 2017-12-04 18:40:18 -05:00
  • 33ab709209 spacing between action buttons and pointer cursor azivner 2017-12-04 18:21:57 -05:00
  • 3789ead2da creating new starting page when creating database azivner 2017-12-04 00:17:08 -05:00
  • 6546548848 implemented initial setup of the app azivner 2017-12-03 22:29:23 -05:00
  • a3f57622ff distinguishing between when DB is just connected and when it's ready for queries (validated) azivner 2017-12-03 19:18:33 -05:00
  • 502e5cbbdf Merge branch 'master' into ckeditor azivner 2017-12-03 17:47:40 -05:00
  • 3a26054619 fixes to recent changes azivner 2017-12-03 17:46:56 -05:00
  • 34f1eb930c recent notes are reloaded if synced azivner 2017-12-03 10:42:23 -05:00
  • 28bc443914 using WSS protocol when on HTTPS instead of WS azivner 2017-12-03 10:12:16 -05:00
  • 15faefe8a3 recent notes are now keyed by note tree id which simplifies things azivner 2017-12-03 10:06:53 -05:00
  • 41f089b3f4 pretty printing HTML output (for nice git diffs) azivner 2017-12-03 09:19:48 -05:00
  • ddd216c92e export with pos in filename and import so we preserve note order azivner 2017-12-03 00:10:43 -05:00
  • cd3c6d7e3b note import from directory azivner 2017-12-02 23:41:18 -05:00
  • 119d085856 export subtree to filesystem azivner 2017-12-02 21:48:22 -05:00
  • 7b6ccab894 some fixes for CKEditor azivner 2017-12-02 13:54:16 -05:00
  • a85bb649cb basic CKEditor integration azivner 2017-12-02 10:37:12 -05:00
  • 0521deb304 unifying API paths to lower-case azivner 2017-12-01 22:47:23 -05:00
  • cba9d8b5c1 logging JS errors to backend logs azivner 2017-12-01 22:28:22 -05:00
  • 02e5d20d44 https support (with custom ca) for sync azivner 2017-12-01 20:39:48 -05:00
  • 07070e2222 grey-scaled loading circles azivner 2017-11-30 23:56:11 -05:00
  • 0bd5296aa1 multiline style (but still colored) azivner 2017-11-30 23:53:15 -05:00
  • ff3f14c3e2 websocket requires logged in session in upgrade request azivner 2017-11-30 23:50:42 -05:00
  • 5f3a11af47 even though trilium APIs are still exposed in electron, they require login if not called directly from electron azivner 2017-11-30 23:29:21 -05:00
  • 81719f84a0 not creating note history immediatelly after creating a note since it's empty at that point which is useless azivner 2017-11-30 22:49:40 -05:00
  • 471821ebe5 separated electron routing into separate file azivner 2017-11-30 20:51:35 -05:00
  • 7bdf269095 migration now works also in electron azivner 2017-11-30 19:58:00 -05:00
  • 719f553054 fixed removing from recent notes azivner 2017-11-30 00:08:59 -05:00
  • 7c7a5f19f5 better algorithm to find note if note path is invalid azivner 2017-11-30 00:02:32 -05:00
  • d0a0366b05 more complete support for network-less electron frontend-backend communication including protected session azivner 2017-11-29 23:30:35 -05:00
  • 8bd76721ad prefixes are now displayed also in all autocompletes and recent notes azivner 2017-11-29 22:03:03 -05:00
  • 69f77ac439 update note title in tree real time instead of waiting for save event azivner 2017-11-29 21:13:12 -05:00
  • e6629b2c93 cosmetic sync related changes azivner 2017-11-29 21:04:30 -05:00
  • 6d603eda86 drop links and images tables azivner 2017-11-29 20:48:58 -05:00
  • 3386cd790e cleaned up images and links which are not used nor supported azivner 2017-11-29 20:47:01 -05:00
  • d019d0a690 Merge branch 'master' into stable azivner 2017-11-29 20:30:56 -05:00
  • e47027cbef recent notes are kept only for one day azivner 2017-11-29 20:30:47 -05:00
  • a9460957da prototype of executing requests without network calls in electron azivner 2017-11-28 22:01:02 -05:00
  • 54c0ff15b3 using server.method() instead of direct call to $.ajax - preparation for electron without network requests azivner 2017-11-28 20:52:38 -05:00
  • 14001f67d8 fix updating note title when switching to another note azivner 2017-11-28 19:38:33 -05:00
  • cd90200272 fixed sync azivner 2017-11-28 18:33:23 -05:00
  • 91c2f9e7cb websocket stuff separated into messaging.js azivner 2017-11-28 17:52:47 -05:00
  • 3d84f5c3b0 synchronization of transactions using promise so only one can be active azivner 2017-11-28 17:24:08 -05:00
  • fd764f6163 separate DB connection for each transaction (just for the record, will be reverted probably) azivner 2017-11-28 17:04:47 -05:00
  • 4d95eb0762 some fixes in note moving azivner 2017-11-28 15:17:11 -05:00
  • 0cab4e3edd CTRL-C CTRL-V now clones the note azivner 2017-11-28 11:36:32 -05:00
  • 7038636d2e fix setting title azivner 2017-11-28 10:17:30 -05:00
  • 40a522a9aa alt-l shouldn't bring up edit tree prefix dialog azivner 2017-11-27 18:19:04 -05:00
  • b809971fd1 using dotted underlining for cloned notes because dashed looks ugly in chrome azivner 2017-11-27 18:16:42 -05:00
  • 1231e02449 show 0 changes to sync for instances without configured sync azivner 2017-11-26 23:16:47 -05:00
  • 8b5988e13c sync fix to prefix and some usability improvements azivner 2017-11-26 23:10:23 -05:00
  • 37a105db4d fix prefix when renaming note azivner 2017-11-26 22:40:14 -05:00
  • 160c1c455c initial implementation of tree prefix azivner 2017-11-26 22:34:25 -05:00
  • b4e6245f7b fix azivner 2017-11-26 21:00:42 -05:00
  • 9fcafe44d5 fix azivner 2017-11-26 19:56:08 -05:00
  • a92df38479 tweaks to time values azivner 2017-11-26 17:04:18 -05:00
  • abb122e2a9 websocket reconnection azivner 2017-11-26 13:22:26 -05:00
  • 3a30aba42b using bootstrap notify for notifications azivner 2017-11-26 12:56:07 -05:00
  • 3e6acb17cc sync WS message is now kind of ping - if there's no ping from server we display error message azivner 2017-11-26 08:24:27 -05:00
  • 8766e9ae4a cleanup of status code azivner 2017-11-25 18:38:29 -05:00
  • cb31e0acf2 broadcast messages to all clients, send also number of outstanding syncs azivner 2017-11-25 18:31:38 -05:00
  • 992238f0b3 websocket reimplementation of status requests azivner 2017-11-25 17:43:05 -05:00
  • f433b30089 removed audit_log azivner 2017-11-24 20:51:44 -05:00
  • f799d3076b sync / transaction fixes for recent notes azivner 2017-11-24 00:09:53 -05:00