Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-29 11:02:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/client_typescript_port1

Browse Source 
; Conflicts:
;	package-lock.json
This commit is contained in:
Elian Doran 2024-12-21 20:47:07 +02:00
commit dbe9e43ff1
No known key found for this signature in database
5 changed files with 4338 additions and 6390 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10713
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

8
package.json
View File

@ -68,7 +68,7 @@
"bootstrap": "5.3.3", "bootstrap": "5.3.3",
"boxicons": "2.1.4", "boxicons": "2.1.4",
"cheerio": "1.0.0", "cheerio": "1.0.0",
"chokidar": "4.0.2", "chokidar": "4.0.3",
"cls-hooked": "4.2.2", "cls-hooked": "4.2.2",
"codemirror": "5.65.18", "codemirror": "5.65.18",
"compression": "1.7.5", "compression": "1.7.5",
@ -108,7 +108,7 @@
"jquery.fancytree": "2.38.3", "jquery.fancytree": "2.38.3",
"jsdom": "25.0.1", "jsdom": "25.0.1",
"jsplumb": "2.15.6", "jsplumb": "2.15.6",
"katex": "0.16.17", "katex": "0.16.18",
"knockout": "3.5.1", "knockout": "3.5.1",
"mark.js": "8.11.1", "mark.js": "8.11.1",
"marked": "15.0.4", "marked": "15.0.4",
@ -126,7 +126,7 @@
"request": "2.88.2", "request": "2.88.2",
"safe-compare": "1.1.4", "safe-compare": "1.1.4",
"sanitize-filename": "1.6.3", "sanitize-filename": "1.6.3",
"sanitize-html": "2.13.1", "sanitize-html": "2.14.0",
"sax": "1.4.1", "sax": "1.4.1",
"semver": "7.6.3", "semver": "7.6.3",
"serve-favicon": "2.5.0", "serve-favicon": "2.5.0",
@ -206,7 +206,7 @@
"typedoc": "0.27.5", "typedoc": "0.27.5",
"typescript": "5.7.2", "typescript": "5.7.2",
"webpack": "5.97.1", "webpack": "5.97.1",
"webpack-cli": "5.1.4", "webpack-cli": "6.0.1",
"webpack-dev-middleware": "7.4.2" "webpack-dev-middleware": "7.4.2"
} }
} }

1
src/public/app/widgets/buttons/calendar.js
View File

@ -222,7 +222,6 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
} }
async createMonth() { async createMonth() {
console.log(new Error());
const month = utils.formatDateISO(this.date).substr(0, 7); const month = utils.formatDateISO(this.date).substr(0, 7);
const dateNotesForMonth = await server.get(`special-notes/notes-for-month/${month}`); const dateNotesForMonth = await server.get(`special-notes/notes-for-month/${month}`);

2
src/public/app/widgets/tab_row.js
View File

@ -176,7 +176,7 @@ const TAB_ROW_TPL = `
bottom: 0; bottom: 0;
right: 0; right: 0;
left: 0; left: 0;
z-index: 1000; z-index: 50;
} }
.tab-row-widget .note-tab .note-tab-close { .tab-row-widget .note-tab .note-tab-close {

4
src/public/app/widgets/type_widgets/options/options_widget.js
View File

@ -61,7 +61,9 @@ export default class OptionsWidget extends NoteContextAwareWidget {
async refreshWithNote(note) { async refreshWithNote(note) {
const options = await server.get('options'); const options = await server.get('options');
this.optionsLoaded(options); if (options) {
this.optionsLoaded(options);
}
} }
async entitiesReloadedEvent({loadResults}) { async entitiesReloadedEvent({loadResults}) {