zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							746abb02d3 
							
						 
					 
					
						
						
							
							Merge branch 'stable'  
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json
#	src/services/build.js 
						
						
							
						
					 
					
						2023-11-16 23:57:25 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							23351298c8 
							
						 
					 
					
						
						
							
							fix incorrect syntax/typo,  closes   #4443  
						
						
						
						
							
						
					 
					
						2023-11-16 23:35:50 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							426a8f75aa 
							
						 
					 
					
						
						
							
							fix creating tree cycle by moving clone into another clone,  closes   #4442  
						
						
						
						
							
						
					 
					
						2023-11-16 23:31:33 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							999cf0d9e3 
							
						 
					 
					
						
						
							
							release 0.61.14  
						
						
						
						
							
 
						
					 
					
						2023-11-16 00:21:34 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							0afc41060a 
							
						 
					 
					
						
						
							
							template LABEL should not be inherited  #4349  
						
						
						
						
							
						
					 
					
						2023-11-16 00:11:14 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							6e2d76c2b4 
							
						 
					 
					
						
						
							
							release 0.62.1-beta  
						
						
						
						
							
 
						
					 
					
						2023-11-14 00:57:51 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							3abf74a9f3 
							
						 
					 
					
						
						
							
							fix katex CSS loading  
						
						
						
						
							
						
					 
					
						2023-11-14 00:57:19 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							5d52498da1 
							
						 
					 
					
						
						
							
							Merge branch 'stable'  
						
						
						
						
							
						
					 
					
						2023-11-14 00:19:15 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							cf068211ff 
							
						 
					 
					
						
						
							
							change the way frontend detects content change which works even if no new blob is created,  fixes   #4434  
						
						
						
						
							
						
					 
					
						2023-11-13 23:53:14 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							0507c46ae9 
							
						 
					 
					
						
						
							
							revert general HTML support  
						
						
						
						
							
						
					 
					
						2023-11-13 00:58:55 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							69ed3644f9 
							
						 
					 
					
						
						
							
							add a note about hideHighlightWidget to options  
						
						
						
						
							
						
					 
					
						2023-11-13 00:39:28 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							b0c5894691 
							
						 
					 
					
						
						
							
							added hideHighlightWidget to built in attributes  
						
						
						
						
							
						
					 
					
						2023-11-13 00:36:08 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f10fc7bd7f 
							
						 
					 
					
						
						
							
							Revert "Add attribute disableHighlightsList to disable Highlights List Widget"  
						
						... 
						
						
						
						This reverts commit e7d98206f975d8c46e2fccb14d26e74a56377d74. 
						
						
							
						
					 
					
						2023-11-13 00:34:09 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bdbaacaac9 
							
						 
					 
					
						
						
							
							Merge pull request  #4421  from fang64/master  
						
						... 
						
						
						
						Add attribute disableHighlightsList to disable Highlights List Widget 
						
						
							
						
					 
					
						2023-11-13 00:31:00 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2790f52e36 
							
						 
					 
					
						
						
							
							Merge pull request  #4417  from ljgonzalez1/master  
						
						... 
						
						
						
						Migrate KaTeX@0.16.0 from `libraries` to KaTeX@0.16.9 in `node_modules` 
						
						
							
						
					 
					
						2023-11-13 00:29:15 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							6515dd7b23 
							
						 
					 
					
						
						
							
							fix assigning extension to attachment export filenames,  closes   #4415  
						
						
						
						
							
						
					 
					
						2023-11-12 23:57:21 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							5a38bf78e1 
							
						 
					 
					
						
						
							
							fix content renderer of protected canvas/mermaid notes,  closes   #4414  
						
						
						
						
							
						
					 
					
						2023-11-12 23:43:04 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							4bdb40904f 
							
						 
					 
					
						
						
							
							fix loading reference link titles in read-only text notes,  closes   #4404  
						
						
						
						
							
						
					 
					
						2023-11-12 22:57:04 +01:00 
						 
				 
			
				
					
						
							
							
								fang64 
							
						 
					 
					
						
						
						
						
							
						
						
							e7d98206f9 
							
						 
					 
					
						
						
							
							Add attribute disableHighlightsList to disable Highlights List Widget  
						
						
						
						
							
						
					 
					
						2023-11-09 21:32:45 -05:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1939375161 
							
						 
					 
					
						
						
							
							Merge pull request  #3  from ljgonzalez1/feat/migrate_katex_to_npm_v2  
						
						... 
						
						
						
						Feat/migrate katex to npm 
						
						
							
						
					 
					
						2023-11-09 19:06:25 -03:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
						
						
							
						
						
							ec737d02b2 
							
						 
					 
					
						
						
							
							✨  feat(src/routes/assets.js): Add KaTex support to assets route.  
						
						
						
						
							
						
					 
					
						2023-11-09 18:33:36 -03:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
						
						
							
						
						
							927e5ede0c 
							
						 
					 
					
						
						
							
							✨  feat(src/routes/assets.js): Add KaTex support to assets route.  
						
						
						
						
							
						
					 
					
						2023-11-09 18:21:53 -03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							4c1bc10d0f 
							
						 
					 
					
						
						
							
							Publish installer artifact  
						
						
						
						
							
						
					 
					
						2023-11-09 21:00:53 +02:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							fe82b1d2d6 
							
						 
					 
					
						
						
							
							Start writing GitHub Actions workflow  
						
						
						
						
							
						
					 
					
						2023-11-09 20:51:03 +02:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							a5c150baba 
							
						 
					 
					
						
						
							
							Remove unused electron-forge config  
						
						
						
						
							
						
					 
					
						2023-11-09 20:04:30 +02:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
						
						
							
						
						
							3470347523 
							
						 
					 
					
						
						
							
							➕  feat(package.json & package-lock.json): Add 'katex' package and update project version  
						
						
						
						
							
						
					 
					
						2023-11-09 14:23:39 -03:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
						
						
							
						
						
							e25c86e947 
							
						 
					 
					
						
						
							
							Revert " 🙈  gitignore" commits.  
						
						... 
						
						
						
						This reverts commits 30bd216500b77701d4dd49ea5b0e8eb5486b3e98, 9a587e8c8cb8b18d0d175c1dccbcaedcb2030906, 38e6008aa22198c254d0d9893c15ce309f37afe7, 5af1c7756c52ed17d90f4bd0f9c7008894989e15 and c8d6f20c3be78994cabbb909b23be81f23ee0c7e.
