zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-11-17 21:21:40 +08:00
Code Issues Projects Releases Packages Wiki Activity
2687 commits 38 branches 306 tags 138 MiB
Commit graph

398 commits

Author SHA1 Message Date
zadam
bad7b84993 error handling in custom request handler 2019-02-03 11:15:32 +01:00
zadam
c08524c977 fix CSS class of user theme 2019-02-03 00:12:57 +01:00
zadam
ba1ca506af change in referencing CSS resources to allow easier relative linking 2019-01-27 22:34:41 +01:00
zadam
67630b1a22 options now allow selecting user theme 2019-01-27 21:18:11 +01:00
zadam
2c1580ea65 appCss/appTheme are now loaded as external CSS files instead of inline styles 2019-01-27 17:01:37 +01:00
zadam
840a0b5f64 custom handler refactoring 2019-01-27 16:37:18 +01:00
zadam
b39f6ef7ad bug fixes for custom handlers 2019-01-27 15:47:40 +01:00
azivner
54de4d236d custom HTTP handler which triggers associated script notes WIP, #356 2019-01-27 12:28:20 +01:00
azivner
19d8947123 runOnNoteChange fires also on the frontend, closes #340 2019-01-16 22:52:32 +01:00
azivner
2797c942ab changes to options dialog to allow configuring font size, closes #326 2019-01-13 22:03:06 +01:00
azivner
f1c3278874 store font size in options #326 2019-01-13 21:27:32 +01:00
azivner
9268f88bc3 frontend scripts now have startNote, currentNote and targetNote as NoteShort entities which e.g. provides easy access to relations/labels 2019-01-13 12:16:05 +01:00
azivner
f7f0560a9f simplification of script bundles on backend 2019-01-13 11:56:50 +01:00
azivner
3d8905207e fixed export with non-ASCII characters in note title, fixes #285, #331 2019-01-13 10:22:17 +01:00
azivner
523ccdad6b reload note cache after import, closes #293 2019-01-08 20:19:41 +01:00
azivner
030d12a465 stretch sync login token validity to 5 minutes #277 2019-01-07 23:29:56 +01:00
azivner
0be173a8f7 lower lastSyncedPull if server max sync ID is lower 2019-01-04 18:58:46 +01:00
azivner
0b4a44a403 layout tweaks etc. 2018-12-29 09:13:52 +01:00
azivner
458ed1faff mobile detection 2018-12-28 23:47:06 +01:00
azivner
812f9f6fca initial work on mobile frontend 2018-12-23 22:28:57 +01:00
azivner
b942163748 sync with electron net API (for system proxy support) - working, but WIP 2018-12-16 21:19:12 +01:00
azivner
a680bb4612 unhoist note when activating note outside of the hoisted note subtree 2018-12-13 23:28:48 +01:00
azivner
6c16cdb011 recent notes and jump to note are filtered by hoisted note 2018-12-12 21:28:38 +01:00
azivner
17d030e800 continuing work on hoisting notes 2018-12-12 20:39:56 +01:00
azivner
6fbf28b30d hoisting notes WIP 2018-12-11 21:53:56 +01:00
azivner
90a52f57b5 recent notes route accepts slash in the param (problem with nginx etc.) 2018-12-09 14:30:19 +01:00
azivner
8ee80cb5f1 using dashes instead of underscores in header names to avoid the fact that nginx by default drops all headers with underscore in the header name 2018-11-30 15:49:35 +01:00
azivner
76fc49f037 allow import of single HTML file too 2018-11-26 23:47:02 +01:00
azivner
b3aa0ba47c entity events are not triggered on imported entities 2018-11-26 22:27:57 +01:00
azivner
e09b61d1ac single file export working, tar WIP 2018-11-24 20:58:38 +01:00
azivner
ee23bcc783 unified export dialog, WIP 2018-11-24 14:44:56 +01:00
azivner
30249a353e renamed "mirror" relation to "inverse" relation 2018-11-19 12:07:33 +01:00
azivner
4f23f2515a fix relation saving 2018-11-18 23:36:21 +01:00
azivner
6b65592d7a attachment preview, closes #210 2018-11-16 18:40:58 +01:00
azivner
94565e3ec0 now using .tar export to initialize DB instead of direct DB dumps 2018-11-16 14:36:50 +01:00
azivner
5b9a1ef0e9 import/export logic refactored into separate files per format, closes #237 2018-11-16 12:12:04 +01:00
azivner
e0f9a7fc6a added links to the import/export + fixing internal links inside note content 2018-11-16 11:42:06 +01:00
azivner
346b8c21dd uploaded attachments with image mime are saved as image notes, closes #211 2018-11-15 12:13:32 +01:00
azivner
8ee8639faa allow also deleting note when removing note from note relation 2018-11-14 23:30:28 +01:00
azivner
fc9495bcdf links are now shown in the relation map as well 2018-11-14 10:11:15 +01:00
azivner
0b85f87cb2 display mirror relations correctly on relation map 2018-11-13 12:50:08 +01:00
azivner
21d3b0c9d8 implemented mirror relations 2018-11-12 23:34:22 +01:00
azivner
afcbfcfa03 cleanup obsolete image code 2018-11-08 11:14:13 +01:00
azivner
d7afbe4059 saving image 2018-11-08 11:08:16 +01:00
azivner
21e952a7f0 note image detail 2018-11-08 10:30:35 +01:00
azivner
d0d2a7fe47 store images in notes, basic structure 2018-11-08 10:11:00 +01:00
azivner
90dbe637ed autocomplete for add link dialog, #203 2018-11-07 17:16:33 +01:00
azivner
1febf5136c finished jump to autocomplete, now with token highlighting, #203 2018-11-07 09:35:29 +01:00
azivner
2f4ef0a4a2 migrated all remaining dialogs to bootstrap modals, #203 2018-11-06 17:47:40 +01:00
azivner
7bdbea81f1 enex import recognizes images, media references are converted to links 2018-11-05 12:52:50 +01:00
azivner
5e318c6242 basic enex import, closes #194 2018-11-05 00:06:17 +01:00
azivner
607c821cac logging slow autocomplete times 2018-11-04 22:10:52 +01:00
azivner
26b9302267 run unused image cleanup periodically (once every 4 hours) 2018-11-01 16:40:25 +01:00
azivner
639284fd85 changing title directly from relation map 2018-10-30 22:18:20 +01:00
azivner
93d152eae5 using whole note box to drag the box instead of special handle 2018-10-30 11:28:48 +01:00
azivner
2a14ea8d0c fixes for relation handling + visual design restyled into gray colors 2018-10-30 10:36:19 +01:00
azivner
2a129809b3 support for adding new relations from relation map with drag & drop 2018-10-29 22:38:51 +01:00
azivner
41fca4c4f3 fixes, getting rid of resizing for now 2018-10-25 14:01:03 +02:00
azivner
4a5a63d7b4 relation map WIP 2018-10-25 12:06:36 +02:00
azivner
b17f442d1f Merge branch 'master' into canvas 2018-10-23 18:11:29 +02:00
azivner
0c007566ad fixes for invalid operations on root note 2018-10-21 22:42:20 +02:00
azivner
6559e6c25b add children to relation map 2018-10-21 10:26:14 +02:00
azivner
3af27845b5 report missing sync configuration when clicking on Test sync 2018-09-11 10:09:55 +02:00
azivner
9b425025c9 fix sync double initialization issue 2018-09-11 10:01:40 +02:00
azivner
15610626f1 fix for import issue 2018-09-10 23:41:11 +02:00
azivner
eb84cfbef2 sync login now includes check for sync server initialization and initializes it if necessary 
Test sync button strictly not necessary
 2018-09-10 20:22:26 +02:00
