gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,112 Commits 38 Branches 306 Tags
Commit Graph

1783 Commits

Author SHA1 Message Date
zadam
2035304b63 cleanup of entity changes processing 2021-06-30 20:54:15 +02:00
zadam
5be7f003ca sync fixes 2021-06-29 23:45:45 +02:00
zadam
b660238a40 backend import unification 2021-06-29 22:15:57 +02:00
zadam
b9ff481eb7 Merge remote-tracking branch 'origin/stable' into redesign 
# Conflicts:
#	package.json
 2021-06-29 20:55:58 +02:00
zadam
61e78858bc fix random ordering in search, fixes #2047 2021-06-29 20:54:56 +02:00
zadam
0351d7eff1 keyboard shortcuts for ribbon tabs 2021-06-27 12:53:05 +02:00
zadam
b2148f4a18 updated demo document with adjusted steel blue theme 2021-06-26 23:10:03 +02:00
zadam
995e6c2fef release 0.47.5 2021-06-25 21:26:48 +02:00
zadam
f1a36f6cea add keyboard shortcut for the edit button, #2036 2021-06-24 20:27:04 +02:00
zadam
3a7da1d561 icon and theme experiments 2021-06-06 22:15:51 +02:00
zadam
c886583396 added "save search to note" button 2021-06-06 11:01:10 +02:00
zadam
faab6be48d removed zen mode 2021-06-05 21:56:39 +02:00
zadam
855b876d50 Merge remote-tracking branch 'origin/stable' into redesign 2021-06-03 12:29:58 +02:00
zadam
b557a44f34 release 0.47.4 2021-06-02 21:44:19 +02:00
zadam
f50bb2278c Merge remote-tracking branch 'origin/stable' into stable 2021-06-02 21:41:06 +02:00
zadam
6b68068cde Merge remote-tracking branch 'origin/master' into stable 2021-06-02 21:40:43 +02:00
zadam
4c64bd852e Merge remote-tracking branch 'origin/stable' into redesign 2021-06-01 23:33:07 +02:00
zadam
56378cd0f5 reorder database initialization so that all critical sections are in the same transaction, #1985 2021-05-30 22:03:41 +02:00
zadam
a76e3f6e2d correctly logging slow async requests 2021-05-30 21:21:20 +02:00
zadam
b7ca3dec54 added note info into section container 2021-05-26 23:00:40 +02:00
zadam
205f9953f9 Merge remote-tracking branch 'origin/stable' into redesign 
# Conflicts:
#	package-lock.json
#	package.json
 2021-05-26 21:27:06 +02:00
zadam
b9639bffce imported internal links crash ckeditor, #1979 2021-05-25 21:45:59 +02:00
zadam
3c7232f427 don't error out when backend log does not exist yet, fixes #1977 2021-05-25 21:03:00 +02:00
zadam
b7bd5396d1 split window WIP 2021-05-19 22:45:34 +02:00
zadam
845f5d15c4 buttons on the left 2021-05-18 22:14:35 +02:00
zadam
731051154b Merge branch 'stable' into next 
# Conflicts:
#	package.json
 2021-05-18 21:07:29 +02:00
zadam
a093508fbe converting note properties to methods 2021-05-18 20:56:49 +02:00
zadam
2451596e8c converting note properties to methods 2021-05-17 22:35:36 +02:00
zadam
a5d702b143 moved becca to top level source dir 2021-05-17 22:10:00 +02:00
zadam
439ef4a8cb moved becca to top level source dir 2021-05-17 22:09:49 +02:00
zadam
8bd3e17a3b removed legacy entities and repository 2021-05-17 22:05:35 +02:00
zadam
cb8e551ee0 release 0.47.3 2021-05-15 23:05:20 +02:00
zadam
04f249e800 backend scripts should not be async because of transaction management 2021-05-15 22:57:23 +02:00
zadam
a65eda5e4a Merge remote-tracking branch 'origin/master' into next 2021-05-15 22:45:28 +02:00
zadam
9645a07f2f Merge remote-tracking branch 'origin/stable' into next 
# Conflicts:
#	package-lock.json
#	package.json
 2021-05-15 22:45:11 +02:00
zadam
f6dd1110e8 fix sync status 2021-05-15 22:00:53 +02:00
zadam
623200b92b fix "force note sync" 2021-05-15 14:04:01 +02:00
zadam
16563eaba4 limit data base filename in ZIP export to 30 characters 2021-05-15 13:22:54 +02:00
zadam
caa6e9ee72 use archiver.js to export instead of yazl, #1938 2021-05-14 22:57:44 +02:00
zadam
8417d4a4ea various becca migration fixes 2021-05-11 22:00:16 +02:00
zadam
5d58520949 froca should not keep any deleted notes 2021-05-09 22:00:21 +02:00
zadam
d8d15b528e fix .runOnBackend() API call 2021-05-09 21:29:59 +02:00
zadam
1d008cad13 fixes 2021-05-09 20:46:32 +02:00
zadam
ef0941479c fix undelete 2021-05-09 11:12:53 +02:00
zadam
9afea492db delete note fixes 2021-05-08 23:31:20 +02:00
zadam
84246fd197 adding missing .getPojo() to becca entities 2021-05-08 22:13:08 +02:00
zadam
9441cb177f undelete becca conversion 2021-05-08 22:01:14 +02:00
zadam
bcfe097dd6 refactoring of becca entity saving 2021-05-08 21:10:58 +02:00
zadam
2edc7dbf58 merge fixes 2021-05-08 11:20:20 +02:00
zadam
051b9dff21 Merge remote-tracking branch 'origin/stable' into next 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/entities/note_short.js
#	src/public/app/services/protected_session.js
#	src/routes/api/login.js
 2021-05-08 10:58:38 +02:00