zadam
							
						 
					 | 
					
						
						
							
						
						dbf1ac1e9d
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json
#	src/services/build.js 
						
						
					 | 
					
						2022-07-01 22:34:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						3faae63b84
					 | 
					
						
						
							
							set correct content type for error messages
						
						
						
						
						
						
					 | 
					
						2022-07-01 00:01:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						df3fdb59c5
					 | 
					
						
						
							
							fix saving note revisions, closes #2915
						
						
						
						
						
						
					 | 
					
						2022-06-13 22:54:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						4cec856e21
					 | 
					
						
						
							
							simplified updating note content
						
						
						
						
						
						
					 | 
					
						2022-06-13 22:38:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						564366861e
					 | 
					
						
						
							
							prevent browser from caching images/files, fixes #2378
						
						
						
						
						
						
					 | 
					
						2021-11-25 20:24:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						b660238a40
					 | 
					
						
						
							
							backend import unification
						
						
						
						
						
						
					 | 
					
						2021-06-29 22:15:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						439ef4a8cb
					 | 
					
						
						
							
							moved becca to top level source dir
						
						
						
						
						
						
					 | 
					
						2021-05-17 22:09:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						273d4e0052
					 | 
					
						
						
							
							becca conversion WIP
						
						
						
						
						
						
					 | 
					
						2021-05-02 19:59:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						1af10d48a2
					 | 
					
						
						
							
							becca conversion WIP
						
						
						
						
						
						
					 | 
					
						2021-05-02 11:23:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ccac46527c
					 | 
					
						
						
							
							opened file change detection now useable on all note types
						
						
						
						
						
						
					 | 
					
						2021-04-24 21:56:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						a74741343e
					 | 
					
						
						
							
							upload of modified open file WIP
						
						
						
						
						
						
					 | 
					
						2021-04-24 11:39:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						d3cccae2df
					 | 
					
						
						
							
							implemented audio/video in note content renderer + streaming API #886
						
						
						
						
						
						
					 | 
					
						2021-04-18 12:40:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						18cc9f2475
					 | 
					
						
						
							
							"open" action will save note to temp directory to try it then open with native application, #1304
						
						
						
						
						
						
					 | 
					
						2020-10-13 22:50:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						53c361945b
					 | 
					
						
						
							
							fix setting mime after import + cleanup of old search code
						
						
						
						
						
						
					 | 
					
						2020-08-18 22:20:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						88348c560c
					 | 
					
						
						
							
							syncification
						
						
						
						
						
						
					 | 
					
						2020-06-20 12:31:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						9d8b8e26a1
					 | 
					
						
						
							
							attach extension to download file if note present
						
						
						
						
						
						
					 | 
					
						2020-05-12 10:28:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						e7aa84435b
					 | 
					
						
						
							
							render PDF preview in electron for pdf notes
						
						
						
						
						
						
					 | 
					
						2020-03-08 18:06:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						60ac1a04f4
					 | 
					
						
						
							
							uploading new file revisions
						
						
						
						
						
						
					 | 
					
						2019-11-09 11:58:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |