zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-21 16:16:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
6388 commits 38 branches 306 tags 138 MiB
Commit graph

933 commits

Author SHA1 Message Date
zadam 8725f7cfb2 Merge branch 'stable' 
# Conflicts:
#	src/services/build.js
 2023-04-17 22:26:01 +02:00
zadam 83d8908ee8 release 0.59.4 2023-04-17 21:40:35 +02:00
zadam 3eafdadd1f
Merge branch 'master' into eslint-format 2023-04-17 20:44:34 +02:00
zadam 447b8f0f0c
Merge pull request #3848 from soulsands/auto-reload 
chore: dev auto reload
 2023-04-16 23:30:23 +02:00
zadam aaf6e3bace
Merge pull request #3847 from soulsands/perf-build 
Perf: building improvement
 2023-04-16 23:27:55 +02:00
baiyongjie ead4242735 chore: dev auto reload 2023-04-15 17:58:40 +08:00
baiyongjie 30a8c6b579 perf: building improvement 2023-04-15 17:45:10 +08: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 +08:00
soulsands 2a34c8fa66 Merge remote-tracking branch 'up/master' into eslint-format 2023-04-11 01:02:07 +08:00
zadam 5e88e24693 package upgrades 2023-04-10 18:50:55 +02:00
soulsands cfb04f7d8a chore: add eslint config 2023-04-11 00:21:24 +08:00
zadam ee60652746 eslint config 2023-04-09 23:08:24 +02:00
zadam ed52919f9e release 0.59.3 2023-03-27 23:06:14 +02:00
zadam 63a70f2ffa release 0.59.2 2023-03-14 21:15:08 +01:00
zadam f541bf186c release 0.59.1 2023-02-28 23:39:34 +01:00
zadam fc67dd4d0a release 0.59.0-beta 2023-02-19 21:36:05 +01:00
zadam 760c7b73ad api docs 2023-02-17 16:30:14 +01:00
zadam 956682f2c7 update docs 2023-02-17 16:15:58 +01:00
zadam 4558e349b5 node update 2023-02-17 15:05:27 +01:00
zadam 6f7b554cdc preparing 0.59 without ocr/pdf, userguide, note ancillaries 2023-02-17 14:49:45 +01: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 +01:00
zadam 127486fdf5 removed deprecated API methods 2023-02-15 23:45:25 +01:00
zadam e9a2cacb5b release 0.58.8 2023-02-13 21:50:54 +01:00
zadam 44629e6a0a upgrades 2023-02-10 12:29:07 +01:00
zadam 88e09eb279 ocr wip 2023-02-01 21:07:23 +01:00
zadam b0528b62d8 small attribute optimizations 2023-01-27 16:57:23 +01:00
zadam ad887c4b12 added image OCR and parsing text from PDF (and OCR of PDF images) 2023-01-26 20:32:27 +01:00
zadam c68a67d148 ocr test 2023-01-25 15:20:53 +01:00
zadam 2e9dbda077 Merge remote-tracking branch 'origin/master' into dev 
# Conflicts:
#	package.json
 2023-01-24 09:20:15 +01:00
zadam 339d8a7378 initial implementation of note attachments 2023-01-22 23:36:05 +01:00
zadam a98fd509c6 release 0.58.7 2023-01-17 23:14:58 +01:00
zadam 58d71bf8e3 release 0.58.6 2023-01-16 22:39:28 +01:00
zadam f50a9c250a many small issues found by intellij analysis 2023-01-15 21:04:17 +01:00
zadam 424b624ea9 small mermaid fixes 2023-01-15 13:48:01 +01:00
zadam f7bd72ba2f release 0.58.5 2023-01-14 23:02:39 +01:00
zadam c97ada3434 docs improvements 2023-01-13 23:54:47 +01:00
zadam a110f24b05 Merge branch 'master' into dev 2023-01-13 21:11:23 +01:00
zadam 420175f5ef release 0.58.4 2023-01-11 23:44:33 +01: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 +01:00
zadam f86fb0d0a2 added TRILIUM_SYNC_SERVER_HOST env. variable to prevent prod sync issues 2023-01-06 15:14:04 +01:00
zadam d7cae7d5bb improvements in API docs generation 2023-01-05 23:38:41 +01:00
zadam ac51d0d569 Merge branch 'master' into dev 
# Conflicts:
#	package-lock.json
#	package.json
 2023-01-05 16:17:33 +01:00
zadam 0995c56506 release 0.58.3-beta 2023-01-04 22:36:31 +01:00
zadam 3a5fa2954d Merge remote-tracking branch 'origin/master' 2023-01-03 22:36:56 +01:00
zadam 81013ed21a Merge branch 'stable' 
# Conflicts:
#	package-lock.json
#	package.json
 2023-01-03 22:35:45 +01:00
zadam 53360c147a npm script improvements 2023-01-03 22:34:31 +01: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 +01:00
contributor f02ad63e97 npm i @braintree/sanitize-url 2023-01-03 21:18:23 +02:00
zadam c5ab6fa2fa jsdoc fixes to make export simpler 2023-01-03 14:31:46 +01:00
zadam da161c7ce0 rename shaca entities to have F-prefix, #3476 2023-01-03 13:40:21 +01:00