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
7,120 Commits 38 Branches 306 Tags
Commit Graph

41 Commits

Author SHA1 Message Date
zadam
9357caeb5a activate parent note when deleting a note, #4601 2024-01-28 23:08:44 +01:00
zadam
ff5d3a5f0c import WIP 2023-05-09 00:05:27 +02:00
zadam
fa3cbb4645 grammar 2023-05-05 23:41:11 +02:00
zadam
7aa26580ba refactoring of "some path" WIP 2023-04-15 00:06:13 +02:00
soulsands
181ddce887 fix:　remove misleading await 2023-04-08 20:49:25 +08:00
zadam
f809da58ec fix occurrences of 'root' branch 2022-12-28 13:09:49 +01:00
zadam
5c4db266a4 code should not rely on fixed branch IDs since they can change after move 2022-12-23 20:40:58 +01:00
zadam
724f99f17c add prefix "_" to "named" IDs 2022-12-21 16:11:00 +01:00
zadam
1b24276a4a always use template strings instead of string concatenation 2022-12-21 15:19:05 +01:00
zadam
5fc9f5f3f9 improvements 2022-12-06 23:48:44 +01:00
zadam
fc080f785b moving components to its own directory 2022-12-01 13:07:23 +01:00
zadam
1a6c9be065 renamed shortcuts to launchers 2022-12-01 10:16:57 +01:00
zadam
6883b71ce7 shortcut improvements 2022-11-25 15:29:57 +01:00
zadam
c16f7a5e02 Merge branch 'master' into next55 
# Conflicts:
#	electron.js
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
#	src/public/app/widgets/note_tree.js
#	src/services/port.js
 2022-10-15 12:09:25 +02:00
zadam
cf6330dee6 allow deleting notes from note actions button, closes #3131 2022-09-15 23:09:24 +02:00
zadam
24286c2a6c remove all alert() usages, fixes #3086 2022-08-24 23:20:05 +02:00
zadam
fc920becac launchbar WIP 2022-08-07 13:23:03 +02:00
zadam
9707094686 converted delete notes dialog to new pattern 2022-06-16 19:41:29 +02:00
zadam
d97e454463 allow cloning into notes, not just branches, fixes #2484 2021-12-27 23:39:46 +01:00
zadam
1cdd644b8f fix reloading frontend after erasing notes in firefox, fixes #2221 2021-10-12 19:47:44 +02:00
zadam
0448883782 option to erase notes immediately 2021-09-16 14:38:09 +02:00
zadam
66374bf95f improvements in frontend sync (WIP) 2021-08-24 22:59:51 +02:00
zadam
8cb07525cf Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
 2021-08-21 21:32:11 +02:00
zadam
3fd16a16e8 fix deletion in the mobile frontend, closes #2114 2021-08-21 20:53:45 +02:00
zadam
7d94202460 reworked section container to be icon based 2021-05-23 23:41:01 +02:00
zadam
7494491560 Merge remote-tracking branch 'origin/master' into next 
# Conflicts:
#	package-lock.json
#	src/public/app/services/note_content_renderer.js
#	src/public/stylesheets/style.css
#	src/routes/api/files.js
#	src/routes/routes.js
 2021-04-25 11:14:45 +02:00
zadam
4ff7e0813d upload of modified open file WIP 2021-04-24 11:39:44 +02:00
zadam
42510fda5c renamed also cache files/modules 2021-04-16 23:01:56 +02:00
zadam
af5b1021c7 renamed treeCache into froca 2021-04-16 22:57:37 +02:00
zadam
b38a63d336 delete notes dialog provides checkbox to switch between delete all clones and normal delete 2021-03-18 23:42:30 +01:00
zadam
d62558d97a delete notes dialog WIP 2021-03-18 23:23:35 +01:00
zadam
5b72b577b8 delete notes preview dialog WIP 2021-03-14 22:54:39 +01:00
zadam
aa8bf0e60a Revert "Revert "delete notes skeleton dialog"" 
This reverts commit 584fea19
 2021-03-14 19:54:40 +01:00
zadam
584fea1992 Revert "delete notes skeleton dialog" 
This reverts commit 03a11e6f
 2021-03-12 20:44:19 +01:00
zadam
03a11e6f77 delete notes skeleton dialog 2021-03-11 22:35:53 +01:00
zadam
9f002fa802 change the heuristics to choose the best note path when ambiguous/incomplete/just noteId is provided, #1711 2021-03-06 20:23:29 +01:00
zadam
2cfd093cae allow search result to be moved from tree to relation map, fixes #1650 2021-02-18 22:30:55 +01:00
MeIchthys
79d9d79055
Minor gramatical changes (#1162) 
* Minor gramatical change

change "delete also" to "also delete"

* Minor gramatical change

change "once more" to "confirmation"

* Minor gramatical changes

add "a" before some nouns.

* Minor gramatical/spelling fixes

* Minor gramatical changes

* Convert to singular action descriptions

change "changes" to "change" 
change "switches" to "switch"
change "copies" to "copy" 
etc.

* Minor gramatical changes
 2020-07-24 22:03:39 +02:00
zadam
8c88ce6f65 fix moving/cloning notes broken in 0.42.4, closes #1066 2020-05-31 22:33:02 +02:00
zadam
5e353a5612 improved drag & drop 2020-05-30 10:30:21 +02:00
zadam
29cec8112e fix setup of new document, closes #966 2020-04-14 21:57:42 +02:00