12688 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jin	ce66397257	Merge branch 'develop' into webpack	2025-03-29 00:52:27 +01:00
Jin	608378193f	fix: 🐛 fix mark.js load error	2025-03-29 00:51:36 +01:00
Elian Doran	bd092e0119	chore(i18n): typo	2025-03-29 00:45:16 +02:00
Elian Doran	f743cfc35c	fix(options/mfa): double colons in warning	2025-03-29 00:44:51 +02:00
Elian Doran	4cde9253ed	style(options/mfa): use admonitions	2025-03-29 00:42:20 +02:00
Elian Doran	9c835d0f7f	chore(docs): always use LF on Windows	2025-03-29 00:22:49 +02:00
Elian Doran	68e1e68cfe	chore(zen): change default keyboard shortcut to F9 (closes #1372)	2025-03-29 00:22:27 +02:00
Jin	534c146542	Merge branch 'develop' into webpack	2025-03-28 23:00:59 +01:00
Jin	47a363be0f	refactor: 💡 improve image zoom	2025-03-28 22:28:09 +01:00
Jin	25aa08bb4c	chore: 🤖 fix lock file	2025-03-28 22:07:43 +01:00
Jin	797ed2a494	Merge branch 'develop' into feature/MFA	2025-03-28 22:04:23 +01:00
Elian Doran	df6c6647c7	chore(deps): remove leaflet from dist	2025-03-28 22:40:19 +02:00
Elian Doran	83890ba130	Merge pull request #1537 from TriliumNext/build_webpack-excalidraw-font ... build: use webpack for excalidraw	2025-03-28 22:31:32 +02:00
Elian Doran	041c801065	Merge pull request #1539 from TriliumNext/renovate/node-22.x ... chore(deps): update dependency @types/node to v22.13.14	2025-03-28 22:24:33 +02:00
Elian Doran	9585c6a55f	fix(client): "Note not found" tooltip for some URLs	2025-03-28 22:22:42 +02:00
Elian Doran	4ac52e17da	Merge pull request #1541 from TriliumNext/renovate/mime-types-3.x ... fix(deps): update dependency mime-types to v3	2025-03-28 22:08:43 +02:00
Elian Doran	bf1896f4fa	Merge pull request #1540 from TriliumNext/renovate/electron-35.x ... chore(deps): update dependency electron to v35.1.2	2025-03-28 22:08:12 +02:00
Elian Doran	597874250a	fix(electron): spacing increases when entering Chinese and digits (fixes #1327)	2025-03-28 22:07:01 +02:00
Jin	4a2c075935	chore: 🤖 remove calendar css from library_loader	2025-03-28 17:08:34 +01:00
Jin	accf245179	chore: 🤖 remove leaflet css from library_loader	2025-03-28 16:58:06 +01:00
Jin	b30035834a	chore: 🤖 remove mark.js from asset	2025-03-28 16:43:11 +01:00
Jin	3dc7636910	chore: 🤖 remove wheelzoom from asset	2025-03-28 16:40:48 +01:00
Jin	2476e0b504	chore: 🤖 move mark.js to webpack	2025-03-28 16:23:06 +01:00
Jin	94bc550c67	chore: 🤖 move wheel zoom to webpack	2025-03-28 16:16:33 +01:00
Jin	121f297fcb	chore: 🤖 better oauth instruction	2025-03-28 12:08:32 +01:00
Jin	b51814abeb	fix: 🐛 remove oauth default config	2025-03-28 12:03:27 +01:00
Jin	cb3627ed50	chore: 🤖 better totp instruction	2025-03-28 12:01:18 +01:00
Jin	f19ec9b3c4	fix: 🐛 fix open id check error	2025-03-28 11:59:32 +01:00
Jin	aaecb43f8a	fix: 🐛 fix oauth logout error	2025-03-28 04:05:00 +01:00
Jin	bde58e5836	fix: 🐛 fix login error	2025-03-28 04:01:18 +01:00
Jin	5987dedff8	Merge branch 'develop' into feature/MFA	2025-03-28 03:47:26 +01:00
Jin	2bd408cf8a	feat: 🎸 better instruction	2025-03-28 03:46:58 +01:00
Jin	44c8b7d9ea	feat: 🎸 improve oauth option page	2025-03-28 03:44:40 +01:00
Jin	7929aaf91a	feat: 🎸 returen missing vars for oauth	2025-03-28 03:43:44 +01:00
renovate[bot]	def9bbeac7	fix(deps): update dependency mime-types to v3	2025-03-28 02:43:35 +00:00
renovate[bot]	9fe40e2ce6	chore(deps): update dependency electron to v35.1.2	2025-03-28 02:43:19 +00:00
renovate[bot]	bc76ba4149	chore(deps): update dependency @types/node to v22.13.14	2025-03-28 02:43:08 +00: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
Panagiotis Papadopoulos	73fa06a06a	deps: move react/react-dom to devDeps ... these are only used for excalidraw and are bundled by webpack now	2025-03-28 00:20:00 +01:00