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
							
						 
					 | 
					
						
						
						
						
							
						
						
							5260689b8e
							
						
					 | 
					
						
						
							
							include "dump-db" into released artifacts
						
						
						
						
						
						
					 | 
					
						2022-02-12 22:51:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							23de8e881d
							
						
					 | 
					
						
						
							
							make it clear that Dockerfile needs to be run through a script
						
						
						
						
						
						
					 | 
					
						2022-02-11 22:05:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d1b39ee8fa
							
						
					 | 
					
						
						
							
							generate anonymization script into a file
						
						
						
						
						
						
					 | 
					
						2022-01-17 23:47:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							630d9f2e45
							
						
					 | 
					
						
						
							
							backlinks improvements, #2349
						
						
						
						
						
						
					 | 
					
						2021-12-02 22:00:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							89322c4b03
							
						
					 | 
					
						
						
							
							upgrade to electron v16 and node v16
						
						
						
						
						
						
					 | 
					
						2021-11-16 22:43:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed5eb5c6db
							
						
					 | 
					
						
						
							
							fix dockerfile APK python dependency
						
						
						
						
						
						
					 | 
					
						2021-11-14 11:35:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							241d1b1035
							
						
					 | 
					
						
						
							
							node 14.18.1
						
						
						
						
						
						
					 | 
					
						2021-10-14 22:22:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f24ea8137b
							
						
					 | 
					
						
						
							
							revert of better sqlite3 dep for server build
						
						
						
						
						
						
					 | 
					
						2021-09-08 20:56:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							08eda83700
							
						
					 | 
					
						
						
							
							node update to 14.17.5
						
						
						
						
						
						
					 | 
					
						2021-08-22 12:25:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a615398aa
							
						
					 | 
					
						
						
							
							docker now uses node 14.17 as other builds
						
						
						
						
						
						
					 | 
					
						2021-06-02 23:37:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ohdearaugustin
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4fd9e7f14f
							
						
					 | 
					
						
						
							
							Drop privileges (#1422)
						
						
						
						
						
						
					 | 
					
						2020-11-15 20:51:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							609829653e
							
						
					 | 
					
						
						
							
							fix docker build
						
						
						
						
						
						
					 | 
					
						2020-10-27 19:39:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							64c9734f05
							
						
					 | 
					
						
						
							
							transform setup.js to the webpacked version in the build
						
						
						
						
						
						
					 | 
					
						2020-05-08 20:50:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							339f212e4c
							
						
					 | 
					
						
						
							
							added webpack
						
						
						
						
						
						
					 | 
					
						2020-04-12 14:22:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							16f42dd4ab
							
						
					 | 
					
						
						
							
							use electron 8 spellchecker instead of electron-spellchecker, WIP
						
						
						
						
						
						
					 | 
					
						2020-02-28 22:07:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e06f3ef97e
							
						
					 | 
					
						
						
							
							refactorings for add link and include note
						
						
						
						
						
						
					 | 
					
						2020-02-16 10:50:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a62d1636b
							
						
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2020-01-24 22:30:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a416b107b
							
						
					 | 
					
						
						
							
							fix electron dep issue in the server version, closes #784
						
						
						
						
						
						
					 | 
					
						2019-12-25 19:38:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							00c295e4bf
							
						
					 | 
					
						
						
							
							upgrade to electron 8.0.0-beta.3
						
						
						
						
						
						
					 | 
					
						2019-11-21 19:36:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4570319517
							
						
					 | 
					
						
						
							
							WS debugging messages and small changes
						
						
						
						
						
						
					 | 
					
						2019-10-24 23:02:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9ab044e46
							
						
					 | 
					
						
						
							
							fix docker build
						
						
						
						
						
						
					 | 
					
						2019-10-15 21:53:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2ee94a3a69
							
						
					 | 
					
						
						
							
							changed import progress notification so it shows up for drag & drop as well
						
						
						
						
						
						
					 | 
					
						2019-10-14 10:31:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f2229d9e1
							
						
					 | 
					
						
						
							
							better handling of not detected mime type
						
						
						
						
						
						
					 | 
					
						2019-10-06 18:28:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							649862b01c
							
						
					 | 
					
						
						
							
							fixed mobile layout
						
						
						
						
						
						
					 | 
					
						2019-09-09 21:31:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							650d9e0b27
							
						
					 | 
					
						
						
							
							state management fixes
						
						
						
						
						
						
					 | 
					
						2019-08-28 20:29:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							976684a3a8
							
						
					 | 
					
						
						
							
							save note in clipper
						
						
						
						
						
						
					 | 
					
						2019-07-06 16:48:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matt Maurer
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c5292222f
							
						
					 | 
					
						
						
							
							Build failed without python for arm
						
						
						
						
						
						
					 | 
					
						2019-06-20 23:45:31 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2c497049b
							
						
					 | 
					
						
						
							
							node updated to 12, electron to 6
						
						
						
						
						
						
					 | 
					
						2019-06-11 21:56:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							33733d3ab7
							
						
					 | 
					
						
						
							
							use node 12 for server/docker builds
						
						
						
						
						
						
					 | 
					
						2019-05-27 19:12:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8fb6edad67
							
						
					 | 
					
						
						
							
							fix consistency checks for fulltext
						
						
						
						
						
						
					 | 
					
						2019-03-29 22:08:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lee Spottiswood
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							081ab00a0a
							
						
					 | 
					
						
						
							
							Update Dockerfile
						
						
						
						
						
						
					 | 
					
						2019-01-07 21:21:23 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
						
						
							
						
						
							de9e0c7929
							
						
					 | 
					
						
						
							
							lazy loading icon for both mobile and desktop
						
						
						
						
						
						
					 | 
					
						2018-12-30 21:13:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
						
						
							
						
						
							4cc08bff8b
							
						
					 | 
					
						
						
							
							minor node updates in docker and server package
						
						
						
						
						
						
					 | 
					
						2018-11-30 13:56:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gabe Cook
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							9cb9ea6ab5
							
						
					 | 
					
						
						
							
							Smaller Docker image by switching the base image to node:10.13.0-alpine and consolidating scripts
						
						
						
						
						
						
					 | 
					
						2018-11-30 05:41:53 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
						
						
							
						
						
							62a250a7fc
							
						
					 | 
					
						
						
							
							fixes for tooltip handling
						
						
						
						
						
						
					 | 
					
						2018-11-18 20:57:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b7694d0ec
							
						
					 | 
					
						
						
							
							use node 10 also for server edition
						
						
						
						
						
						
					 | 
					
						2018-10-14 11:35:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
						
						
							
						
						
							6668b55d6e
							
						
					 | 
					
						
						
							
							use node 10 for docker and server package
						
						
						
						
						
						
					 | 
					
						2018-09-05 20:35:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c8eeb2e6f
							
						
					 | 
					
						
						
							
							added docker build, closes #106
						
						
						
						
						
						
					 | 
					
						2018-06-10 15:06:52 -04:00 | 
					
					
						
						
							
							
							
						
					 |