zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							4cec856e21 
							
						 
					 
					
						
						
							
							simplified updating note content  
						
						 
						
						
						
						
					 
					
						2022-06-13 22:38:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							1bfc5fb77f 
							
						 
					 
					
						
						
							
							calculate affected counts and take into account includeDescendants when executing  
						
						 
						
						
						
						
					 
					
						2022-06-12 10:35:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							63f0e441b9 
							
						 
					 
					
						
						
							
							trigger execute bulk actions  
						
						 
						
						
						
						
					 
					
						2022-06-12 00:05:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							0f7fa7a7b7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into next53  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json
#	src/routes/api/search.js 
						
						
					 
					
						2022-06-08 22:51:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							2d33f570f4 
							
						 
					 
					
						
						
							
							fix bulk/search action delete  
						
						 
						
						
						
						
					 
					
						2022-06-08 22:25:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f9bee7cd4e 
							
						 
					 
					
						
						
							
							introduced bulk action groups  
						
						 
						
						
						
						
					 
					
						2022-06-05 23:36:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f272238dde 
							
						 
					 
					
						
						
							
							fix backend implementation of bulk actions  
						
						 
						
						
						
						
					 
					
						2022-06-05 23:13:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							c0c38a4b49 
							
						 
					 
					
						
						
							
							Merge branch 'master' into next53  
						
						 
						
						
						
						
					 
					
						2022-06-02 22:32:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							3cfca27b54 
							
						 
					 
					
						
						
							
							expose ability to create note revisions in backend API  #2890  
						
						 
						
						
						
						
					 
					
						2022-06-02 17:25:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							98b579524c 
							
						 
					 
					
						
						
							
							create note from template WIP  
						
						 
						
						
						
						
					 
					
						2022-05-31 22:45:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f19adf3ee0 
							
						 
					 
					
						
						
							
							add the ability to sort notes by folders first,  closes   #2649  
						
						 
						
						
						
						
					 
					
						2022-05-30 20:50:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							8905148dbc 
							
						 
					 
					
						
						
							
							fix NPE in note map,  closes   #2877  
						
						 
						
						
						
						
					 
					
						2022-05-27 21:55:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							819cf0907d 
							
						 
					 
					
						
						
							
							add option to disable auto-download of images for offline storage,  #2859  
						
						 
						
						
						
						
					 
					
						2022-05-21 14:00:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							e87e065100 
							
						 
					 
					
						
						
							
							protected session expiration timer moved to backend,  closes   #2847  
						
						 
						
						
						
						
					 
					
						2022-05-13 23:20:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom 
							
						 
					 
					
						
						
						
						
							
						
						
							3df712b64f 
							
						 
					 
					
						
						
							
							refactor canvas-note to canvas  
						
						 
						
						
						
						
					 
					
						2022-05-10 13:43:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom 
							
						 
					 
					
						
						
						
						
							
						
						
							1a4bc0b989 
							
						 
					 
					
						
						
							
							clean up code  
						
						 
						
						
						
						
					 
					
						2022-05-03 22:06:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom 
							
						 
					 
					
						
						
						
						
							
						
						
							8d510a3fdd 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into excalidraw  
						
						 
						
						... 
						
						
						
						conflict in
- package-lock (accept incoming),
- routes (remove the option to have image without filename, since it is not really necessary for canvas_note)
- note_detail 
						
						
					 
					
						2022-05-03 21:56:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							3b58b83f8b 
							
						 
					 
					
						
						
							
							improved logging  
						
						 
						
						
						
						
					 
					
						2022-04-19 23:36:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							643a5e5b16 
							
						 
					 
					
						
						
							
							moving deleteNote and deleteBranch into entities to make them accessible to scripts,  #2792  
						
						 
						
						
						
						
					 
					
						2022-04-19 23:06:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom 
							
						 
					 
					
						
						
						
						
							
						
						
							9771b441ad 
							
						 
					 
					
						
						
							
							missing path2d support for freedawings, remove node-side rendering, allow async getContent()  
						
						 
						
						... 
						
						
						
						* ## Excalidraw and SVG
 * 2022-04-16 - @thfrei
 *
 * Known issues:
 *  - excalidraw-to-svg (node.js) does not render any hand drawn (freedraw) paths. There is an issue with
 *    Path2D object not present in node-canvas library used by jsdom. (See Trilium PR for samples and other issues
 *    in respective library. Link will be added later). Related links:
 *     - https://github.com/Automattic/node-canvas/pull/2013 
 *     - https://github.com/google/canvas-5-polyfill 
 *     - https://github.com/Automattic/node-canvas/issues/1116 
 *     - https://www.npmjs.com/package/path2d-polyfill 
 *  - excalidraw-to-svg (node.js) takes quite some time to load an image (1-2s)
 *  - excalidraw-utils (browser) does render freedraw, however NOT freedraw with background
 *
 * Due to this issues, we opt to use **only excalidraw in the frontend**. Upon saving, we will also get the SVG
 * output from the live excalidraw instance. We will save this **SVG side by side the native excalidraw format
 * in the trilium note**.
 *
 * Pro: we will combat bit-rot. Showing the SVG will be very fast, since it is already rendered.
 * Con: The note will get bigger (maybe +30%?), we will generate more bandwith.
 *      (However, using trilium desktop instance, does not care too much about bandwidth. Size increase is probably
 *       acceptable, as a trade off.) 
						
						
					 
					
						2022-04-19 00:21:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom 
							
						 
					 
					
						
						
						
						
							
						
						
							e156c6292b 
							
						 
					 
					
						
						
							
							improve status 500 for canvas-note api/image.js  
						
						 
						
						
						
						
					 
					
						2022-04-19 00:17:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom 
							
						 
					 
					
						
						
						
						
							
						
						
							f354821f25 
							
						 
					 
					
						
						
							
							basic support for using api/images with canvas-note  
						
						 
						
						... 
						
						
						
						http://localhost:8080/api/images/ <noteId>/some-rando-text 
						
						
					 
					
						2022-04-19 00:17:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Free 
							
						 
					 
					
						
						
						
						
							
						
						
							a894c19c2b 
							
						 
					 
					
						
						
							
							add missing canvas-note entries in helper functions  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/public/app/entities/note_short.js
	src/public/app/services/tree_context_menu.js 
						
						
					 
					
						2022-04-19 00:13:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Free 
							
						 
					 
					
						
						
						
						
							
						
						
							0469962c5e 
							
						 
					 
					
						
						
							
							wip: canvas-note patch  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/public/app/services/library_loader.js
	src/public/app/services/tree_context_menu.js
	src/public/app/widgets/note_actions.js
	src/services/consistency_checks.js
	src/services/utils.js 
						
						
					 
					
						2022-04-19 00:13:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							17dd6141fb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Dockerfile
