gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

text editor now support font size, color, background

Browse Source
This commit is contained in:
zadam 2019-08-29 22:20:08 +02:00
parent c8f59ea547
commit 84b1f1f24e
5 changed files with 29 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ckeditor/ckeditor.js vendored
View File

File diff suppressed because one or more lines are too long

2
libraries/ckeditor/ckeditor.js.map
View File

File diff suppressed because one or more lines are too long

60
package-lock.json generated
View File

@ -120,15 +120,16 @@
} }
}, },
"@electron/get": { "@electron/get": {
"version": "1.4.0", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/@electron/get/-/get-1.4.0.tgz", "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.5.0.tgz",
"integrity": "sha512-FN20Sj0shfHsInfYWQ2ERG/UgyTMNK92WBwl3k9qcIOCZ5Kfz+PwoO29x7lEnEEDONSwlEvHEUs0dJqfqrpEuA==", "integrity": "sha512-tafxBz6n08G6SX961F/h8XFtpB/DdwRvJJoDeOH9x78jDSCMQ2G/rRWqSwLFp9oeMFBJf0Pf5Kkw6TKt5w9TWg==",
"dev": true, "dev": true,
"requires": { "requires": {
"debug": "^4.1.1", "debug": "^4.1.1",
"env-paths": "^2.2.0", "env-paths": "^2.2.0",
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",
"got": "^9.6.0", "got": "^9.6.0",
"sanitize-filename": "^1.6.2",
"sumchecker": "^3.0.0" "sumchecker": "^3.0.0"
}, },
"dependencies": { "dependencies": {
@ -1406,6 +1407,11 @@
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
}, },
"bowser": {
"version": "2.5.3",
"resolved": "https://registry.npmjs.org/bowser/-/bowser-2.5.3.tgz",
"integrity": "sha512-aWCA+CKfKNL/WGzNgjmK+Whp57JMzboZMwJ5gy2jDj2bEIjbMCb3ImGX+V++5wsJftyFiDIbOjRXl60ycniVqg=="
},
"boxen": { "boxen": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
@ -2384,23 +2390,12 @@
} }
}, },
"cross-zip": { "cross-zip": {
"version": "2.1.5", "version": "2.1.6",
"resolved": "https://registry.npmjs.org/cross-zip/-/cross-zip-2.1.5.tgz", "resolved": "https://registry.npmjs.org/cross-zip/-/cross-zip-2.1.6.tgz",
"integrity": "sha1-xdGgaksaEqAzBk+UbrWubUvc8+E=", "integrity": "sha512-xLIETNkzRcU6jGRzenJyRFxahbtP4628xEKMTI/Ql0Vu8m4h8M7uRLVi7E5OYHuJ6VQPsG4icJumKAFUvfm0+A==",
"dev": true, "dev": true,
"requires": { "requires": {
"rimraf": "^2.5.2" "rimraf": "^3.0.0"
},
"dependencies": {
"rimraf": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
"dev": true,
"requires": {
"glob": "^7.1.3"
}
}
} }
}, },
"crypto-random-string": { "crypto-random-string": {
@ -3946,9 +3941,9 @@
} }
}, },
"electron-packager": { "electron-packager": {
"version": "14.0.4", "version": "14.0.5",
"resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-14.0.4.tgz", "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-14.0.5.tgz",
"integrity": "sha512-YTZHPU2PESY86BAmTxJ8VVOvwsE2Tc/NUuBYoo/F8Qj4t4GNGBVy5VfusxEem9g7Fnn0uS9KFN60fn/OlzRaMw==", "integrity": "sha512-vgCUVGcT5Ig/vartQVSkfs8MbsYxAYgIt2zom4pVNrNBJKSxUSS+OT8Tdq87aJvY3R0SHuLqhfY9lpw3yw/Iug==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^1.3.0", "@electron/get": "^1.3.0",
@ -6579,9 +6574,9 @@
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
}, },
"helmet": { "helmet": {
"version": "3.20.0", "version": "3.20.1",
"resolved": "https://registry.npmjs.org/helmet/-/helmet-3.20.0.tgz", "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.20.1.tgz",
"integrity": "sha512-Ob+TqmQFZ5f7WgP8kBbAzNPsbf6p1lOj5r+327/ymw/IILWih3wcx9u/u/S8Mwv5wbBkO7Li6x5s23t3COhUKw==", "integrity": "sha512-em+X5Wz/f0yqoRsBnpnVy3wJHSiIeskX3FQn30szBh1tILaOeSRRLkShuUVFlk/o4qTYjWxdHg4FrRe45iBWHg==",
"requires": { "requires": {
"depd": "2.0.0", "depd": "2.0.0",
"dns-prefetch-control": "0.2.0", "dns-prefetch-control": "0.2.0",
@ -6590,7 +6585,7 @@
"feature-policy": "0.3.0", "feature-policy": "0.3.0",
"frameguard": "3.1.0", "frameguard": "3.1.0",
"helmet-crossdomain": "0.4.0", "helmet-crossdomain": "0.4.0",
"helmet-csp": "2.8.0", "helmet-csp": "2.9.0",
"hide-powered-by": "1.1.0", "hide-powered-by": "1.1.0",
"hpkp": "2.0.0", "hpkp": "2.0.0",
"hsts": "2.2.0", "hsts": "2.2.0",
@ -6613,14 +6608,14 @@
"integrity": "sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA==" "integrity": "sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA=="
}, },
"helmet-csp": { "helmet-csp": {
"version": "2.8.0", "version": "2.9.0",
"resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.8.0.tgz", "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.9.0.tgz",
"integrity": "sha512-MlCPeM0Sm3pS9RACRihx70VeTHmkQwa7sum9EK1tfw1VZyvFU0dBWym9nHh3CRkTRNlyNm/WFCMvuh9zXkOjNw==", "integrity": "sha512-DGGOQtOLM7ZQpjbf/uvUonq1yG/rFgsBuK10ZJt2AtxUJxqfkPvfmP9aLUmgH9IactiRiYoiFY72YYSPl1TLTQ==",
"requires": { "requires": {
"bowser": "2.5.3",
"camelize": "1.0.0", "camelize": "1.0.0",
"content-security-policy-builder": "2.1.0", "content-security-policy-builder": "2.1.0",
"dasherize": "2.0.0", "dasherize": "2.0.0"
"platform": "1.3.5"
} }
}, },
"hide-powered-by": { "hide-powered-by": {
@ -10136,11 +10131,6 @@
} }
} }
}, },
"platform": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz",
"integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q=="
},
"plist": { "plist": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz", "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",

4
package.json
View File

@ -40,7 +40,7 @@
"express-session": "1.16.2", "express-session": "1.16.2",
"file-type": "12.2.0", "file-type": "12.2.0",
"fs-extra": "8.1.0", "fs-extra": "8.1.0",
"helmet": "3.20.0", "helmet": "3.20.1",
"html": "1.0.0", "html": "1.0.0",
"html2plaintext": "2.1.2", "html2plaintext": "2.1.2",
"http-proxy-agent": "^2.1.0", "http-proxy-agent": "^2.1.0",
@ -81,7 +81,7 @@
"electron-builder": "21.2.0", "electron-builder": "21.2.0",
"electron-compile": "6.4.4", "electron-compile": "6.4.4",
"electron-installer-debian": "2.0.0", "electron-installer-debian": "2.0.0",
"electron-packager": "14.0.4", "electron-packager": "14.0.5",
"electron-rebuild": "1.8.6", "electron-rebuild": "1.8.6",
"jsdoc": "^3.6.3", "jsdoc": "^3.6.3",
"lorem-ipsum": "2.0.3", "lorem-ipsum": "2.0.3",

1
src/routes/routes.js
View File

@ -34,7 +34,6 @@ const searchRoute = require('./api/search');
const dateNotesRoute = require('./api/date_notes'); const dateNotesRoute = require('./api/date_notes');
const linkMapRoute = require('./api/link_map'); const linkMapRoute = require('./api/link_map');
const clipperRoute = require('./api/clipper'); const clipperRoute = require('./api/clipper');
const customCodeMimeTypesRoute = require('./api/custom_code_mime_types.js');
const log = require('../services/log'); const log = require('../services/log');
const express = require('express'); const express = require('express');