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

962 Commits (c3f5bb5518ee545e6397d85ce6da5abc8f3b9be9)

Author SHA1 Message Date
zadam ca41806bc2 import and export fixes 2023-07-13 23:54:47 +07:00
zadam ac9a4b3afc fixes in etapi tests 2023-07-10 19:10:07 +07:00
zadam 48029cea7c small refactorings 2023-06-29 22:10:13 +07:00
zadam 48b30b985e attachment upload 2023-06-28 20:53:55 +07:00
zadam 176784834f simple formatter for source view of text HTML notes 2023-06-20 23:59:36 +07:00
zadam 995f1c9fc4 Merge branch 'stable' into next61 
# Conflicts:
#	src/etapi/etapi.openapi.yaml
#	src/etapi/notes.js
#	src/public/app/widgets/type_widgets/editable_text.js
#	src/services/app_info.js
 2023-06-20 23:30:45 +07:00
zadam defd997424 release 0.60.4 2023-06-19 23:26:50 +07:00
zadam e22f77eae7 release 0.60.3 2023-06-15 23:23:37 +07:00
zadam 2ebbc33081 fix revision rename DB migration 2023-06-13 23:39:42 +07:00
zadam ac56056f65 Merge branch 'master' into next61 
# Conflicts:
#	package-lock.json
#	src/routes/api/recent_changes.js
 2023-06-13 23:25:35 +07:00
zadam 2bdd538d7d release 0.60.2-beta 2023-06-08 22:46:52 +07:00
zadam 93addac8bb Merge branch 'master' into next61 
# Conflicts:
#	src/becca/entities/bnote.js
#	src/public/app/components/note_context.js
#	src/public/app/layouts/desktop_layout.js
#	src/public/app/services/note_content_renderer.js
#	src/public/app/services/utils.js
#	src/public/app/widgets/ribbon_widgets/file_properties.js
#	src/public/app/widgets/ribbon_widgets/note_info_widget.js
#	src/services/notes.js
 2023-06-05 00:09:55 +07:00
zadam b79631a35d setContent refactoring 2023-06-04 20:51:08 +07:00
zadam d9359c7c55 downgrade excalidraw to 0.14.2, #3979 2023-06-01 22:51:34 +07:00
zadam 0aa119af2c attachments WIP 2023-05-29 00:19:54 +07:00
zadam c2f70031d0 Merge branch 'master' into next61 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/entities/fnote.js
#	src/public/app/services/link.js
 2023-05-28 16:57:48 +07:00
zadam bf6106f4dc release 0.60.1-beta 2023-05-26 23:11:53 +07:00
zadam 82efc92413 lib upgrades 2023-05-26 23:11:37 +07:00
zadam e20fac19ba attachment WIP 2023-05-20 23:46:45 +07: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 +07:00
zadam 7fc2824325 ignore husky install error 2023-05-20 14:23:22 +07:00
zadam 0728f540ab locked versions 2023-05-18 23:57:18 +07:00
zadam 4913a5a5fa release 0.60.0-beta 2023-05-18 23:31:57 +07:00
zadam 1f8798d7ac upgrades 2023-05-17 23:47:30 +07:00
zadam 64db5e2542 cleanup of app.js, wwww 2023-05-07 15:23:46 +07:00
zadam c0cf319521 upgrade electron to 25 and node to 18 2023-05-04 21:01:25 +07:00
zadam 735ac55bb8 fixes, allowing conversion of note into an attachment 2023-05-02 22:46:39 +07:00
zadam 49fb913eab erasing unused attachments 2023-04-24 21:22:34 +07:00
zadam 5e2efca933 scheduled erasure of attachments WIP 2023-04-21 00:19:17 +07:00
zadam 8725f7cfb2 Merge branch 'stable' 
# Conflicts:
#	src/services/build.js
 2023-04-17 22:26:01 +07:00
zadam 83d8908ee8 release 0.59.4 2023-04-17 21:40:35 +07:00
zadam 3eafdadd1f
Merge branch 'master' into eslint-format 2023-04-17 20:44:34 +07:00
zadam 447b8f0f0c
Merge pull request #3848 from soulsands/auto-reload 
chore: dev auto reload
 2023-04-16 23:30:23 +07:00
zadam aaf6e3bace
Merge pull request #3847 from soulsands/perf-build 
Perf: building improvement
 2023-04-16 23:27:55 +07:00
baiyongjie ead4242735 chore: dev auto reload 2023-04-15 17:58:40 +07:00
baiyongjie 30a8c6b579 perf: building improvement 2023-04-15 17:45:10 +07:00
Castor ea64adc2f9
chore: remove install in script switch-electron 
hi.
No need to install since it's already in position.
 2023-04-13 17:56:28 +07:00
soulsands 2a34c8fa66 Merge remote-tracking branch 'up/master' into eslint-format 2023-04-11 01:02:07 +07:00
zadam 5e88e24693 package upgrades 2023-04-10 18:50:55 +07:00
soulsands cfb04f7d8a chore: add eslint config 2023-04-11 00:21:24 +07:00
zadam ee60652746 eslint config 2023-04-09 23:08:24 +07:00
zadam ed52919f9e release 0.59.3 2023-03-27 23:06:14 +07:00
zadam 63a70f2ffa release 0.59.2 2023-03-14 21:15:08 +07:00
zadam f541bf186c release 0.59.1 2023-02-28 23:39:34 +07:00
zadam fc67dd4d0a release 0.59.0-beta 2023-02-19 21:36:05 +07:00
zadam 760c7b73ad api docs 2023-02-17 16:30:14 +07:00
zadam 956682f2c7 update docs 2023-02-17 16:15:58 +07:00
zadam 4558e349b5 node update 2023-02-17 15:05:27 +07:00
zadam 6f7b554cdc preparing 0.59 without ocr/pdf, userguide, note ancillaries 2023-02-17 14:49:45 +07:00
zadam 42e08284b0 Merge remote-tracking branch 'origin/master' into dev 
# Conflicts:
#	package-lock.json
#	src/public/app/widgets/mermaid.js
 2023-02-15 23:47:41 +07:00