sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,194 Commits
21 Branches
339 Tags
369 MiB
Commit Graph

5194 Commits (c1092c97b51673bd30ab20df8fe9834783713f1c)
 

Author SHA1 Message Date
zadam 4f4cbccf08 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
 2022-01-12 19:54:11 +07:00
zadam 412c745e53 prevent infinite recursion when checking shared status 2022-01-12 19:46:40 +07:00
zadam 28df5d4aa2 etapi improvements and more tests 2022-01-12 19:32:23 +07:00
zadam 42e85aefdc sync fixes 2022-01-10 21:24:07 +07:00
zadam 91e78998d1 unified Jump-To and quick search behavior with regards to hoisting and opening in a new tab 2022-01-10 20:44:59 +07:00
zadam 6f406f9aa2 search immediately when user chooses "full search" from Jump To dialog, #2483 2022-01-10 20:37:33 +07:00
zadam 86fa80f3eb updated API docs 2022-01-10 19:55:09 +07:00
zadam 7119d08022 updated API docs 2022-01-10 19:54:38 +07:00
zadam 916ff5f2ee Merge remote-tracking branch 'origin/next50' 2022-01-10 19:53:36 +07:00
zadam 913d2c06f3 start sync immediately after sharing/unsharing, fixes #2539 2022-01-10 17:15:21 +07:00
zadam cbb5b31f72 Merge remote-tracking branch 'origin/master' into next50 2022-01-10 17:09:40 +07:00
zadam 91dec23d5e ETAPI auth, spec improvements etc. 2022-01-10 17:09:20 +07:00
zadam d04d356429 release 0.49.4 2022-01-09 22:32:13 +07:00
zadam be59f248e8 fix sync skipping some changes and then forcing sector queuing 2022-01-09 22:22:13 +07:00
zadam 2d2641dbd7 sync fixes 2022-01-09 21:25:15 +07:00
zadam 96f4230bc1 Merge branch 'master' into next50 
# Conflicts:
#	src/public/app/widgets/containers/root_container.js
#	src/services/app_info.js
 2022-01-09 20:18:30 +07:00
zadam 1995b54770 fix migration to preserve IDs in entity_changes 2022-01-09 20:17:27 +07:00
zadam 7159b13c9d add memberId to entity_changes to avoid having to resend all changes second time 2022-01-09 20:16:39 +07:00
zadam f2732bcab7 fix display of children notes in an empty note, closes #2536 2022-01-09 09:12:21 +07:00
zadam 0e9d76890b use #shareAlias in parent link, closes #2535 2022-01-09 09:04:21 +07:00
zadam 9df521109b fix migration to handle duplicates in entity_changes, #2534 2022-01-08 22:43:34 +07:00
zadam 75b65c396e fix migration to handle duplicates in entity_changes, #2534 2022-01-08 22:31:52 +07:00
zadam d4d48f3834 use [protected] for protected notes in the export 2022-01-08 21:50:16 +07:00
zadam b90ba3d1a9 create note from API/import etc. should allow empty title, fixes #2530 2022-01-08 19:33:56 +07:00
zadam c448d34a38 ETAPI WIP 2022-01-08 19:30:46 +07:00
zadam c33bc7e12c ETAPI search endpoint 2022-01-08 13:18:12 +07:00
zadam c5366abf75 ETAPI put content 2022-01-08 12:01:54 +07:00
zadam 2532ea525d ETAPI openapi spec WIP 2022-01-07 23:06:04 +07:00
zadam d74371c9f5 added missing placeholder.js 2022-01-07 20:30:14 +07:00
zadam 9ee1c9f3da ETAPI delete/patch, refactoring 2022-01-07 19:33:59 +07:00
zadam 82ba0d5b1d release 0.49.3 2022-01-06 23:09:17 +07:00
zadam 590eea1183 API docs update 2022-01-05 20:31:21 +07:00
zadam e6f3cc7988 fix migration from 0.47, closes #2514 2022-01-05 20:21:24 +07:00
zadam 7a650c605c fix typo in the log, closes #2513 2022-01-05 19:48:18 +07:00
zadam dfa7c64b1f fix setting note/mime on root container during note change 2022-01-05 19:28:36 +07:00
zadam 82b2871a08 added date services to ETAPI 2022-01-05 19:25:17 +07:00
zadam e3114e0602 etapi fixes + basic test 2022-01-04 23:00:59 +07:00
zadam e8acf3f9f3 Merge branch 'master' into next50 
# Conflicts:
#	package-lock.json
 2022-01-04 22:11:00 +07:00
zadam 2b10023055 electron update 2022-01-04 22:10:35 +07:00
zadam e25a904a84 ETAPI - post services WIP 2022-01-03 23:13:51 +07:00
zadam dcba6ad70d ETAPI (external API) initial read only access 2022-01-03 22:40:01 +07:00
zadam ffdd917717 Merge branch 'master' into next50 2022-01-03 20:10:48 +07:00
Matt 168645cce9
Style shared note children (#2505) 2022-01-03 19:53:42 +07:00
zadam f4c81ecefb fix setting window title when renaming notes 2022-01-03 19:52:24 +07:00
zadam 5a85fe92aa release 0.49.2-beta 2022-01-02 22:43:30 +07:00
zadam feffd57f24 added support for #pageUrl into shared notes 2022-01-02 22:43:00 +07:00
zadam faf81ae056 fix closing new window, closes #2502 2022-01-02 21:35:02 +07:00
zadam 003fec4b11 fix interrupted initial sync 2022-01-02 21:20:56 +07:00
zadam 5ecb603e86 sharing fixes 2022-01-01 22:32:38 +07:00
zadam 1fed71a92e shaca now loads attributes, added favicon and `shareJs` 2022-01-01 13:23:09 +07:00