13164 Commits

Author SHA1 Message Date
Adorian Doran
4ab70fcb8a style(next): rename CSS variable 2025-03-27 15:43:33 +02:00
Adorian Doran
01004ac425 Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop 2025-03-27 15:41:27 +02:00
Adorian Doran
99bdf33236 style(next): fix scrollbar appearance in code blocks 2025-03-27 15:41:24 +02:00
Elian Doran
2ce1858d40
Merge pull request #1533 from FliegendeWurst/patch-1
README.md: TriliumDroid link, documentation update
2025-03-27 15:27:41 +02:00
Arne Keller
8c4e504cd4
README.md: link to old docs 2025-03-27 14:23:55 +01:00
Arne Keller
a7d6f1e4d1
README.md: TriliumDroid link, documentation update 2025-03-27 12:50:39 +01:00
Panagiotis Papadopoulos
5a2c5d8047
Merge branch 'develop' into build_copy-dist-trilium-merge 2025-03-27 09:37:03 +01:00
Panagiotis Papadopoulos
9fe37465c7 build(electron-forge): use double quotes for the buildPath in afterPrune
attempt to fix failing Windows build in CI, which uses cmd shell, which apparently treats single apostrophes differently
2025-03-27 09:35:48 +01:00
Panagiotis Papadopoulos
6218ae6cd7 chore(docker): move exception below TODO comment 2025-03-27 09:07:29 +01:00
Panagiotis Papadopoulos
fa0358662a build(docker): add missing cleanupNodeModules removal to Dockerfile
previously forgot to add this here as well -> had it only in the Dockerfile.alpine
2025-03-27 09:06:09 +01:00
Panagiotis Papadopoulos
d5bc9841e3 build(docker): use absolute path to stay consistent 2025-03-27 09:05:17 +01:00
Panagiotis Papadopoulos
e9fa37c4ee chore(docker): remove TODO 2025-03-27 09:04:10 +01:00
perf3ct
5456ac32ef
set up embedding similarity constants and similarity system 2025-03-26 23:12:45 +00:00
perf3ct
a7cafceac9
more heavily weigh notes with title matches when giving context to LLM 2025-03-26 23:05:16 +00:00
Panagiotis Papadopoulos
75431ca634 build: make running of npm ci in build scripts configurable
* moved the running of npm ci from copy-dist to cleanupNodeModules
* added flag to disable it (necessary for electron-forge)
2025-03-27 00:00:41 +01:00
Elian Doran
35fbc731a7
Merge branch 'develop' into ai-llm-integration 2025-03-26 22:46:36 +02:00
Elian Doran
cd5bfcf136
Merge branch 'develop' into feature/MFA 2025-03-26 22:33:15 +02:00
Elian Doran
683bf64100
Merge pull request #1528 from TriliumNext/renovate/mermaid-11.x
fix(deps): update dependency mermaid to v11.6.0
2025-03-26 22:31:42 +02:00
perf3ct
baef5f9ada
fix updateProvider parameter 2025-03-26 19:21:59 +00:00
perf3ct
15630fb432
add swaggerUI docstrings for LLM/AI API routes 2025-03-26 19:19:19 +00:00
perf3ct
7c519df9b5
fix prompt path import 2025-03-26 19:12:05 +00:00
perf3ct
713805394c
move providers.ts into providers folder 2025-03-26 19:10:16 +00:00
perf3ct
5869eaff9a
move more constants from files into centralized location 2025-03-26 18:08:30 +00:00
perf3ct
a50575c12c
move more prompts to the constants file 2025-03-26 18:01:20 +00:00
perf3ct
c49883fdfa
move constants to their own files and folder 2025-03-26 17:56:37 +00:00
Adorian Doran
cdcfab1011 style(next)/scrollbars: tweak size 2025-03-26 19:47:37 +02:00
Elian Doran
b95dca71db
Merge branch 'develop' into renovate/mermaid-11.x 2025-03-26 19:34:55 +02:00
Adorian Doran
733293c09a Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop 2025-03-26 19:33:13 +02:00
Adorian Doran
dcd64554eb style(next): fix Firefox scrollbar styles overriding WebKit scrollbar styles 2025-03-26 19:33:11 +02:00
Elian Doran
84d75c3ee8
Merge pull request #1487 from TriliumNext/tray
Fix tray exception when multiple windows
2025-03-26 19:32:22 +02:00
Elian Doran
51913ecccf
Merge pull request #1520 from TriliumNext/renovate/electron-forge-monorepo
chore(deps): update electron-forge monorepo to v7.8.0
2025-03-26 19:16:54 +02:00
Adorian Doran
40e990d39a Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop 2025-03-26 19:15:32 +02:00
Adorian Doran
be9b19d81c style(next): improve CSS formatting 2025-03-26 19:15:29 +02:00
--global
4b1551f5ec
Merge branch 'develop' of github.com:TriliumNext/Notes into develop 2025-03-26 19:11:13 +02:00
--global
fd0018677c
test(i18n): add refresh button click after language change 2025-03-26 19:11:07 +02:00
Adorian Doran
4b9ea651a1 style(next): restyle Firefox scrollbars 2025-03-26 19:06:22 +02:00
--global
e85b7f5e79
chore(vscode): add playwright to recommendations 2025-03-26 18:56:28 +02:00
Adorian Doran
c2d917b926 style(next): restyle WebKit scrollbars 2025-03-26 18:53:17 +02:00
--global
0cedd697cc
fix(electron): not starting on an empty DB 2025-03-26 18:41:36 +02:00
Jin
647226858d feat: 🎸 Disable MFA on electron instance 2025-03-26 11:04:04 +01:00
Jin
0741c8546f feat: 🎸 fix electron login logic 2025-03-26 10:58:34 +01:00
Jin
347c644f23 Merge branch 'develop' into feature/MFA 2025-03-26 10:48:16 +01:00
Panagiotis Papadopoulos
0b428035ae build(cleanupNodeModules): move removal of elements to its own function
also added a logging function for debugging purposes
2025-03-26 09:48:06 +01:00
Panagiotis Papadopoulos
51f2e23c2f build(cleanupNodeModules): delete .bin folder
this is only needed for executing package scripts -> which we don't do in production

fixes #1499
2025-03-26 09:28:50 +01:00
Panagiotis Papadopoulos
1528703ed9 build(cleanupNodeModules): add some minimalistic logging 2025-03-26 09:26:22 +01:00
Panagiotis Papadopoulos
1150f78b15 build(cleanupNodeModules): use path.join and basePath for extraFoldersDelete 2025-03-26 09:18:16 +01:00
Panagiotis Papadopoulos
6fe23f9a13 chore(cleanupNodeModules): remove commented out paths
extra note on mermaid: that should be packed by webpack now, so we just need to move it to devDeps and and we should be good
2025-03-26 09:15:33 +01:00
Panagiotis Papadopoulos
b457fa2e87 chore(cleanupNodeModules): rename nodeDir to nodeModulesContent 2025-03-26 09:12:22 +01:00
Panagiotis Papadopoulos
83da24b38d build(dockerignore): add cleanupNodeModules as exception 2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
57ee61938d build(copy-trilium): delete now unused script
all of its functionality has been "absorbed" by the cross-platform copy-dist and cleanupNodeModules scripts, that can be used for all of our builds now
2025-03-26 08:12:48 +01:00