15336 Commits

Author SHA1 Message Date
renovate[bot]
2e436cdd46
chore(deps): update dependency electron to v35 2025-03-14 09:14:49 +00:00
Elian Doran
3656b1e0eb
Merge pull request #1423 from TriliumNext/renovate/force-graph-1.x
fix(deps): update dependency force-graph to v1.49.4
2025-03-14 11:14:47 +02:00
Elian Doran
b2060799c4
Merge pull request #1422 from TriliumNext/renovate/axios-1.x
fix(deps): update dependency axios to v1.8.3
2025-03-14 11:14:13 +02:00
Elian Doran
b18e5a34c4
Merge pull request #1421 from TriliumNext/renovate/electron-34.x
chore(deps): update dependency electron to v34.3.3
2025-03-14 11:13:57 +02:00
Elian Doran
2578c2d4f6
Merge pull request #1398 from TriliumNext/renovate/happy-dom-monorepo
chore(deps): update dependency happy-dom to v17.4.4
2025-03-14 11:13:17 +02:00
renovate[bot]
618bba71da
fix(deps): update dependency mermaid to v11.5.0 2025-03-14 02:53:05 +00:00
renovate[bot]
8bff71fed4
fix(deps): update dependency i18next to v24.2.3 2025-03-14 02:52:56 +00:00
renovate[bot]
839cfac2ac
fix(deps): update dependency force-graph to v1.49.4 2025-03-14 02:52:45 +00:00
renovate[bot]
ded979b6ff
fix(deps): update dependency axios to v1.8.3 2025-03-14 02:52:32 +00:00
renovate[bot]
948c60277d
chore(deps): update dependency electron to v34.3.3 2025-03-14 02:52:20 +00:00
Elian Doran
f487348cc5
chore(admonitions): remove formatting plugin for now 2025-03-14 00:04:23 +02:00
Elian Doran
ee76e81d1f
feat(admonitions): integrate custom admonitions plugin 2025-03-14 00:02:55 +02:00
Elian Doran
878743500f feat(admonitions): convert to split and get last type 2025-03-13 23:20:58 +02:00
Elian Doran
5c9fe3adcd feat(admonitions): indicate with a checkmark the active type 2025-03-13 22:47:21 +02:00
Elian Doran
a3354d4d10 refactor(admonitions): remove no longer needed custom conversion 2025-03-13 22:21:43 +02:00
Elian Doran
504879b11c feat(admonitions): allow changing admonition type 2025-03-13 22:20:12 +02:00
Elian Doran
fb7e310224 feat(admonitions): allow selecting admonition type 2025-03-13 21:27:29 +02:00
perf3ct
f8d4088dfe
Merge branch 'develop' into ai-llm-integration 2025-03-13 19:10:46 +00:00
Elian Doran
d29edbe325 fix(admonitions): create dropdown list 2025-03-13 20:07:55 +02:00
Elian Doran
283dbb2b75 fix(admonitions): double enter to exit block 2025-03-13 19:41:46 +02:00
Elian Doran
8c6c15a8d1 feat(admonitions): apply dedicated admonition class 2025-03-13 19:38:52 +02:00
Elian Doran
c49b30cf53 feat(admonitions): use aside instead of blockquote 2025-03-13 19:28:57 +02:00
Elian Doran
d11254e044 feat(admonitions): add custom icon 2025-03-13 19:10:07 +02:00
Elian Doran
d79110b75c feat(admonitions): rename toolbar button 2025-03-13 19:05:20 +02:00
Elian Doran
137c5c27cd refactor(admonitions): more references to blockquote 2025-03-13 19:02:17 +02:00
Elian Doran
e028f88821 chore(admonitions): rename plugin names and more references 2025-03-13 18:41:37 +02:00
Elian Doran
9ef17919c5 refactor(admonitions): remove unnecessary docs 2025-03-13 18:37:43 +02:00
Elian Doran
303a943b81 refactor(admonitions): remove unnecessary tests 2025-03-13 18:37:19 +02:00
Elian Doran
a0b60eed8f refactor(admonitions): rename exports 2025-03-13 18:36:36 +02:00
Elian Doran
eaa52b4527 refactor(admonition): rename files 2025-03-13 18:35:10 +02:00
Elian Doran
0f9ab0dd89 refactor(admonitions): rename classes 2025-03-13 18:33:39 +02:00
Elian Doran
9af9845985 chore(admonitions): start off with a fresh copy of blockquote plugin 2025-03-13 18:27:05 +02:00
Elian Doran
e24812f1a3 chore(admonitions): start off with a fresh copy of blockquote plugin 2025-03-13 18:27:05 +02:00
Elian Doran
507a594198
feat(admonitions): color the icon 2025-03-13 16:22:05 +02:00
Elian Doran
732252df5b
feat(admonitions): add custom color per admonition 2025-03-13 16:19:58 +02:00
Elian Doran
ba39769174
feat(admonitions): add icon 2025-03-13 16:13:16 +02:00
Elian Doran
21658e62b4 feat(editor): add style plugin 2025-03-13 14:01:16 +02:00
Panagiotis Papadopoulos
6a9342abce build(Docker): add a temporary exception for files that copy-dist tries to copy for electron-forge, as otherwise copy-dist will fail inside Docker build
this will be fixed in an upcoming PR where I overhaul copy-dist to allow for build target specific copying of files
2025-03-13 08:44:31 +01:00
Panagiotis Papadopoulos
67c752c11b ci: adjust build-electron action to use the newly introduced outDir "./dist" for electron-forge 2025-03-13 08:21:12 +01:00
Elian Doran
adf5bee98f
feat(admonitions): apply basic styling & configure for paragraphs 2025-03-13 09:15:11 +02:00
Panagiotis Papadopoulos
cc0931b402 build(electron-forge): set outDir to ./dist, to have the same behaviour as the Server builds
since we run electron-forge inside the ./build folder, we need to go up a directory (using ../dist), to have it output to ./dist
2025-03-13 08:09:53 +01:00
Panagiotis Papadopoulos
b48fbbe583 build(copy-dist): copy over desktop.ejs for electron-forge as well
it is required for Flatpak/Deb/RPM Linux packages
2025-03-13 07:59:12 +01:00
Panagiotis Papadopoulos
1877d26296 chore(scripts): electron-forge:prepare -> copy node_modules folder as is
electron-forge does not like, if we get rid of devDeps ourselves already it seems.
It *wants* to do it itself, otherwise build fails…

