gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 21:19:01 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity
6,097 Commits 44 Branches 349 Tags
Commit Graph

6097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam
843f5d0da1 gitignore 2023-01-08 12:54:55 +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
218f526a92 fix order by note content size, closes #3488 2023-01-05 15:52:07 +01:00
zadam
161b45aa12
Merge pull request #3489 from Nriver/master 
use api.showMessage instead of alert
 2023-01-05 15:24:42 +01:00
zadam
397629587c Merge remote-tracking branch 'origin/master' 2023-01-05 15:23:31 +01:00
zadam
034098fd06 don't use alert, #3483 2023-01-05 15:23:22 +01:00
Nriver
e03cc01e15 use api.showMessage instead of alert 2023-01-05 09:02:40 +08:00
zadam
0995c56506 release 0.58.3-beta v0.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
398480415e package-lock.json 2023-01-03 22:36:41 +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
9e47da3f03
Merge pull request #3150 from zadam/dependabot/npm_and_yarn/json-schema-and-jsprim-0.4.0 
Bump json-schema and jsprim
 2023-01-03 22:32:36 +01:00
zadam
faefe10c15
Merge pull request #3423 from zadam/dependabot/npm_and_yarn/terser-5.16.1 
Bump terser from 5.10.0 to 5.16.1
 2023-01-03 22:32:15 +01:00
zadam
a4d3150a24
Merge pull request #2739 from zadam/dependabot/npm_and_yarn/nanoid-3.3.1 
Bump nanoid from 3.1.30 to 3.3.1
 2023-01-03 22:31:57 +01:00
zadam
e1f0676891
Merge pull request #3197 from zadam/dependabot/npm_and_yarn/dump-db/minimist-1.2.7 
Bump minimist from 1.2.5 to 1.2.7 in /dump-db
 2023-01-03 22:31:08 +01:00
zadam
792ac9b77d
Merge pull request #3408 from zadam/dependabot/npm_and_yarn/qs-6.5.3 
Bump qs from 6.5.2 to 6.5.3
 2023-01-03 22:30:42 +01:00
zadam
bbbd2f7e82
Merge pull request #3481 from contributor/feature/safeVsCodeLaunch 
Safe Vs Code debug launch
 2023-01-03 22:29:36 +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
zadam
e8a9389e6d remove console.log 2023-01-03 21:44:47 +01:00
zadam
6dce13bc34 export root note fix, #2346 2023-01-03 21:30:49 +01:00
contributor
71cdea3902 fix vscode launch can break release app data 2023-01-03 21:39:35 +02:00
contributor
85a6e8b47e fix clipping selection can create multiple notes for the same Url 
sanitize was replacing '&' char to '&'and changing actual Url
 2023-01-03 21:18:23 +02:00
contributor
f02ad63e97 npm i @braintree/sanitize-url 2023-01-03 21:18:23 +02:00
contributor
977399a73e refac: better naming 2023-01-03 21:18:23 +02:00
zadam
291ef87c9b fix edit button 2023-01-02 22:32:05 +01:00
zadam
115bf0af4d fix button paddings 2023-01-02 21:08:20 +01:00
zadam
e40f1fd11a fix inclusion of the image into the correct position in ENEX import, closes #3468 2023-01-01 21:02:54 +01:00
zadam
797ddf6205 search hit with exact note title match gets a strong score boost, closes #3470 2022-12-30 23:14:48 +01:00
zadam
ca4e1c19a7 make utils.normalize null-safe, #3469 2022-12-30 21:00:42 +01:00
zadam
dd82b0f958 Merge remote-tracking branch 'origin/master' 2022-12-29 10:25:54 +01:00
zadam
f150c223bc improved ZIP import validation and error handling 2022-12-29 10:25:49 +01:00
zadam
4f771cfa7a
Merge pull request #3467 from contributor/feature/enex-pageUrl 
Evernote import - use pageUrl attribute for enex source-url
 2022-12-29 09:57:43 +01:00
contributor
aa3b26c965 Evernote import - use pageUrl attribute for enex source-url 2022-12-29 01:27:17 +02:00
zadam
f4cf04232f release 0.58.2-beta v0.58.2-beta 2022-12-29 00:12:54 +01:00
zadam
d36cf47974 no-dir npm scripts 2022-12-28 23:17:59 +01:00
zadam
f809da58ec fix occurrences of 'root' branch 2022-12-28 13:09:49 +01:00
zadam
ff1f01be8c erase deleted notes in the migration 2022-12-28 12:58:53 +01:00
zadam
0ddaa8f5c2 migration fixes 2022-12-27 21:17:40 +01:00
zadam
620bed73bb put back the removed widgets, the BC break is not worth it 2022-12-27 15:05:12 +01:00
zadam
c177d2b97b fix migration 2022-12-27 14:52:32 +01:00
zadam
0758c82983 hidden subtree is now built as "predictable" to avoid duplicating it in sync 2022-12-27 14:44:28 +01:00
zadam
ecc2ed7d73 formatting 2022-12-27 10:22:50 +01:00
zadam
4b779d7512 small refactors in sync 2022-12-27 09:53:25 +01:00
zadam
701911b766 release 0.58.1-beta v0.58.1-beta 2022-12-26 23:57:31 +01:00
zadam
7a8bbdced8 fix cursor in the textarea, closes #3459 2022-12-26 20:07:04 +01:00
zadam
affd8062e2 escape note titles in note map 2022-12-26 10:52:28 +01:00
zadam
2cfc43a4fd
Merge pull request #3456 from WPum/patch-1 
sync chinese readme with the english version
 2022-12-25 19:53:34 +01:00
WPum
fb789b7bd8
sync chinese readme with the english version 2022-12-25 23:42:44 +08:00
zadam
b906efb23b fix ZIP import without metadata 2022-12-25 14:10:12 +01:00