azivner
e4381d10e8 merged "Sync local document" into "Test sync" 2018-09-10 20:05:10 +02:00
azivner
c95e409b5e left pane sizing taking effect 2018-09-06 11:54:04 +02:00
azivner
ff086569f2 saving options for left pane sizing 2018-09-06 11:17:30 +02:00
azivner
bc669c7b81 markdown wiki reference on README 2018-09-03 21:06:24 +02:00
azivner
25f8df1e03 fix import for tars generated outside of trilium 2018-09-03 17:08:34 +02:00
azivner
a3feaa13b3 single markdown file import, #166 2018-09-03 13:40:40 +02:00
azivner
4a58357a9a fixes & refactoring to markdown import 2018-09-03 13:17:29 +02:00
azivner
c41b809720 markdown import 2018-09-03 12:05:44 +02:00
azivner
9bdd4437f2 export single note as markdown, #166 2018-09-03 09:40:22 +02:00
azivner
467ad79129 implemented markdown export, #166 2018-09-02 23:39:10 +02:00
azivner
792039227f cssClass is correctly filled for new note 2018-09-01 13:18:55 +02:00
azivner
a98d80db31 renamed subtree operations in context menu from "branch" to "subtree" 2018-08-31 18:22:53 +02:00
azivner
65d99f3f06 fixed bug which caused incorrect ordering of lazy loaded branches 2018-08-31 17:29:54 +02:00
azivner
174d4e67af fix encrypting new notes 2018-08-27 23:04:52 +02:00
azivner
7f9a8a55ca fix init of synced options in new database 2018-08-17 18:11:03 +02:00
azivner
145efe67c3 better logging and notifications on script errors for easier debugging 2018-08-17 11:31:42 +02:00
azivner
385d97a9b3 recent notes now don't display current note, unification of autocomplete source handling 2018-08-16 21:02:42 +02:00
azivner
df9acd0504 relation target noteIds need to be translated into local noteIds 2018-08-15 18:32:06 +02:00
azivner
4513651e12 delete attributes when deleting note 2018-08-15 15:27:22 +02:00
azivner
ff5b84db10 search (note) fixes 2018-08-14 22:50:05 +02:00
azivner
6d842a65a2 fix DB vacuum, fixes #154 2018-08-14 18:03:36 +02:00
azivner
fec1574447 fixed import with attributes 2018-08-14 14:17:10 +02:00
azivner
cd9eef32b0 support for cssClass label on note 2018-08-13 10:59:31 +02:00
azivner
c78ddb70cb all events are now synchronous 2018-08-12 20:07:02 +02:00
azivner
27be3b4c90 fixes in tree loading 2018-08-12 12:59:38 +02:00
azivner
9e96272eb3 fixed runOnAttributeChange event 2018-08-10 14:31:57 +02:00
azivner
965dbcbc9a renamed workEntity to originEntity 2018-08-10 13:30:20 +02:00
azivner
ac25770c0e added runOnAttributeChange event 2018-08-09 20:08:00 +02:00
azivner
1c0fd243d1 cleanup of labels and relations from backend 2018-08-07 13:33:10 +02:00
azivner
3491235533 cleanup of labels & relations frontend code 2018-08-07 12:48:11 +02:00
azivner
5f36856571 * refactoring of repository layer to represent booleans as true/false instead of 1/0 
* show list of inherited attributes, fixes #136
* properly work with inheritance
 2018-08-07 11:38:00 +02:00