It does seem to correctly strip all the devDeps though, at least there's that.
2025-03-13 07:59:12 +01:00
Panagiotis Papadopoulos
4ce2c10d72 build(copy-dist): copy over the start scripts for now 2025-03-13 07:59:12 +01:00
Panagiotis Papadopoulos
11772860b6 build(electron-forge): stop copying unused .anonymize-database.sql as ressource 2025-03-13 07:59:12 +01:00
Panagiotis Papadopoulos
6b9d8f0d67 build(electron-forge): execute electron-forge commands in our "build" output context
since we build TS and webpack ourselves and are not using any electron-forge plugins (at least at the moment) -> we should use the "build" folder as build context for electron-forge:

in comparison to running electron-forge in the root folder of the project, this avoids electron-forge from packing the source code multiple times (e.g. once as uncompiled TS, then as compiled JS, and then (partially) a third time as webpack bundled JS files), same as some of the assets.

to achieve this, we run our usual TS/Webpack build process, but then install the npm dependencies *inside* the build folder (as otherwise electron-forge would choke on the missing node_modules it and abort building).

In theory we could avoid cd-ing into the build folder, by providing the "dir" as argument to electron-forge's CLI -- BUT that wouldn't play well with our CI, where we are passing --arch and --platform options to it, which need to come *before* the dir argument.

since we now cd into the "build" folder, we also need to adjust the path in package.json "main" again
2025-03-13 07:59:12 +01:00
Adorian Doran
10de4e798b client/options: fix failing test 2025-03-13 06:10:09 +02:00
Adorian Doran
eb630c80d6 client/options: format code 2025-03-13 05:50:29 +02:00
Adorian Doran
5cab7eb403 client/options: reorder sections 2025-03-13 05:46:34 +02:00
Adorian Doran
04c6813b0a client/options: relocate the "Localization" section to the "Language & Region" page 2025-03-13 05:35:43 +02:00