12129 Commits

Author SHA1 Message Date
PChemGuy
4971619b69 Missing quotes 2025-03-14 14:19:11 +03:00
Elian Doran
875e65284c
feat(docs): use <kbd> for keyboard shortcuts 2025-03-14 12:11:09 +02:00
Elian Doran
806cd7129a
fix(docs): rtl image 2025-03-14 11:34:27 +02:00
Elian Doran
c8725ce6ef
feat(docs): align documentation with new settings 2025-03-14 11:32:07 +02:00
Elian Doran
0c55b1eee8
feat(editor): rewrite <i> to <em> for compatibility with Markdown 2025-03-14 11:31:46 +02:00
Elian Doran
9b217a5b82
Merge pull request #1366 from rom1dep/calendar_enh_displayed
feat(calendar) improvements
2025-03-14 11:17:44 +02:00
Elian Doran
a50b8c7f0a
Merge pull request #1425 from TriliumNext/renovate/mermaid-11.x
fix(deps): update dependency mermaid to v11.5.0
2025-03-14 11:15:51 +02:00
Elian Doran
5efb5fd303
Merge pull request #1424 from TriliumNext/renovate/i18next-24.x
fix(deps): update dependency i18next to v24.2.3
2025-03-14 11:15:12 +02: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
perf3ct
f8d4088dfe
Merge branch 'develop' into ai-llm-integration 2025-03-13 19:10:46 +00: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
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
Adorian Doran
1369a44d9b style/options/ETAPI: add an icon to the create token button 2025-03-13 05:25:34 +02:00
Adorian Doran
88aa9a4e79 client/options/code notes: create the "Editor" section, reorganize 2025-03-13 05:20:58 +02:00
Adorian Doran
0e748fbce0 style/options/ETAPI: update the icon of the edit token button 2025-03-13 04:30:42 +02:00
Adorian Doran
6c6d20a830 style: fix note title input overlapping with the zen mode exit button 2025-03-13 04:19:42 +02:00
Adorian Doran
69f95068f1 style(next)/shell/right pane: minor restyle 2025-03-13 04:04:08 +02:00
Adorian Doran
2066f821cb style(next)/ribbon/image properties: improve the layout 2025-03-13 03:24:04 +02:00
perf3ct
4796c24898
Merge branch 'develop' into ai-llm-integration 2025-03-12 22:49:29 +00:00
perf3ct
6bb4bbb1af
specially handle Buffer objects into Base64 and back for Becca 2025-03-12 22:43:58 +00:00
perf3ct
67766e3e9f
create note_embedding object for becca 2025-03-12 22:37:49 +00:00
perf3ct
8d7e5c8d43
fix the maths for stats 2025-03-12 21:18:59 +00:00
perf3ct
d4cfc65b27
yes, now the failed embeddings section at least looks passable 2025-03-12 21:15:57 +00:00
perf3ct
ee7b2283de
correctly style the failed embeddings section 2025-03-12 21:13:49 +00:00
perf3ct
c914aaa4a8
do a better job of handling failed note embeddings 2025-03-12 21:04:06 +00:00
Adorian Doran
25a787f9dc Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop 2025-03-12 22:30:51 +02:00