| 
							
							
								 Elian Doran | cddf9f0242 | Merge remote-tracking branch 'origin/main' into react/settings ; Conflicts:
;	apps/client/package.json
;	apps/client/src/translations/en/translation.json
;	apps/client/src/translations/tw/translation.json
;	pnpm-lock.yaml | 2025-08-19 13:50:27 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 3e17ff5e7b | chore(react/settings): clean up options widget | 2025-08-19 13:47:15 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 04973094f2 | feat(react/settings): port LLM settings | 2025-08-19 13:46:13 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 018a6cb84a | chore(react/settings): add back some checks for MFA | 2025-08-19 10:54:02 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 44825af0c0 | feat(react/settings): port OAuth settings | 2025-08-19 10:51:05 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | cfb3607052 | feat(react/settings): port totp settings | 2025-08-19 10:37:14 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | ed56ed2be0 | feat(quick_search): format multi-line results better (#6672) | 2025-08-18 23:14:15 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 648aa7e3b0 | fix(hotkeys): interpret shortcut in the user's locale (#6681) | 2025-08-18 23:10:59 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 73ff41f2b2 | fix(react/settings): hook leak after closing tabs | 2025-08-18 22:15:47 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 3837466cb3 | feat(react/settings): react to external changes | 2025-08-18 20:41:33 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | b97a5ef888 | chore(react/settings): reimplement reset shortcuts | 2025-08-18 19:47:40 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 227cf5de85 | feat(react/settings): port protected session timeout | 2025-08-18 19:00:42 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | ccf52be431 | feat(react/settings): port tray options | 2025-08-18 18:47:18 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 07713e988c | feat(react/settings): port search engine settings | 2025-08-18 18:43:27 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | f934318625 | feat(react/settings): port revision snapshot list | 2025-08-18 18:27:12 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 6fb90abd75 | feat(react/settings): port network connections | 2025-08-18 18:22:07 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 27cc33888a | feat(react/settings): port share settings | 2025-08-18 18:19:48 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 95af901808 | feat(react/settings): port HTML import tags | 2025-08-18 18:07:58 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | c5a7f84250 | feat(react/settings): port note revision snapshot interval | 2025-08-18 17:51:45 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | a71d28500d | feat(react/settings): port attachment erasure timeout | 2025-08-18 17:42:39 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 436fd16f3a | feat(react/settings): port note erasure timeout | 2025-08-18 17:37:20 +03:00 |  | 
			
				
					| 
							
							
								 Székely Miklós | fbf2315f57 | Added translation using Weblate (Hungarian) | 2025-08-18 15:38:26 +02:00 |  | 
			
				
					| 
							
							
								 tomek7667 | fd4c2f79a7 | Translated using Weblate (Polish) Currently translated at 0.6% (10 of 1551 strings)
Translation: Trilium Notes/Client
Translate-URL: https://hosted.weblate.org/projects/trilium/client/pl/ | 2025-08-18 15:38:25 +02:00 |  | 
			
				
					| 
							
							
								 acwr47 | 72f9335213 | Translated using Weblate (Japanese) Currently translated at 66.9% (1038 of 1551 strings)
Translation: Trilium Notes/Client
Translate-URL: https://hosted.weblate.org/projects/trilium/client/ja/ | 2025-08-18 15:38:25 +02:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 53d97047a3 | feat(react/settings): port code read-only size | 2025-08-18 16:10:05 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 2ba3666e23 | feat(react/settings): port code mime types | 2025-08-18 15:55:18 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 4a1d379ab4 | feat(react/settings): port code editor appearance | 2025-08-18 15:02:58 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 73167e1e30 | feat(react/settings): port code editor settings | 2025-08-18 14:27:45 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | ffc13f5de3 | feat(react/settings): port date time format | 2025-08-18 14:19:38 +03:00 |  | 
			
				
					| 
							
							
								 tomek7667 | 222a6c48a7 | Added translation using Weblate (Polish) | 2025-08-18 12:32:13 +02:00 |  | 
			
				
					| 
							
							
								 VortexP | e33208e6ec | Translated using Weblate (Finnish) Currently translated at 6.1% (95 of 1551 strings)
Translation: Trilium Notes/Client
Translate-URL: https://hosted.weblate.org/projects/trilium/client/fi/ | 2025-08-18 12:32:12 +02:00 |  | 
			
				
					| 
							
							
								 acwr47 | af8781eaa7 | Translated using Weblate (Japanese) Currently translated at 65.5% (1016 of 1551 strings)
Translation: Trilium Notes/Client
Translate-URL: https://hosted.weblate.org/projects/trilium/client/ja/ | 2025-08-18 12:32:12 +02:00 |  | 
			
				
					| 
							
							
								 Francis C | 0a7aff507c | Translated using Weblate (Chinese (Traditional Han script)) Currently translated at 100.0% (1551 of 1551 strings)
Translation: Trilium Notes/Client
Translate-URL: https://hosted.weblate.org/projects/trilium/client/zh_Hant/ | 2025-08-18 12:32:12 +02:00 |  | 
			
				
					| 
							
							
								 Francis C | 103532aad9 | Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (1551 of 1551 strings)
Translation: Trilium Notes/Client
Translate-URL: https://hosted.weblate.org/projects/trilium/client/zh_Hans/ | 2025-08-18 12:32:11 +02:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 16939e9fd5 | feat(react/settings): port auto read-only size | 2025-08-18 12:14:38 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 4ef6169041 | feat(react/settings): port highlight list settings | 2025-08-18 12:11:29 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 9ebee42118 | feat(react/settings): port TOC settings | 2025-08-18 11:26:58 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 234d3997b1 | feat(react/settings): port code block settings | 2025-08-18 11:21:09 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 3ba0bcea4e | feat(react/settings): port heading style | 2025-08-18 09:47:18 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 701855344e | feat(react/settings): port text features | 2025-08-18 09:40:36 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 71b627fbc7 | feat(react/settings): port text formatting toolbar | 2025-08-18 09:34:16 +03:00 |  | 
			
				
					| 
							
							
								 perf3ct | d971554201 | feat(quick_search): also show the tags/attributes in quick search results | 2025-08-18 03:20:04 +00:00 |  | 
			
				
					| 
							
							
								 Romain DEP. | b68a554bba | fix(hotkeys): interpret shortcut in the user's locale fixes #6547 | 2025-08-17 23:48:48 +02:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 33043c7133 | chore(call_to_action): add missing translation | 2025-08-17 23:37:33 +03:00 |  | 
			
				
					| 
							
							
								 morteza rahvard | 5296e073cc | Translated using Weblate (Persian) Currently translated at 0.7% (12 of 1550 strings)
Translation: Trilium Notes/Client
Translate-URL: https://hosted.weblate.org/projects/trilium/client/fa/ | 2025-08-17 19:17:36 +00:00 |  | 
			
				
					| 
							
							
								 acwr47 | 7bfb7d6f6e | Translated using Weblate (Japanese) Currently translated at 65.4% (1014 of 1550 strings)
Translation: Trilium Notes/Client
Translate-URL: https://hosted.weblate.org/projects/trilium/client/ja/ | 2025-08-17 19:17:35 +00:00 |  | 
			
				
					| 
							
							
								 Elian Doran | b5069cc7c2 | chore(call_to_action): rephrase | 2025-08-17 22:17:21 +03:00 |  | 
			
				
					| 
							
							
								 Elian Doran | 3b6791f51a | chore(call_to_action): disable background effects for now | 2025-08-17 21:23:22 +03:00 |  | 
			
				
					| 
							
							
								 ali mohammadi | 2523632391 | Translated using Weblate (Persian) Currently translated at 0.1% (3 of 1550 strings)
Translation: Trilium Notes/Client
Translate-URL: https://hosted.weblate.org/projects/trilium/client/fa/ | 2025-08-16 20:02:05 +00:00 |  | 
			
				
					| 
							
							
								 neketos851 | 565904ff5d | Translated using Weblate (Ukrainian) Currently translated at 3.1% (49 of 1550 strings)
Translation: Trilium Notes/Client
Translate-URL: https://hosted.weblate.org/projects/trilium/client/uk/ | 2025-08-16 20:02:01 +00:00 |  |