zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							27f74489fd
							
						
					 | 
					
						
						
							
							fix login/logout redirects when not in the document root
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-11 22:04:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae8f4ffbbe
							
						
					 | 
					
						
						
							
							minor sync fix for fulltext
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-11 21:44:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							896776516b
							
						
					 | 
					
						
						
							
							fix in page search in browser (didn't appear after ctrl+f)
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-09 21:16:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a27525af9e
							
						
					 | 
					
						
						
							
							frontend API additions
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-09 21:13:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							83b4382787
							
						
					 | 
					
						
						
							
							missing cert and key error message
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-08 20:08:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef1b32d586
							
						
					 | 
					
						
						
							
							search error handling & sanitize input for default fulltext
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-02 22:52:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe3a0bc756
							
						
					 | 
					
						
						
							
							new find-in-page dialog (using electron-find) which actually works
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-02 21:44:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2259e1d44d
							
						
					 | 
					
						
						
							
							make sure to wait for DB connection to be up before starting ...
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-02 19:42:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ca4a016eb
							
						
					 | 
					
						
						
							
							fix linux server build
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-01 23:11:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2978a262f7
							
						
					 | 
					
						
						
							
							release 0.31.0-beta
						
						
						
						
						
						
							
 v0.31.0-beta
						
					 | 
					
						2019-04-01 21:50:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f47f3461e6
							
						
					 | 
					
						
						
							
							show local date in revisions dialog + make it larger
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-01 21:49:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							06202c31e4
							
						
					 | 
					
						
						
							
							note info shows local date instead of utc date
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-01 21:43:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							925dc258a6
							
						
					 | 
					
						
						
							
							fix menu text color in dark themes
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-01 21:38:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3670800a51
							
						
					 | 
					
						
						
							
							set cookie header only for electron calls
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-01 21:18:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							90a331b989
							
						
					 | 
					
						
						
							
							some style fixes and refactoring for tree context menu
						
						
						
						
						
						
							
						
					 | 
					
						2019-04-01 21:11:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a4c8bdeda2
							
						
					 | 
					
						
						
							
							fix decryption of protected note revisions
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-31 22:54:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5bda254184
							
						
					 | 
					
						
						
							
							allow searching with noteId & fix combining fulltext and other conditions with OR
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-31 22:23:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							26621c0318
							
						
					 | 
					
						
						
							
							short search help in the tooltip
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-31 21:19:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6806256fd
							
						
					 | 
					
						
						
							
							import doesn't need a full tree reload
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-31 19:13:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f00e1235f9
							
						
					 | 
					
						
						
							
							tar import can now process files with out of order directories
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-31 18:53:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							51bede6541
							
						
					 | 
					
						
						
							
							fix detection of sync connection issue with new error code
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-31 18:36:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							75dbaa4b77
							
						
					 | 
					
						
						
							
							fix csrf protection on electron build
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-31 12:49:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							bec6576620
							
						
					 | 
					
						
						
							
							fix note cleanup
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-31 11:27:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							44551e0e8c
							
						
					 | 
					
						
						
							
							electron build now waits for the migration before opening the window
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-31 11:21:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							67553cb40e
							
						
					 | 
					
						
						
							
							fix ordering of note migrations
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-30 22:20:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cafbda7cd
							
						
					 | 
					
						
						
							
							migration for inconsistent isProtected status across notes and note_contents
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-30 22:12:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a5a085103
							
						
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	src/public/javascripts/services/server.js
#	src/services/app_info.js
#	src/services/notes.js 
						
						
							
						
					 | 
					
						2019-03-30 22:11:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdb17ae937
							
						
					 | 
					
						
						
							
							release 0.30.7
						
						
						
						
						
						
							
 v0.30.7
						
					 | 
					
						2019-03-30 20:13:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c240fb9896
							
						
					 | 
					
						
						
							
							migration for inconsistent isProtected status across notes and note_contents
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-30 20:09:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b41eddf44
							
						
					 | 
					
						
						
							
							fix creating note directly as protected
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-30 19:24:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b51ac112a2
							
						
					 | 
					
						
						
							
							fix loading of protected session in electron, #469
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-30 18:00:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1ac609b34
							
						
					 | 
					
						
						
							
							search input tooltip WIP
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-30 17:41:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							66e2a12f3d
							
						
					 | 
					
						
						
							
							rename "current" to "active" based on recent refactorings
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-30 10:15:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							9f69294f7f
							
						
					 | 
					
						
						
							
							Merge pull request #466 from capi/ctrl-shift-l
						
						
						
						
						
						
						
						Add Ctrl+Shift+L to pre-select "add to note" 
						
						
							
						
					 | 
					
						2019-03-30 10:13:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a5fc8d5329
							
						
					 | 
					
						
						
							
							moved libraries and images out of src folder
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-30 09:39:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bbf797caf
							
						
					 | 
					
						
						
							
							saved search note now has refresh button, closes #369
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-30 00:12:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f479c0e10e
							
						
					 | 
					
						
						
							
							when note is created, it's automatically present in all cloned parents as well
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-29 23:55:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f32154b91
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
						
						# Conflicts:
#	src/public/javascripts/services/context_menu.js 
						
						
							
						
					 | 
					
						2019-03-29 23:37:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2019ee5f9
							
						
					 | 
					
						
						
							
							slightly nicer search detail
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-29 23:28:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							89b8e2bb08
							
						
					 | 
					
						
						
							
							redesign of search input. Saved search is now saved under active note and doesn't need page reload
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-29 23:24:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8fb6edad67
							
						
					 | 
					
						
						
							
							fix consistency checks for fulltext
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-29 22:08:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c2e3a3fe04
							
						
					 | 
					
						
						
							
							release 0.30.6
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-28 23:17:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b2052a6ccd
							
						
					 | 
					
						
						
							
							release 0.30.6
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-28 23:01:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a07479cd5a
							
						
					 | 
					
						
						
							
							release 0.30.6
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-28 22:49:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3820384f51
							
						
					 | 
					
						
						
							
							release 0.30.6
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-28 22:35:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0610576e5a
							
						
					 | 
					
						
						
							
							0.30.6
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-28 22:35:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							efac7701eb
							
						
					 | 
					
						
						
							
							release 0.30.6
						
						
						
						
						
						
							
 v0.30.6
						
					 | 
					
						2019-03-28 22:31:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							905eb303bc
							
						
					 | 
					
						
						
							
							fix protected note switching
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-28 21:17:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							27cee1cf33
							
						
					 | 
					
						
						
							
							fix closing of context menu on FF66, closes #468
						
						
						
						
						
						
						
						(cherry picked from commit 3c56d29fca16911dc587c5ab6ed221df9005895a) 
						
						
							
						
					 | 
					
						2019-03-28 20:57:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c56d29fca
							
						
					 | 
					
						
						
							
							fix closing of context menu on FF66, closes #468
						
						
						
						
						
						
							
						
					 | 
					
						2019-03-28 20:54:17 +01:00 | 
					
					
						
						
							
							
							
						
					 |