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

900 Commits (f59e19d93b2741506d008c5a93e044452014ec00)

Author SHA1 Message Date
zadam 339d8a7378 initial implementation of note attachments 2023-01-22 23:36:05 +07:00
zadam f50a9c250a many small issues found by intellij analysis 2023-01-15 21:04:17 +07:00
zadam c97ada3434 docs improvements 2023-01-13 23:54:47 +07:00
zadam a110f24b05 Merge branch 'master' into dev 2023-01-13 21:11:23 +07:00
zadam 420175f5ef release 0.58.4 2023-01-11 23:44:33 +07:00
zadam edbb60f2b5 Merge branch 'master' into dev 
# Conflicts:
#	src/routes/api/sender.js
#	src/services/import/enex.js
 2023-01-10 16:33:31 +07:00
zadam f86fb0d0a2 added TRILIUM_SYNC_SERVER_HOST env. variable to prevent prod sync issues 2023-01-06 15:14:04 +07:00
zadam d7cae7d5bb improvements in API docs generation 2023-01-05 23:38:41 +07:00
zadam ac51d0d569 Merge branch 'master' into dev 
# Conflicts:
#	package-lock.json
#	package.json
 2023-01-05 16:17:33 +07:00
zadam 0995c56506 release 0.58.3-beta 2023-01-04 22:36:31 +07:00
zadam 3a5fa2954d Merge remote-tracking branch 'origin/master' 2023-01-03 22:36:56 +07:00
zadam 81013ed21a Merge branch 'stable' 
# Conflicts:
#	package-lock.json
#	package.json
 2023-01-03 22:35:45 +07:00
zadam 53360c147a npm script improvements 2023-01-03 22:34:31 +07:00
zadam d910191e83
Merge pull request #3480 from contributor/feature/pageUrlSanitizeUrl 
Fix pageUrl and clipping selection can create multiple notes for the same Url
 2023-01-03 22:28:37 +07:00
contributor f02ad63e97 npm i @braintree/sanitize-url 2023-01-03 21:18:23 +07:00
zadam c5ab6fa2fa jsdoc fixes to make export simpler 2023-01-03 14:31:46 +07:00
zadam da161c7ce0 rename shaca entities to have F-prefix, #3476 2023-01-03 13:40:21 +07:00
zadam ca4e1c19a7 make utils.normalize null-safe, #3469 2022-12-30 21:00:42 +07:00
zadam f4cf04232f release 0.58.2-beta 2022-12-29 00:12:54 +07:00
zadam d36cf47974 no-dir npm scripts 2022-12-28 23:17:59 +07:00
zadam 701911b766 release 0.58.1-beta 2022-12-26 23:57:31 +07:00
zadam 3b5f2b86d5 release 0.58.0-beta 2022-12-24 22:09:05 +07:00
zadam 059c339c09 fix warnings in ckeditor 2022-12-21 23:10:13 +07:00
zadam 4026c2be4f Merge branch 'next58' 
# Conflicts:
#	src/public/app/widgets/note_tree.js
#	src/services/tree.js
 2022-12-14 23:48:58 +07:00
zadam b9ae68d559 small fixes 2022-12-14 12:26:04 +07:00
zadam ffb3c044fa release 0.57.5 2022-12-13 23:08:52 +07:00
zadam d1b989ac12 Merge remote-tracking branch 'origin/stable' into next58 2022-12-12 21:43:56 +07:00
zadam 1bfd26ee8f release 0.57.4 2022-12-11 23:24:24 +07:00
zadam 73eb585398 fixed migrations 2022-12-08 13:45:56 +07:00
zadam cd60ad4267 improvements 2022-12-03 21:11:49 +07:00
zadam 99a5774148 Merge branch 'master' into next58 
# Conflicts:
#	package-lock.json
 2022-12-03 13:01:03 +07:00
zadam 46fdd15857 release 0.57.3 2022-12-02 22:44:40 +07:00
zadam 0480f391d3 release 0.57.2 2022-12-01 22:56:29 +07:00
zadam e4e20c8007 Revert "open window before loading becca" 
This reverts commit 2fbcd9aaf7.
 2022-11-23 23:49:49 +07:00
zadam 2fbcd9aaf7 open window before loading becca 2022-11-23 23:31:05 +07:00
zadam e2f6191229 upgrades 2022-11-22 20:48:04 +07:00
zadam 19126b7c6d Merge branch 'master' into next58 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
 2022-11-22 20:46:08 +07:00
zadam 9a6df54832 release 0.57.1-beta 2022-11-20 23:43:17 +07:00
zadam f7e56cbffe release 0.57.0-beta 2022-11-12 20:40:45 +07:00
zadam b3c87156c2 library upgrades 2022-11-07 21:26:13 +07:00
zadam 64d3ec940c release 0.56.2 2022-10-27 22:41:15 +07:00
zadam 06e6fec4ca increment db and sync version due to new note type 2022-10-23 21:16:15 +07:00
zadam 12943cc808 Merge branch 'master' into next57 
# Conflicts:
#	package-lock.json
 2022-10-23 21:13:09 +07:00
zadam f6ad1c6aa7 release 0.56.1 2022-10-22 23:07:24 +07:00
zadam 876e6caa23 better handling of incorrect operators 2022-10-22 15:58:15 +07:00
zadam 8d30d5d689 Merge remote-tracking branch 'origin/master' into next57 2022-10-16 11:24:24 +07:00
zadam e22af42cd0 release 0.56.0-beta 2022-10-15 12:49:56 +07: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 +07:00
zadam ed8acc7ee3 switch-server, switch-electron npm scripts to ease rebuilding better-sqlite3 2022-10-14 21:59:43 +07:00
zadam a9c0daa51a FIXME comment on virtual branches 2022-09-24 23:03:38 +07:00