zadam
ac51d0d569
Merge branch 'master' into dev
...
# Conflicts:
# package-lock.json
# package.json
2023-01-05 16:17:33 +01:00
zadam
e8a9389e6d
remove console.log
2023-01-03 21:44:47 +01:00
zadam
bff7434921
rename becca entities to have B-prefix, #3476
2023-01-03 13:52:37 +01:00
zadam
1b24276a4a
always use template strings instead of string concatenation
2022-12-21 15:19:05 +01:00
zadam
5fc9f5f3f9
improvements
2022-12-06 23:48:44 +01:00
zadam
b9632a7814
rename note types to camelCase
2022-12-06 23:01:42 +01:00
zadam
d619a7a2d7
rename "widget" type to "content-widget"
2022-12-06 16:23:49 +01:00
zadam
012fb1f50b
rename "widget" type to "content-widget"
2022-12-06 16:23:30 +01:00
zadam
aec2c2d5cd
appearance options as a special note
2022-12-05 23:57:29 +01:00
zadam
99a5774148
Merge branch 'master' into next58
...
# Conflicts:
# package-lock.json
2022-12-03 13:01:03 +01:00
zadam
36c98e919a
fix cursor jumping problem when having same note open in two tabs, closes #3365
2022-12-01 22:50:53 +01:00
zadam
fc080f785b
moving components to its own directory
2022-12-01 13:07:23 +01:00
zadam
1a6c9be065
renamed shortcuts to launchers
2022-12-01 10:16:57 +01: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 +01:00
zadam
1d8b02055e
Merge branch 'stable'
2022-11-06 14:24:37 +01:00
zadam
a7f4bf8289
fix updating note detail after change from another client, closes #3292
2022-11-06 14:19:40 +01:00
zadam
b499640db8
use trilium version number in asset paths to avoid caching issues WIP
2022-10-26 23:50:54 +02: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 +02:00
zadam
4116fe0a20
fix propagation of noteTypeMimeChanged event to global scope to fix e.g. edit button switching depending on note type
2022-10-14 20:36:40 +02:00
zadam
08aa65bddb
launchbar WIP
2022-08-06 15:00:56 +02:00
zadam
1f6222a653
fix notemap resize + upgrade of force-graph
2022-08-02 17:17:27 +02:00
zadam
4cec856e21
simplified updating note content
2022-06-13 22:38:59 +02:00
zadam
4211d0feda
Merge branch 'master' into next53
2022-06-05 22:25:14 +02:00
zadam
5fbaed61c1
fix "cut to note", closes #2895 , #1182
2022-06-03 22:05:18 +02:00
zadam
c0c38a4b49
Merge branch 'master' into next53
2022-06-02 22:32:29 +02:00
zadam
15a9ff4450
when closing / clearing last tab, close all splits
2022-06-02 22:28:25 +02:00
zadam
8052574950
rename iframe to web view
2022-05-30 20:59:54 +02:00
zadam
ee217d6306
added iframe note type
2022-05-28 22:19:29 +02:00
zadam
8df3b0a5bd
Merge branch 'master' into excalidraw
2022-05-12 23:46:52 +02:00
Tom
3df712b64f
refactor canvas-note to canvas
2022-05-10 13:43:05 +02:00
zadam
93cc6b12ec
added new APIs to access note detail, #2806
2022-05-03 23:25:28 +02:00
Tom
8d510a3fdd
Merge remote-tracking branch 'upstream/master' into excalidraw
...
conflict in
- package-lock (accept incoming),
- routes (remove the option to have image without filename, since it is not really necessary for canvas_note)
- note_detail
2022-05-03 21:56:52 +02:00
zadam
a9dc62505d
fix height of textarea of SQL console
2022-05-02 21:23:40 +02:00
Tom
d3e86acfaa
explain checkFullHeight() due to missleading name
2022-04-19 00:21:29 +02:00
Tom
9771b441ad
missing path2d support for freedawings, remove node-side rendering, allow async getContent()
...
* ## Excalidraw and SVG
* 2022-04-16 - @thfrei
*
* Known issues:
* - excalidraw-to-svg (node.js) does not render any hand drawn (freedraw) paths. There is an issue with
* Path2D object not present in node-canvas library used by jsdom. (See Trilium PR for samples and other issues
* in respective library. Link will be added later). Related links:
* - https://github.com/Automattic/node-canvas/pull/2013
* - https://github.com/google/canvas-5-polyfill
* - https://github.com/Automattic/node-canvas/issues/1116
* - https://www.npmjs.com/package/path2d-polyfill
* - excalidraw-to-svg (node.js) takes quite some time to load an image (1-2s)
* - excalidraw-utils (browser) does render freedraw, however NOT freedraw with background
*
* Due to this issues, we opt to use **only excalidraw in the frontend**. Upon saving, we will also get the SVG
* output from the live excalidraw instance. We will save this **SVG side by side the native excalidraw format
* in the trilium note**.
*
* Pro: we will combat bit-rot. Showing the SVG will be very fast, since it is already rendered.
* Con: The note will get bigger (maybe +30%?), we will generate more bandwith.
* (However, using trilium desktop instance, does not care too much about bandwidth. Size increase is probably
* acceptable, as a trade off.)
2022-04-19 00:21:20 +02:00
Tom
272bb136d8
make canvas_note height 100%
2022-04-19 00:13:27 +02:00
Tom Free
a894c19c2b
add missing canvas-note entries in helper functions
...
Conflicts:
src/public/app/entities/note_short.js
src/public/app/services/tree_context_menu.js
2022-04-19 00:13:26 +02:00
zadam
a21c49cba7
added "hideRelations" label to relation map
2022-02-05 13:02:19 +01:00
zadam
a5444fd6ad
print should include promoted attributes, #2550
2022-01-14 21:02:11 +01:00
zadam
9ee1c9f3da
ETAPI delete/patch, refactoring
2022-01-07 19:33:59 +01:00
zadam
bc920dc5dc
refactoring of mermaid support WIP
2021-09-29 22:14:45 +02:00
zadam
896c9cec04
refactoring of mermaid support WIP
2021-09-29 22:10:15 +02:00
Abitofevrything
b37bcd294c
Implement mermaid diagrams ( #2187 )
...
* Start implementing mermaid diagrams
* Implement theming for mermaid diagrams
* Add edit tab to mermaid diagrams
* Remove comment
* Render mermaid diagrams in included notes
* Prevent mermaid notes from being removed to consistency checks
2021-09-29 21:54:56 +02:00
zadam
113bebed3b
switching themes via loading only specific CSS
2021-09-26 15:24:37 +02:00
zadam
e4ba7d65e8
note map refactoring
2021-09-20 22:19:47 +02:00
zadam
dd37f09309
global link map WIP
2021-09-18 14:29:41 +02:00
zadam
ed26e32ccb
skeleton for global link map
2021-09-16 23:09:48 +02:00
zadam
d0747b125c
improvements in frontend sync (WIP)
2021-08-25 22:49:24 +02:00
zadam
1b9c3b0759
keep focus when clicking on edit read only note
2021-06-24 23:50:56 +02:00
zadam
02da5b598c
added "edit" button into ribbon button container
2021-06-15 22:59:13 +02:00