It reverts pr #2  from my branch 
						
						
							
						
					 
					
						2023-11-09 13:16:50 -03:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fb1478f2dd 
							
						 
					 
					
						
						
							
							Merge pull request  #2  
						
						... 
						
						
						
						Add OS and IDE files to the gitignore + Add documentation 
						
						
							
						
					 
					
						2023-11-09 12:07:12 -03:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
						
						
							
						
						
							c8d6f20c3b 
							
						 
					 
					
						
						
							
							🙈  gitignore(.gitignore): Include macOS and Linux system files  
						
						
						
						
							
						
					 
					
						2023-11-09 11:59:04 -03:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
						
						
							
						
						
							5af1c7756c 
							
						 
					 
					
						
						
							
							🙈  gitignore(.idea/.gitignore): Ignore IntelliJ IDE specific files  
						
						
						
						
							
						
					 
					
						2023-11-09 11:55:54 -03:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
						
						
							
						
						
							38e6008aa2 
							
						 
					 
					
						
						
							
							🙈  gitignore: Expand to ignore JetBrains IDEs, VisualStudioCode, and Kate templates.  
						
						
						
						
							
						
					 
					
						2023-11-09 11:55:52 -03:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
						
						
							
						
						
							9a587e8c8c 
							
						 
					 
					
						
						
							
							🙈  gitignore: Add rules to maintain empty folders and all gitignore files.  
						
						
						
						
							
						
					 
					
						2023-11-09 11:55:33 -03:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
						
						
							
						
						
							30bd216500 
							
						 
					 
					
						
						
							
							🙈  gitignore: Update documentation in gitignore and sort ignored folder/files by category.  
						
						
						
						
							
						
					 
					
						2023-11-09 11:42:07 -03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							e9282976d5 
							
						 
					 
					
						
						
							
							Fix application icon  
						
						
						
						
							
						
					 
					
						2023-11-08 23:53:08 +02:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							7cace222c0 
							
						 
					 
					
						
						
							
							Fix installer if webpack not run  
						
						
						
						
							
						
					 
					
						2023-11-08 23:17:13 +02:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							df79f3d9c9 
							
						 
					 
					
						
						
							
							Add a custom setup banner  
						
						
						
						
							
						
					 
					
						2023-11-08 23:08:38 +02:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							ddfa0d0749 
							
						 
					 
					
						
						
							
							Set up application icon  
						
						
						
						
							
						
					 
					
						2023-11-08 22:40:38 +02:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a3ce5b5d28 
							
						 
					 
					
						
						
							
							Merge pull request  #1  from ljgonzalez1/feat/update_katex_0.16.9  
						
						... 
						
						
						
						Update Katex from 0.16.0 to 0.16.9 
						
						
							
						
					 
					
						2023-11-08 17:16:59 -03:00 
						 
				 
			
				
					
						
							
							
								Luis González 
							
						 
					 
					
						
						
						
						
							
						
						
							b17848609b 
							
						 
					 
					
						
						
							
							Update Katex from 0.16.0 to 0.16.9  
						
						
						
						
							
						
					 
					
						2023-11-08 17:15:15 -03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							c0c5e30898 
							
						 
					 
					
						
						
							
							Add icon to setup  
						
						
						
						
							
						
					 
					
						2023-11-08 22:10:22 +02:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							b1e0492e05 
							
						 
					 
					
						
						
							
							Prevent (re)start on install & uninstall  
						
						
						
						
							
						
					 
					
						2023-11-08 21:56:02 +02:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							2faee49bd9 
							
						 
					 
					
						
						
							
							Use package.json instead for consistency  
						
						
						
						
							
						
					 
					
						2023-11-08 21:40:58 +02:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							380b967407 
							
						 
					 
					
						
						
							
							Configure author & description for maker-squirrel  
						
						
						
						
							
						
					 
					
						2023-11-08 21:40:04 +02:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							145a09edd1 
							
						 
					 
					
						
						
							
							Set up Electron Forge  
						
						... 
						
						
						
						This should allow us to package Trilium for multiple platforms,