azivner
d3e44b37e9 autocomplete for promoted text labels 2018-08-06 22:52:49 +02:00
azivner
fcf6141cde support for promoted multi value attributes 2018-08-06 17:24:35 +02:00
azivner
12031d369f displaying and saving number and boolean promoted attributes 2018-08-06 15:23:22 +02:00
azivner
b44c523845 basic support for saving promoted attributes 2018-08-06 14:43:42 +02:00
azivner
2aab3ad281 fixes in attribute persistence + WIP on display of promoted attrs 2018-08-06 08:59:26 +02:00
azivner
2089c32839 attribute UI & saving now fully working 2018-08-05 20:08:56 +02:00
azivner
509093b755 added "type" to attribute dialog, name autocomplete servers according to the choice 2018-08-03 11:11:57 +02:00
azivner
097114c0f2 basic entities for attributes (unification of labels and relations) 2018-08-02 22:48:21 +02:00
azivner
6dc934abbe refactored targetNote to workNote in the ScriptContext which was very confusing with relation's targetNote 2018-08-01 10:12:54 +02:00
azivner
2eb1a9705f it's now possible to mark relation as inheritable (previously this was hardcoded for specific relation names) 2018-07-29 20:33:42 +02:00
azivner
ed1381103a #125, implementation of inheritable relations 2018-07-29 18:39:10 +02:00
azivner
170d317589 #125, basic infrastructure for scripts attached to notes via relations 2018-07-29 16:06:13 +02:00
azivner
9b3f3fde05 #126, relation list in note detail and fixes in saving 2018-07-28 17:59:55 +02:00
azivner
8a95afd756 #126, added skeleton of note relations, copied from similar concept of labels 2018-07-27 10:52:48 +02:00
azivner
e4f459fa2b #129, removed recent notes dialog as its not necessary anymore 2018-07-26 17:35:32 +02:00
azivner
2a08aef885 #129, recent notes are now visible in the jump to dialog 2018-07-26 16:05:09 +02:00
azivner
7564bf388c removed dangerous and unnecessary option to completely remove soft-deleted items 2018-07-26 09:21:52 +02:00
azivner
02dc7b199b #98, better error reporting for sync setup 2018-07-25 22:54:37 +02:00
azivner
a4627f2ddb #98 some sync setup refactorings 2018-07-25 09:46:57 +02:00
azivner
c8253caae9 #98 proxy support for sync setup 2018-07-25 08:30:41 +02:00
azivner
37ab7b4641 #98, sync to server now works as well + a lot of related changes 2018-07-24 20:35:03 +02:00
azivner
013714cb5c #98, new option "initialized" which indicates if setup has been finished 2018-07-24 08:12:36 +02:00
azivner
1fe7c62f5a #98, sync setup now doesn't copy the whole DB file, but sets up minimal database and starts off sync 2018-07-23 21:15:32 +02:00
azivner
a06618d851 #98, test sync impl 2018-07-23 10:29:17 +02:00
azivner
e7460ca3a9 #98, sync is now configured in the options 2018-07-22 22:21:16 +02:00
azivner
073300bbcd #98, working sync setup from server to desktop instance + refactoring of DB initialization 2018-07-22 19:56:20 +02:00
azivner
6235a3c886 beginning of #98, new multistep wizard, db creation after user enters username and password 2018-07-21 08:55:24 +02:00
azivner
d67246699a Introduced separate sync version (previously DB version was used to check sync compatibility), closes #120 2018-06-10 15:55:29 -04:00
azivner
14c704d6db db upgrades are now handled transparently in the background without bothering the user, closes #119 2018-06-10 15:49:22 -04:00
azivner
89a5cab98f added too options new tab appearance with possibility to change theme (white, black, dark) and zoom factor 2018-06-08 23:18:53 -04:00
azivner
0e69f0c079 fix recent notes issues 2018-06-06 22:38:36 -04:00
azivner
e7a504c66b fixes and optimizations for search 2018-06-05 22:47:47 -04:00
azivner
45d9c7164c search refactorings 2018-06-05 19:12:52 -04:00
azivner
015cd68756 renaming/refactoring of search services 2018-06-04 19:48:02 -04:00
azivner
76c0e5b2b8 new UI for search, closes #108 (still needs cleanup) 2018-06-03 20:42:25 -04:00
azivner
0f8f707acd persisting zoom setting in electron, fixes #112 2018-06-02 13:02:20 -04:00
azivner
8bf4633cd0 fixes 2018-05-30 23:18:56 -04:00
azivner
bd66b8a1c8 fix issue with limitation of number of SQLite parameters (999) which caused problems when loading tree which was too expanded 2018-05-30 20:28:10 -04:00
azivner
be51e533fc OPML import support (issue #78) 2018-05-29 20:32:13 -04:00
azivner
f47ae12019 OPML export support (issue #78), import missing for now 2018-05-27 12:26:34 -04:00
azivner
cab54a458f unifying surrogate keys for event log and options, fixes #103 2018-05-26 23:25:09 -04:00
azivner
03bf33630e unify audit fields, fixes #102 2018-05-26 12:38:25 -04:00
azivner
66e7c6de62 fix ordering 2018-04-21 12:23:35 -04:00
azivner
4ce5ea9886 autocomplete supports encrypted notes now as well 2018-04-20 00:12:01 -04:00
azivner
8c54b62f07 fix protect branch 2018-04-19 22:18:19 -04:00
azivner
834bfa39c7 limit number of results to 200, other tweaks 2018-04-18 20:56:23 -04:00
azivner
7b9b4fbb0c backend autocomplete WIP 2018-04-18 00:26:42 -04:00
azivner
85a9748291 fix for clones & optimizations 2018-04-16 23:34:56 -04:00
azivner
b4005a7ffe optimizations to the lazy loading - expanding tree now takes only one request 2018-04-16 23:13:33 -04:00
azivner
82de1c88d4 basic lazy loading of tree now works, still WIP 2018-04-16 20:40:18 -04:00
azivner
1687ed7e0b load only expanded tree with the rest being lazy loaded, WIP 2018-04-16 16:26:47 -04:00
azivner
592c51d1a5 fix note reordering sync again 2018-04-12 18:31:29 -04:00
azivner
1f96a6beab export & import work correctly with clones 2018-04-08 13:14:30 -04:00
azivner
8d8ee2a87a small sync refactorings 2018-04-08 10:09:33 -04:00
azivner
36b15f474d sync cleanup 2018-04-07 22:32:46 -04:00
azivner
13f71f8967 bulk push sync 2018-04-07 22:25:28 -04:00
azivner
64336ffbee implemented bulk sync pull for increased performance 2018-04-07 21:53:42 -04:00
azivner
e378d9f645 label service refactoring + rename of doInTransaction to transactional 2018-04-07 13:03:16 -04:00
azivner
9b5a44cef4 fix bugs 2018-04-06 18:49:37 -04:00
azivner
fdd8458336 fix sync branch route 2018-04-05 23:45:39 -04:00
azivner
a0bec22e96 fix non-200 logging 2018-04-05 23:35:49 -04:00
azivner
e827ddffb9 electron fixes 2018-04-05 23:17:19 -04:00
azivner
98f80998b9 fix electron build 2018-04-05 19:29:27 -04:00
azivner
6ed6e27602 startup script running fix 2018-04-04 23:51:47 -04:00
azivner
2cdcb3af12 camel casing and fixes 2018-04-04 23:04:31 -04:00
azivner
cf7a336ac2 camel case for reddit labels and run values 2018-04-04 22:29:11 -04:00
azivner
abfc64af95 script to generate large documents, closes #55 2018-04-03 22:15:28 -04:00
azivner
42dd8d4754 smaller refactorings 2018-04-02 22:53:01 -04:00
azivner
6f567e3e10 camelCase builtin labels 2018-04-02 21:56:55 -04:00
azivner
c6c76ba360 option names now follow camelCase 2018-04-02 21:47:46 -04:00
azivner
429d3f518e moved instanceName to index.ejs 2018-04-02 21:34:28 -04:00
azivner
26e4ad9bf9 separated DB initialization methods into sql_init 2018-04-02 21:25:20 -04:00
azivner
6ab0cea4e3 split out dateUtils on the backend 2018-04-02 20:46:46 -04:00
azivner
e2921a648d refactored backend to use new naming convention for modules 2018-04-01 21:27:46 -04:00
azivner
c765dbc5cf continuing in API review 2018-04-01 20:50:58 -04:00
azivner
a066c6fe2b changes in API format 2018-04-01 20:33:10 -04:00
azivner
311952d4dd renamed settings to options for consistency 2018-04-01 17:41:28 -04:00
azivner
96dab5d51e smaller refactorings continued 2018-04-01 17:38:24 -04:00
azivner
8ba830c04b smaller refactorings continued 2018-04-01 12:03:21 -04:00
azivner
acc82f39c4 smaller refactorings continued 2018-04-01 11:42:12 -04:00
azivner
fad0ec757b smaller refactorings (mostly entitization) 2018-04-01 11:05:09 -04:00
azivner
c9d73c6115 renamed outstanding attribute references to labels 2018-04-01 09:59:44 -04:00
azivner
12439d8761 refactoring of note deletion 2018-03-31 23:08:22 -04:00
azivner
5f7e74e15c refactoring of note update 2018-03-31 22:15:06 -04:00
azivner
e8a5d0ae16 converted note revision protection to repository/entities 2018-03-31 10:51:37 -04:00
azivner
088fb00ca9 repository is now stateless 2018-03-31 09:07:58 -04:00
azivner
05676f3459 removed dataKey where it's not necessary anymore (use of CLS instead) 2018-03-31 08:53:52 -04:00
azivner
5d203b2278 removed sourceId where it's not necessary (stored in CLS instead) 2018-03-30 19:41:54 -04:00
azivner
795d50f02e converted of web (non-api) routes, basic conversion completed 2018-03-30 19:31:22 -04:00
azivner
cfe0ae1eda converted file, script, search and sender routes 2018-03-30 17:29:13 -04:00
azivner
aa57a64c61 converted image and maintainance routes 2018-03-30 17:07:41 -04:00
azivner
e36a81e189 converted export/import notes 2018-03-30 15:34:07 -04:00
azivner
88c07a9e48 converted sync route 2018-03-30 14:27:41 -04:00
azivner
9edee9340b converted settings, note revisions, password change and recent changes routes 2018-03-30 13:56:46 -04:00
azivner
8550ed72f2 converted cloning and label routes 2018-03-30 13:20:36 -04:00
azivner
efffc29649 initial work on new router model 2018-03-30 12:57:22 -04:00
azivner
0ec909fd7a added basic CLS support with re-entrant transactions 2018-03-28 23:41:22 -04:00
azivner
7464835058 renamed "attachment" to "file" for consistency 2018-03-27 22:11:06 -04:00
azivner
35998058ce introduced NoteFull entity, fixes 2018-03-25 23:25:17 -04:00
azivner
47eb1e3e02 refactored all mentions of "history" to "revision" 2018-03-25 20:52:38 -04:00
azivner
95bb2cf0bb renaming attributes to labels, fixes #79 2018-03-24 22:02:26 -04:00
azivner
4c472ce78b renaming note_tree to branch 2018-03-24 21:39:15 -04:00
azivner
511fb89af0 WIP refactoring of data structures in note tree 2018-03-24 20:41:27 -04:00