gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 11:39:01 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
12,643 Commits 41 Branches 349 Tags
Commit Graph

87 Commits

Author SHA1 Message Date
Nriver
2890885157 Merge remote-tracking branch 'upstream-next/develop' into feature/i18n-part2 2024-08-19 17:09:03 +08:00
zadam
bfb8aa6481 remove eslint 2024-03-06 07:17:51 +01:00
zadam
8edb5428e5 small sync fixes and refactorings 2023-07-27 23:22:08 +02:00
zadam
9e9fb2979f Merge branch 'master' into next61 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/components/note_context.js
#	src/public/app/services/open.js
#	src/public/app/widgets/buttons/note_actions.js
#	src/public/app/widgets/find_in_code.js
#	src/public/app/widgets/type_widgets/canvas.js
#	src/services/options.js
 2023-05-20 20:55:57 +02:00
zadam
14dd2b8827 cleanup 2023-05-18 23:05:28 +02:00
zadam
76196ed42c Merge remote-tracking branch 'origin/master' into next60 2023-05-14 17:32:59 +02:00
zadam
6089a369e3 added missing font files #3933 2023-05-13 16:29:18 +02:00
zadam
15a11daf38 Merge branch 'master' into next60 
# Conflicts:
#	package-lock.json
#	package.json
 2023-04-10 18:52:30 +02:00
zadam
ee60652746 eslint config 2023-04-09 23:08:24 +02:00
zadam
515fb4e5db blob WIP 2023-03-16 13:29:11 +01:00
zadam
c190296bf9 refactoring 2023-02-13 16:22:34 +01:00
zadam
7565458332 launchbar WIP 2022-08-04 23:00:32 +02:00
zadam
9ce3e7e7d2 bulk actions WIP 2022-06-03 17:29:08 +02:00
zadam
8318ab7ac0 added triggerCommand and triggerEvent into frontend API 2022-05-13 22:33:57 +02:00
zadam
75c8e700d4 dev data directory should be relative 2022-04-15 14:51:14 +02:00
zadam
9ee1c9f3da ETAPI delete/patch, refactoring 2022-01-07 19:33:59 +01:00
zadam
bbceb6251a backlinks WIP, #2349 2021-12-01 23:12:54 +01:00
zadam
669eaa7509 fix SQL console 2021-07-27 22:08:41 +02:00
zadam
8d8d654fe8 becca entities enriched with functionality from repository entities 2021-04-25 20:00:42 +02:00
zadam
634baae796 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/services/build.js
 2021-04-19 20:56:56 +02:00
zadam
7b5d44a329 use official gh client instead of github-release to execute releases 2021-04-18 21:29:10 +02:00
zadam
197537b159 idea config stuff 2021-04-13 21:54:34 +02:00
zadam
5157fc15e9 electron update 2020-11-10 22:54:03 +01:00
zadam
2bc06959c3 add a warning to change password dialog, fixes #1344 2020-10-29 20:57:26 +01:00
zadam
28cb3976e5 add explicit button to show/hide right pane widgets, #1299 2020-10-12 23:15:53 +02:00
zadam
08dbf90a8c hide body during startup to reduce flicker 2020-05-21 09:42:25 +02:00
zadam
552fc5261a new note cache WIP 2020-05-09 23:42:26 +02:00
zadam
2e837642e2 create note directly from mention linking 2020-05-09 14:25:27 +02:00
zadam
c3438e0f3f implemented SQL console as a type of code note 2020-05-08 22:22:43 +02:00
zadam
2369bcf9fc fixes for image download 2020-05-06 23:11:34 +02:00
zadam
4c6e9480e4 revert #980 because of performance issues 2020-05-04 21:49:03 +02:00
zadam
742df25bc2 collapse/expand only folder notes 2020-05-03 09:49:56 +02:00
zadam
81fbefb9cd added scripts for running trilium as "portable" 2020-04-29 21:55:57 +02:00
zadam
aff12950f0 Merge remote-tracking branch 'origin/master' into m42 
# Conflicts:
#	src/public/app/services/app_context.js
 2020-04-25 23:53:19 +02:00
zadam
75c58cbf79 refactored layouts for extra window 2020-04-25 23:52:13 +02:00
zadam
ac608b9334 small text changes 2020-04-24 21:21:22 +02:00
zadam
666d202a3a deps updates 2020-04-19 09:42:10 +02:00
zadam
72745aca29 fix unnecessary scroll to parent when opening new tab 2020-03-10 22:25:57 +01:00
zadam
eb287917c1 set sync.isSynced correctly 2020-03-09 21:28:41 +01:00
zadam
e10d23289e event fixes WIP 2020-03-06 22:17:07 +01:00
zadam
350331e2ef fix 500px constant height of relation maps, closes #882 2020-02-28 15:20:54 +01:00
zadam
ad7a55d305 always autofix note_contents.content = NULL sync issue after note erasion 2020-02-19 19:51:36 +01:00
zadam
c9113ae752 Merge branch 'stable' 2020-01-18 09:24:39 +01:00
zadam
a6cd25071e more robust handling of sync error, fixes #830 2020-01-18 08:48:36 +01:00
zadam
14f3c783f2 undelete note WIP 2020-01-03 13:14:43 +01:00
zadam
eee9fcae5c set timeout for the initial sync seed request 2019-12-29 10:19:00 +01:00
zadam
f75c008154 more sync recovery fixes 2019-12-24 17:49:44 +01:00
zadam
9cb8bc5dd8 generate document now creates note revisions as well 2019-12-02 19:52:58 +01:00
zadam
7ef2e7769f added index to source_ids 2019-12-01 14:39:24 +01:00
zadam
00c295e4bf upgrade to electron 8.0.0-beta.3 2019-11-21 19:36:34 +01:00