including generating a Windows installer which is our current target. 
						
						
							
						
					 
					
						2023-11-08 21:28:04 +02:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							b07628abda 
							
						 
					 
					
						
						
							
							Remove electron-builder dependency  
						
						... 
						
						
						
						The `electron-builder` dependency was introduced a while ago in #289 ,
but finally removed bcbbf4dc3eb9f75b561cb3af99e200bc709c5388 so there
should be no reason to keep it around. 
						
						
							
						
					 
					
						2023-11-08 21:21:01 +02:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							e9ece21d20 
							
						 
					 
					
						
						
							
							release 0.62.0-beta  
						
						
						
						
							
 
						
					 
					
						2023-11-06 23:13:25 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							b700f069fe 
							
						 
					 
					
						
						
							
							reduce flickering while hoisted  
						
						
						
						
							
						
					 
					
						2023-11-06 23:11:57 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							40fb6aa168 
							
						 
					 
					
						
						
							
							move the unhoist button to the right  
						
						
						
						
							
						
					 
					
						2023-11-06 22:28:25 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							341480e7cf 
							
						 
					 
					
						
						
							
							scroll padding widget only on text and code notes  
						
						
						
						
							
						
					 
					
						2023-11-06 22:26:17 +01:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							bde311fd76 
							
						 
					 
					
						
						
							
							upgrades  
						
						
						
						
							
						
					 
					
						2023-11-06 22:23:18 +01:00