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
3,679 Commits 41 Branches 349 Tags
Commit Graph

3679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam
77a3bdce1f related notes get updated as user types in the attr detail dialog 2020-08-14 23:00:15 +02:00
zadam
827f8b42a0 Merge remote-tracking branch 'origin/stable' 2020-08-14 22:34:17 +02:00
zadam
b815e10ff3 add running tests into the build process 2020-08-14 22:30:01 +02:00
zadam
c2789bf355 use relative paths for fonts in steel blue in demo document, closes #1187 2020-08-14 21:04:18 +02:00
zadam
e8d63b5647 add "search in note" to "note actions" menu, #1184 2020-08-14 20:58:19 +02:00
zadam
53c6542af6 Merge remote-tracking branch 'origin/master' 2020-08-14 00:11:35 +02:00
zadam
d9c246f8a7 fixes for promoted attribute multiplicity 2020-08-14 00:11:26 +02:00
dependabot[bot]
803694d113
Bump lodash from 4.17.15 to 4.17.20 (#1189) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.20.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.20)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-13 23:29:27 +02:00
zadam
f6f9f0d2c0 ability to remove attribute with mouse + other tweaks 2020-08-13 23:23:57 +02:00
zadam
47a9516ada Merge remote-tracking branch 'origin/stable' 2020-08-13 00:00:05 +02:00
zadam
bd8b83898f Merge remote-tracking branch 'origin/stable' into stable 2020-08-12 23:59:42 +02:00
zadam
97109efb6c fix attribute cache invalidation 2020-08-12 23:59:33 +02:00
zadam
b4d9fdaeda fix attribute cache invalidation 2020-08-12 23:58:32 +02:00
zadam
1810116a34 attribute fixes 2020-08-12 23:39:05 +02:00
Jody
3e89855aa3
Add web app manifest (#1174) 
* Add web app manifest, link to new manifest on mobile template.

* Remove duplicate manifest entry.
 2020-08-12 21:39:12 +02:00
zadam
eaac65142f tweaks in attr list sizing 2020-08-12 21:36:43 +02:00
zadam
ae909d1079 fix saving & refreshing attributes across compoments 2020-08-12 00:02:19 +02:00
zadam
935e5de493 small fixes related to inherited attributes 2020-08-11 22:52:17 +02:00
zadam
8d0df6ddb9 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	db/demo.zip
#	src/services/notes.js
#	src/services/request.js
 2020-08-10 23:45:17 +02:00
zadam
3b148eb6f8 fixed demo document to correctly show included notes 2020-08-10 23:42:06 +02:00
zadam
4e8d1dac67 fixes for rendering PDF previews e.g. in include note 2020-08-10 23:39:17 +02:00
zadam
7779fd1dfe synchronize the removal of the selection in cuttonote to make it more predictable 2020-08-10 22:42:57 +02:00
zadam
960d7dede3 add scrolling margins, #1181 2020-08-09 23:20:57 +02:00
zadam
e663d7da1b updated schema for entity_changes table 2020-08-09 22:44:53 +02:00
zadam
02cc52af66 small improvements and fixes 2020-08-06 23:55:17 +02:00
zadam
f60af1f05e small improvements and fixes 2020-08-06 00:06:42 +02:00
zadam
224fbdc8cd small improvements to text preview in file notes 2020-08-04 22:06:25 +02:00
zadam
8561201abc invalidate note complement cache quickly after load 2020-08-04 21:57:08 +02:00
zadam
3c1a809276 external links should open only in new window, not in the original window, closes #1171 2020-08-04 20:42:32 +02:00
zadam
ddf0a89e1f bootstrap 4.5.1 2020-08-04 20:39:16 +02:00
zadam
4b101baf00 CKEditor 21 content styles 2020-08-03 23:36:33 +02:00
zadam
782127dd91 fix noproxy handling for image downloading 2020-08-03 23:33:44 +02:00
zadam
7900622f38 refactored "sync" table to "entity_changes" - more changes 2020-08-02 23:43:39 +02:00
zadam
864271d5ef refactored "sync" table to "entity_changes" 2020-08-02 23:27:48 +02:00
zadam
5a5ea4f474 fix filling sync table after demo document import 2020-08-02 22:53:57 +02:00
zadam
749791f6d1 fixed CSP after upgrade to helmet 4 2020-08-02 22:26:02 +02:00
zadam
5ca3e9a0bc fixed db migrations after merge from stable 2020-08-02 20:44:46 +02:00
zadam
f4a4e746bf Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	libraries/ckeditor/ckeditor.js.map
#	package.json
#	src/routes/api/login.js
#	src/routes/api/sync.js
#	src/routes/index.js
#	src/services/app_info.js
#	src/services/sync.js
 2020-08-02 20:41:22 +02:00
zadam
4fc8bace94 support horizontal line, closes #1164 2020-08-01 23:41:30 +02:00
zadam
47a22f6e8d release 0.43.3 v0.43.3 2020-07-31 23:34:05 +02:00
zadam
17d7ff3ff1 small improvements to sync table handling 2020-07-31 00:08:01 +02:00
zadam
3582013a33 import of initial demo document sets sync.isSynced incorrectly to always 0, #1163 2020-07-31 00:07:38 +02:00
zadam
95bbdb3b6b CKEditor 21 2020-07-29 23:34:49 +02:00
zadam
e1dd933ec0 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/services/options_init.js
 2020-07-28 23:50:54 +02:00
zadam
8a57960c6e tweaks in sync timeout handling 2020-07-28 23:29:12 +02:00
zadam
a7b62b30cb fix image resizing after save/update/import 2020-07-28 00:26:47 +02:00
zadam
c9cbc2db02 import fixes 2020-07-27 23:40:14 +02:00
zadam
c92526372c Merge remote-tracking branch 'origin/stable' 2020-07-26 23:47:31 +02:00
zadam
5f4a84d967 fix extracting base64 inline images from HTML, fixes #1159 2020-07-26 23:47:06 +02:00
zadam
ef59810f89 Merge remote-tracking branch 'origin/stable' 2020-07-26 22:58:54 +02:00