3416 Commits

Author	SHA1	Message	Date
Elian Doran	9a3f765d42	fix(import/markdown): unable to import code blocks with XML/HTML content if safe mode on (closes #1530)	2025-03-29 13:47:02 +02:00
Jin	a8e37b5b92	Merge branch 'develop' into feature/MFA	2025-03-29 01:45:18 +01:00
Jin	02c4a269be	feat: 🎸 upgrade db version	2025-03-29 01:44:25 +01:00
Jin	77f62b94cc	refactor: 💡 refact recovery code	2025-03-29 01:40:17 +01:00
Jin	2eeb376d24	refactor: 💡 fix typo and imporve code quality	2025-03-29 01:00:08 +01:00
Elian Doran	68e1e68cfe	chore(zen): change default keyboard shortcut to F9 (closes #1372)	2025-03-29 00:22:27 +02:00
Jin	f19ec9b3c4	fix: 🐛 fix open id check error	2025-03-28 11:59:32 +01:00
Jin	bde58e5836	fix: 🐛 fix login error	2025-03-28 04:01:18 +01:00
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	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	d92fa82ad0	feat: 🎸 set option status	2025-03-28 01:00:58 +01:00
Elian Doran	cd5bfcf136	Merge branch 'develop' into feature/MFA	2025-03-26 22:33:15 +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
--global	0cedd697cc	fix(electron): not starting on an empty DB	2025-03-26 18:41:36 +02:00
Jin	0741c8546f	feat: 🎸 fix electron login logic	2025-03-26 10:58:34 +01:00
Jin	d010e6cc73	Merge branch 'develop' into feature/MFA	2025-03-26 03:56:53 +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	a30695b9fb	feat: 🎸 Remove redundant check auth	2025-03-26 01:36:48 +01:00
Jin	083ee5d23b	feat: 🎸 Fix TOTP not load correctly	2025-03-26 00:42:19 +01:00
Jin	1afccb4129	feat: 🎸 Fix app start error with MFA configs	2025-03-25 23:14:25 +01:00
Jin	ae794a562f	feat: 🎸 Use config.ini configure	2025-03-25 22:44:59 +01:00
Jin	94cd54f17e	feat: 🎸 Use ini file to configure MFA	2025-03-25 22:30:14 +01:00
Elian Doran	45208c8039	chore(i18n): define electron locales for all the supported languages	2025-03-25 19:59:05 +02:00
Elian Doran	b923a23d95	feat(settings): make the formatting locale value adjustable	2025-03-25 19:56:07 +02:00
Elian Doran	c4559749f1	feat(settings): display option to adjust formatting locale	2025-03-25 19:48:07 +02:00
Elian Doran	d0549ebdf9	Merge branch 'develop' into feature/windows_signing_v3	2025-03-25 10:40:48 +02:00
Elian Doran	9108ea9b8a	fix(electron): disable the creation of desktop icon at runtime (closes #1488)	2025-03-24 19:21:04 +02:00
Elian Doran	3e14ffe1e7	fix(test): flaky test due to concurrency	2025-03-24 17:42:38 +02:00
Elian Doran	d52ca626e9	Merge branch 'develop' into chore_lint-share	2025-03-23 12:13:22 +02:00
Elian Doran	613a7d72ad	Merge pull request #1480 from jshprentz/develop ... Add {isoMonth} month pattern to day notes	2025-03-23 09:53:40 +02:00
SiriusXT	87c70cb46e	Fixed focusing on old windows when opening new windows from tray	2025-03-23 10:44:01 +08:00
Elian Doran	f5a4acc097	Merge branch 'develop' into tray	2025-03-22 19:00:06 +02:00
Jin	f42ecb2e83	Merge branch 'develop' into feature/MFA	2025-03-22 15:56:16 +01:00
Elian Doran	5282f9f0bf	feat(mermaid): set right mime type	2025-03-22 15:48:03 +02:00
Elian Doran	858ad91708	feat(import/single): mermaid with .mmd extension	2025-03-22 15:45:36 +02:00
Jin	54a5f8164a	feat: 🎸 Fix option defintions	2025-03-22 14:43:32 +01:00
Elian Doran	3dae771e90	feat(import/single): mermaid with .mermaid extension	2025-03-22 15:41:56 +02:00
Jin	c3d3ab4330	Merge branch 'develop' into feature/MFA	2025-03-22 14:38:22 +01:00
Elian Doran	16cbd2f793	feat(export/single): mermaid with right extension and MIME	2025-03-22 15:22:55 +02:00
Elian Doran	6ab820f172	refactor(export/single): make note type mapping testable	2025-03-22 15:20:58 +02:00
Jin	b320553d18	feat: 🎸 fix open_id error	2025-03-22 12:46:59 +01:00
Jin	fdc10d0120	feat: 🎸 fix ts error	2025-03-22 12:35:37 +01:00