Jin
							
						 
					 | 
					
						
						
						
						
							
						
						
							8df1e3263b
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into feature/MFA
						
						
						
						
						
						
					 | 
					
						2025-03-22 12:35:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							00e576b052
							
						
					 | 
					
						
						
							
							Revert "Merge pull request #1234 from TriliumNext/feature/task_list"
						
						
						
						
						
						
						
						This reverts commit 58a8821c229898c45551da16476d44c010c345ef, reversing
changes made to 50d491b432ce811c4d5e597e952eb18a89ae6c19. 
						
						
					 | 
					
						2025-03-06 23:52:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ee7b97ae56
							
						
					 | 
					
						
						
							
							revert(db): back to 228 (no tasks)
						
						
						
						
						
						
					 | 
					
						2025-03-06 23:45:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							16ad054d2a
							
						
					 | 
					
						
						
							
							refactor(migration): remove async import from migration scripts
						
						
						
						
						
						
					 | 
					
						2025-03-02 20:28:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a80c3e32f1
							
						
					 | 
					
						
						
							
							fix(migration): JavaScript-based migrations not working
						
						
						
						
						
						
					 | 
					
						2025-03-02 19:39:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							fc27c4fc7b
							
						
					 | 
					
						
						
							
							feat(db): create task database in schema
						
						
						
						
						
						
					 | 
					
						2025-02-22 14:36:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a433c9c189
							
						
					 | 
					
						
						
							
							feat(tasks): add SQL migration
						
						
						
						
						
						
					 | 
					
						2025-02-20 12:07:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4463f215d8
							
						
					 | 
					
						
						
							
							fix(demo): broken attributes due to safe import
						
						
						
						
						
						
					 | 
					
						2025-02-07 20:34:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jens Oliver Meiert
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d86d9a7c0
							
						
					 | 
					
						
						
							
							refactor: compress images (losslessly, with Imagemin Guard)
						
						
						
						
						
						
						
						Signed-off-by: Jens Oliver Meiert <jens@meiert.com> 
						
						
					 | 
					
						2025-01-24 15:16:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4e9aafc919
							
						
					 | 
					
						
						
							
							fix(demo): broken TODOs (closes #984)
						
						
						
						
						
						
					 | 
					
						2025-01-18 19:02:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4cbb529fd4
							
						
					 | 
					
						
						
							
							chore(prettier): fix all files
						
						
						
						
						
						
					 | 
					
						2025-01-09 18:07:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							2eb4d4fb66
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into feature/MFA
						
						
						
						
						
						
					 | 
					
						2024-12-24 13:30:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5a6151e225
							
						
					 | 
					
						
						
							
							fix(demo): to do lists not working
						
						
						
						
						
						
					 | 
					
						2024-12-02 21:01:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1e996d6f82
							
						
					 | 
					
						
						
							
							docs(demo): add mermaid diagram with ELK
						
						
						
						
						
						
					 | 
					
						2024-11-25 23:31:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							24022834e2
							
						
					 | 
					
						
						
							
							db: Update demo section on code blocks
						
						
						
						
						
						
					 | 
					
						2024-11-02 10:15:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chesspro13
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c74da18e23
							
						
					 | 
					
						
						
							
							OAuth working
						
						
						
						
						
						
					 | 
					
						2024-09-07 13:18:47 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chesspro13
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							9c748f326a
							
						
					 | 
					
						
						
							
							Ported from branch OIDC
						
						
						
						
						
						
					 | 
					
						2024-09-07 10:21:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							2e86ae6556
							
						
					 | 
					
						
						
							
							db: Remove image URL from mindmap
						
						
						
						
						
						
					 | 
					
						2024-09-03 22:10:18 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1e6e9fa417
							
						
					 | 
					
						
						
							
							db: Fix preview for mindmap
						
						
						
						
						
						
					 | 
					
						2024-09-03 21:43:24 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							86c74c7fdb
							
						
					 | 
					
						
						
							
							db: Update demo to add mindmap
						
						
						
						
						
						
					 | 
					
						2024-09-02 23:00:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							48ac02a1a7
							
						
					 | 
					
						
						
							
							Update logo in demo document
						
						
						
						
						
						
					 | 
					
						2024-08-03 22:33:33 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							db2b33704f
							
						
					 | 
					
						
						
							
							Merge branch 'feature/typescript_backend' into feature/typescript_backend_2
						
						
						
						
						
						
					 | 
					
						2024-03-30 10:54:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3eb7ed5dda
							
						
					 | 
					
						
						
							
							server-ts: Address requested changes
						
						
						
						
						
						
					 | 
					
						2024-03-30 10:49:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d35613f510
							
						
					 | 
					
						
						
							
							server-ts: Port becca_loader
						
						
						
						
						
						
					 | 
					
						2024-02-17 20:45:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							82a9808dea
							
						
					 | 
					
						
						
							
							server-ts: sql.js -> sql.ts
						
						
						
						
						
						
					 | 
					
						2024-02-17 13:32:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7a9365457a
							
						
					 | 
					
						
						
							
							server-ts: utils.js -> utils.ts
						
						
						
						
						
						
					 | 
					
						2024-02-17 13:32:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ff2e05fe83
							
						
					 | 
					
						
						
							
							server-ts: Fix references to cls.js
						
						
						
						
						
						
					 | 
					
						2024-02-17 13:32:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							96b6d17d77
							
						
					 | 
					
						
						
							
							server-ts: Remove need for 'allowImportingTsExtensions'
						
						
						
						
						
						
					 | 
					
						2024-02-17 13:32:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							39627a4fc4
							
						
					 | 
					
						
						
							
							server-ts: log.js -> log.ts
						
						
						
						
						
						
					 | 
					
						2024-02-17 13:32:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							92e8b155e4
							
						
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
						
						# Conflicts:
#	package.json
#	src/services/build.js
#	src/services/migration.js 
						
						
					 | 
					
						2024-01-27 22:52:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e33553146
							
						
					 | 
					
						
						
							
							fix migration
						
						
						
						
						
						
					 | 
					
						2024-01-21 23:11:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e30c0702e
							
						
					 | 
					
						
						
							
							add indexes sooner in the migration process to speed it up #4535
						
						
						
						
						
						
					 | 
					
						2024-01-21 11:13:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a28d8843ac
							
						
					 | 
					
						
						
							
							fix migration
						
						
						
						
						
						
					 | 
					
						2024-01-03 22:08:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f704cacdee
							
						
					 | 
					
						
						
							
							bugfixes to sync
						
						
						
						
						
						
					 | 
					
						2023-12-30 00:34:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e914b9016
							
						
					 | 
					
						
						
							
							remove relation map from the demo document
						
						
						
						
						
						
					 | 
					
						2023-11-27 10:54:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf99345962
							
						
					 | 
					
						
						
							
							use .js extension for require() as a preparation for future migration to ESM
						
						
						
						
						
						
					 | 
					
						2023-11-22 19:34:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ebdb0f5e1
							
						
					 | 
					
						
						
							
							emergency disabling of image compression since it appears to make problems in migration to 0.61
						
						
						
						
						
						
					 | 
					
						2023-11-04 00:10:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							692f7868bc
							
						
					 | 
					
						
						
							
							updated demo document so that canvas and mermaid have generated export attachments
						
						
						
						
						
						
					 | 
					
						2023-10-21 17:36:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1261a06a30
							
						
					 | 
					
						
						
							
							order by note size + attachments + revisions, closes #4295
						
						
						
						
						
						
					 | 
					
						2023-10-02 22:02:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2a510e4c5
							
						
					 | 
					
						
						
							
							cleanup of old migrations, since upgrading to 0.61 is possible only from 0.60.
						
						
						
						
						
						
					 | 
					
						2023-08-18 15:56:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							63675bfbae
							
						
					 | 
					
						
						
							
							make migration 223 NOOP
						
						
						
						
						
						
					 | 
					
						2023-07-30 21:54:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							119050e355
							
						
					 | 
					
						
						
							
							fix migration
						
						
						
						
						
						
					 | 
					
						2023-07-28 16:13:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							72122d0f95
							
						
					 | 
					
						
						
							
							fix blobIds - they shouldn't contain + and / characters
						
						
						
						
						
						
					 | 
					
						2023-07-28 15:55:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce3834eb9e
							
						
					 | 
					
						
						
							
							blob erasure is not synced, need to clean them up before each content hash check
						
						
						
						
						
						
					 | 
					
						2023-07-27 23:57:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							527718eff7
							
						
					 | 
					
						
						
							
							add indices on blobId
						
						
						
						
						
						
					 | 
					
						2023-07-27 21:40:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b7bc843a37
							
						
					 | 
					
						
						
							
							fix demo document statistics, closes #4117
						
						
						
						
						
						
					 | 
					
						2023-07-24 23:46:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8c9178c5d
							
						
					 | 
					
						
						
							
							fix migration
						
						
						
						
						
						
					 | 
					
						2023-07-18 23:23:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							83049c95c3
							
						
					 | 
					
						
						
							
							defensive copies of owned attrs
						
						
						
						
						
						
					 | 
					
						2023-07-17 22:56:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac0d61e9b4
							
						
					 | 
					
						
						
							
							add mindmap mermaid example to demo document
						
						
						
						
						
						
					 | 
					
						2023-07-15 10:44:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a06ee1ced1
							
						
					 | 
					
						
						
							
							added new mermaid diagram examples to the demo document
						
						
						
						
						
						
					 | 
					
						2023-07-14 20:00:53 +02:00 | 
					
					
						
						
							
							
							
						
					 |