#	package-lock.json
#	package.json
#	src/services/cloning.js 
						
						
					 
					
						2022-03-22 21:04:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							ea56bb772a 
							
						 
					 
					
						
						
							
							logging improvements  
						
						 
						
						
						
						
					 
					
						2022-02-20 12:33:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							18d439dd44 
							
						 
					 
					
						
						
							
							clipper endpoint should also scan and download images as a fallback,  #2621  
						
						 
						
						
						
						
					 
					
						2022-02-14 20:50:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							67cce5f817 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'  
						
						 
						
						
						
						
					 
					
						2022-02-10 23:40:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							0ca9bff61b 
							
						 
					 
					
						
						
							
							fix multiple UI bugs,  closes   #2616  
						
						 
						
						
						
						
					 
					
						2022-02-07 22:50:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							97fd550402 
							
						 
					 
					
						
						
							
							add light anonymization option to the existing full anonymization  
						
						 
						
						
						
						
					 
					
						2022-02-06 13:49:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							600f74576d 
							
						 
					 
					
						
						
							
							added #sentFromSender label,  closes   #445  
						
						 
						
						
						
						
					 
					
						2022-02-05 16:23:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a21c49cba7 
							
						 
					 
					
						
						
							
							added "hideRelations" label to relation map  
						
						 
						
						
						
						
					 
					
						2022-02-05 13:02:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							91e3dd022a 
							
						 
					 
					
						
						
							
							added "move note" search action  
						
						 
						
						
						
						
					 
					
						2022-02-05 12:06:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							398376108d 
							
						 
					 
					
						
						
							
							added integrity check button into advanced options.  
						
						 
						
						
						
						
					 
					
						2022-02-01 21:22:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							d1b39ee8fa 
							
						 
					 
					
						
						
							
							generate anonymization script into a file  
						
						 
						
						
						
						
					 
					
						2022-01-17 23:47:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							91dec23d5e 
							
						 
					 
					
						
						
							
							ETAPI auth, spec improvements etc.  
						
						 
						
						
						
						
					 
					
						2022-01-10 17:09:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							2d2641dbd7 
							
						 
					 
					
						
						
							
							sync fixes  
						
						 
						
						
						
						
					 
					
						2022-01-09 21:25:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							96f4230bc1 
							
						 
					 
					
						
						
							
							Merge branch 'master' into next50  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/public/app/widgets/containers/root_container.js
#	src/services/app_info.js 
						
						
					 
					
						2022-01-09 20:18:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							7159b13c9d 
							
						 
					 
					
						
						
							
							add memberId to entity_changes to avoid having to resend all changes second time  
						
						 
						
						
						
						
					 
					
						2022-01-09 20:16:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							d4d48f3834 
							
						 
					 
					
						
						
							
							use [protected] for protected notes in the export  
						
						 
						
						
						
						
					 
					
						2022-01-08 21:50:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							9ee1c9f3da 
							
						 
					 
					
						
						
							
							ETAPI delete/patch, refactoring  
						
						 
						
						
						
						
					 
					
						2022-01-07 19:33:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							82b2871a08 
							
						 
					 
					
						
						
							
							added date services to ETAPI  
						
						 
						
						
						
						
					 
					
						2022-01-05 19:25:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							e3114e0602 
							
						 
					 
					
						
						
							
							etapi fixes + basic test  
						
						 
						
						
						
						
					 
					
						2022-01-04 23:00:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							e25a904a84 
							
						 
					 
					
						
						
							
							ETAPI - post services WIP  
						
						 
						
						
						
						
					 
					
						2022-01-03 23:13:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							dcba6ad70d 
							
						 
					 
					
						
						
							
							ETAPI (external API) initial read only access  
						
						 
						
						
						
						
					 
					
						2022-01-03 22:40:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							ffdd917717 
							
						 
					 
					
						
						
							
							Merge branch 'master' into next50  
						
						 
						
						
						
						
					 
					
						2022-01-03 20:10:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							dad82ea4e8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	package.json
#	src/services/build.js 
						
						
					 
					
						2021-12-31 20:16:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							8120f1bf25 
							
						 
					 
					
						
						
							
							resetting/setting password from options  
						
						 
						
						
						
						
					 
					
						2021-12-30 22:54:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f92016f9ec 
							
						 
					 
					
						
						
							
							set password from web trilium  
						
						 
						
						
						
						
					 
					
						2021-12-29 23:37:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							7e48d214ca 
							
						 
					 
					
						
						
							
							removed username/password from setup  
						
						 
						
						
						
						
					 
					
						2021-12-28 22:59:38 +01:00