gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 13:39:01 +01:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity
12,543 Commits 43 Branches 349 Tags
Commit Graph

12543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jin
7929aaf91a feat: 🎸 returen missing vars for oauth 2025-03-28 03:43:44 +01:00
Jin
332de4e67f feat: 🎸 add subtree translation 2025-03-28 03:42:59 +01:00
Jin
c217ccd347 feat: 🎸 remove totp from config 2025-03-28 03:05:04 +01:00
Jin
243d7d0ee9 feat: 🎸 remove totp config 2025-03-28 03:02:55 +01:00
Jin
c921982ae7 feat: 🎸 set generate totp function 2025-03-28 03:02:03 +01:00
Jin
ea7fbb154f fix: 🐛 init error with totp 2025-03-28 02:38:51 +01:00
Jin
5742d3068e feat: 🎸 move totp services to encryption logic 2025-03-28 02:15:25 +01:00
Jin
687d506ca5 refactor: 💡 rename error class 2025-03-28 01:56:49 +01:00
Jin
18a417addd feat: 🎸 add totp encryption 2025-03-28 01:53:53 +01:00
Jin
04cbe9d3d1 style: 💄 restyle 2025-03-28 01:53:32 +01:00
Jin
d4cd0e8eff feat: 🎸 restyle option page 2025-03-28 01:22:30 +01:00
Jin
d92fa82ad0 feat: 🎸 set option status 2025-03-28 01:00:58 +01:00
Jin
d42b839c32 feat: 🎸 init move mfa option 2025-03-28 00:39:59 +01: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
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
1e713469e7 build(server): bump to latest node v22.14.0 -> fixes EBADENGINE warning 
npm warn EBADENGINE Unsupported engine {
npm warn EBADENGINE   package: 'node-abi@4.2.0',
npm warn EBADENGINE   required: { node: '>=22.12.0' },
npm warn EBADENGINE   current: { node: 'v20.18.1', npm: '10.8.2' }
npm warn EBADENGINE }
 2025-03-26 08:12:22 +01:00
Panagiotis Papadopoulos
b97c28bc13 ci: bump to node v22 -> fixes EBADENGINE warning 
npm warn EBADENGINE Unsupported engine {
npm warn EBADENGINE   package: 'node-abi@4.2.0',
npm warn EBADENGINE   required: { node: '>=22.12.0' },
npm warn EBADENGINE   current: { node: 'v20.18.1', npm: '10.8.2' }
npm warn EBADENGINE }
 2025-03-26 08:10:04 +01:00
Elian Doran
5ec3d58f6f
fix(electron): option does not exist 2025-03-26 08:30:56 +02:00
Jin
d010e6cc73 Merge branch 'develop' into feature/MFA 2025-03-26 03:56:53 +01:00
Jin
7024166fc0 feat: 🎸 Add CN translation 2025-03-26 03:55:06 +01:00
Jin
ce053323a9 feat: 🎸 Format code 2025-03-26 03:53:00 +01:00
Jin
e2ea6f96ce feat: 🎸 Add CN translation 2025-03-26 03:51:09 +01:00
Jin
4959dbf126 feat: 🎸 Improve TOTP setting page 2025-03-26 03:22:57 +01:00
renovate[bot]
e0522fcd48
fix(deps): update dependency mermaid to v11.6.0 2025-03-26 02:11:39 +00:00
Jin
979000c5c8 feat: 🎸 Fix recovery key error 2025-03-26 02:55:42 +01:00
Jin
f2a29653b2 feat: 🎸 Fix SSO login 2025-03-26 02:39:29 +01:00
Jin
d4b657e4d8 feat: 🎸 Fix import naming 2025-03-26 02:04:24 +01:00
Jin
4762287d61 feat: 🎸 Remove redundant func 2025-03-26 01:58:54 +01:00
Jin
886e63f128 feat: 🎸 Add SSO login button 2025-03-26 01:48:42 +01:00
Jin
a30695b9fb feat: 🎸 Remove redundant check auth 2025-03-26 01:36:48 +01:00
Jin
e957a17f1c feat: 🎸 Seperate auth check 2025-03-26 00:50:37 +01:00
Jin
083ee5d23b feat: 🎸 Fix TOTP not load correctly 2025-03-26 00:42:19 +01:00
Jin
8f157e04d4 feat: 🎸 Show correct login error to user 2025-03-26 00:13:56 +01:00