67c752c11b
ci: adjust build-electron action to use the newly introduced outDir "./dist" for electron-forge
2025-03-13 08:21:12 +01:00
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
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
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
4ce2c10d72
build(copy-dist): copy over the start scripts for now
2025-03-13 07:59:12 +01:00
11772860b6
build(electron-forge): stop copying unused .anonymize-database.sql as ressource
2025-03-13 07:59:12 +01:00
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
10de4e798b
client/options: fix failing test
2025-03-13 06:10:09 +02:00
eb630c80d6
client/options: format code
2025-03-13 05:50:29 +02:00
5cab7eb403
client/options: reorder sections
2025-03-13 05:46:34 +02:00
04c6813b0a
client/options: relocate the "Localization" section to the "Language & Region" page
2025-03-13 05:35:43 +02:00
1369a44d9b
style/options/ETAPI: add an icon to the create token button
2025-03-13 05:25:34 +02:00
88aa9a4e79
client/options/code notes: create the "Editor" section, reorganize
2025-03-13 05:20:58 +02:00
0e748fbce0
style/options/ETAPI: update the icon of the edit token button
2025-03-13 04:30:42 +02:00
6c6d20a830
style: fix note title input overlapping with the zen mode exit button
2025-03-13 04:19:42 +02:00
69f95068f1
style(next)/shell/right pane: minor restyle
2025-03-13 04:04:08 +02:00
2066f821cb
style(next)/ribbon/image properties: improve the layout
2025-03-13 03:24:04 +02:00
25a787f9dc
Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop
2025-03-12 22:30:51 +02:00
a2b73feb25
style/image properties: add icons to buttons
2025-03-12 22:30:49 +02:00
062955aa81
feat(editor): integrate styles support
2025-03-12 22:08:23 +02:00
b8cbd79ae1
refactor(client): rename ckeditor config file
2025-03-12 22:08:23 +02:00
fc4712240c
Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop
2025-03-12 21:42:43 +02:00
18882d0b7e
style(next)/toasts: change the dark mode colors
2025-03-12 21:42:39 +02:00
d469670a46
feat(docs): document formatting keyboard shortcuts + fix broken image
2025-03-12 19:03:33 +02:00
e0cebf1c00
style(next): apply kbd style to content
2025-03-12 18:08:39 +02:00
383408e884
style(editor): add some separators to formatting toolbar
2025-03-12 18:06:34 +02:00
87d28c8c2f
style(editor): group some formatting options for floating toolbar
2025-03-12 18:04:20 +02:00
bec7a526ad
feat(editor): add support for marking keyboard shortcuts
2025-03-12 17:58:12 +02:00
bb8325cf8d
Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop
2025-03-12 15:08:26 +02:00
da9a029f8f
style(next)/note list: remove a no longer needed border
2025-03-12 15:08:22 +02:00
c02b5468a6
feat(docs): clean up RTL and reorder
2025-03-12 14:47:42 +02:00
5dd5e8da91
feat(docs): document adjusting image alignment
2025-03-12 13:36:30 +02:00
f991cee3ac
Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop
2025-03-12 13:31:07 +02:00
1426e43fb8
style(next): move color variables to color scheme-related stylesheets
2025-03-12 13:31:04 +02:00
61899aa32d
chore(edit-docs): ignore document.db
2025-03-12 13:14:09 +02:00
e90bbe31ba
feat(docs): document the launch bar
2025-03-12 13:14:09 +02:00
034998fa97
feat(docs): document vertical vs horizontal layout
2025-03-12 13:14:08 +02:00
3a41d8fd11
feat(docs): improve note tree documentation
2025-03-12 13:14:08 +02:00
e9175d60ec
feat(docs): improve documentation for code notes, code blocks
2025-03-12 13:14:08 +02:00
4f87bd101e
Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop
2025-03-12 12:55:57 +02:00
9c78415a1f
style(next): restyle toasts
2025-03-12 12:55:55 +02:00
06d848ba17
feat(code): support mips ( closes #1406 )
2025-03-12 10:54:44 +02:00
42821d47c8
refactor(mime): sort alphabetically
2025-03-12 10:54:19 +02:00
d7aedfbd36
build(copy-dist): exit on any caught error to make sure copy-dist fails during CI if any error occurs
...
if we don't exit, it will just log the issue - however we *want* it to fail it there is an error, so that it doesn't continue in the CI
alternative would be to rethrow the error, but then we'd print the error into the logs twice :-)
closes https://github.com/TriliumNext/Notes/issues/1413
2025-03-12 09:52:42 +01:00
b730ca0033
Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop
2025-03-12 10:44:04 +02:00
bad7776076
style/toasts: get rid of some !important properties
2025-03-12 10:43:53 +02:00
d088c8e5b2
build(copy-dist): fix path to excalidraw fonts
2025-03-12 08:57:05 +01:00
2463e44bf8
chore(deps): downgrade to react 18
2025-03-12 09:15:37 +02:00
ddd2babe21
style/content renderer: localize some strings
2025-03-12 03:40:56 +02:00
b082f95d42
style/content renderer: add icons to the "download" and "open" buttons
2025-03-12 03:32:54 +02:00
Panagiotis Papadopoulos