Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9f0c0b34af 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'order_category/master'  
						
						 
						
						
						
					 
					
						2020-04-26 18:50:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							87ec44aed5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'  
						
						 
						
						
						
					 
					
						2020-04-26 18:38:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							898e6b4f80 
							
						 
					 
					
						
						
							
							Calibre-Web is rebooted everytime login type ic shanged (from and to standard authentication and between login methods)  
						
						 
						
						
						
					 
					
						2020-04-26 18:24:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							dea2600913 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'oauth/patch-2' Fix oauth in combination with nginx reverse proxy  
						
						 
						
						
						
					 
					
						2020-04-26 18:23:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							dc46ad16ae 
							
						 
					 
					
						
						
							
							Bugfix view shelfs on book detail page  
						
						 
						
						
						
					 
					
						2020-04-26 11:35:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							85ffc90f66 
							
						 
					 
					
						
						
							
							Update markup  
						
						 
						
						
						
					 
					
						2020-04-25 08:56:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fa38798066 
							
						 
					 
					
						
						
							
							Added contributing file  
						
						 
						
						
						
					 
					
						2020-04-25 08:55:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d657330584 
							
						 
					 
					
						
						
							
							Fix for removing admin role from last admin user (in addition to prevent delete of last admin user)  #1326  
						
						 
						
						
						
					 
					
						2020-04-25 07:13:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							36cb79de62 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'turkish/master'  
						
						 
						
						
						
					 
					
						2020-04-24 22:14:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							063ee5e855 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remove_usage_local_var_undeclared'  
						
						 
						
						... 
						
						
						
						Code cosmetics 
						
					 
					
						2020-04-24 21:05:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7393b69757 
							
						 
					 
					
						
						
							
							Fix for  #1326  (typo)  
						
						 
						
						
						
					 
					
						2020-04-24 19:25:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8bd1903d98 
							
						 
					 
					
						
						
							
							Fix for  #1326  (opds feed user login not working -> download was not possible)  
						
						 
						
						
						
					 
					
						2020-04-24 18:37:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jvoisin 
							
						 
					 
					
						
						
						
						
							
						
						
							d8bf540db2 
							
						 
					 
					
						
						
							
							Remove an undeclared and useless local variable  
						
						 
						
						
						
					 
					
						2020-04-24 18:04:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iz 
							
						 
					 
					
						
						
						
						
							
						
						
							1770f3fd0d 
							
						 
					 
					
						
						
							
							Update turkish translation headers  
						
						 
						
						
						
					 
					
						2020-04-23 22:47:24 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iz 
							
						 
					 
					
						
						
						
						
							
						
						
							4239f2ed71 
							
						 
					 
					
						
						
							
							Add turkish translation  
						
						 
						
						
						
					 
					
						2020-04-23 22:37:44 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iz 
							
						 
					 
					
						
						
						
						
							
						
						
							3939ec28ba 
							
						 
					 
					
						
						
							
							Add turkish language names  
						
						 
						
						
						
					 
					
						2020-04-23 22:37:35 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1df82110d1 
							
						 
					 
					
						
						
							
							Update Italian language translation  
						
						 
						
						
						
					 
					
						2020-04-19 19:13:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ElQuimm 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f1b1ebe29e 
							
						 
					 
					
						
						
							
							Updated italian version of messages.po  
						
						 
						
						
						
					 
					
						2020-04-19 16:38:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeff 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6384cdc74d 
							
						 
					 
					
						
						
							
							Fix https github oauth  
						
						 
						
						... 
						
						
						
						while using https domian and nginx as proxy, a `ProxyFix` is required. 
						
					 
					
						2020-04-19 19:53:41 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								celogeek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d093fbb069 
							
						 
					 
					
						
						
							
							Keep previous search value and focus  
						
						 
						
						
						
					 
					
						2020-04-19 13:12:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							902685a197 
							
						 
					 
					
						
						
							
							Fix text in user config section (random books in Detail View)  
						
						 
						
						
						
					 
					
						2020-04-18 21:30:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c04b146486 
							
						 
					 
					
						
						
							
							Fix   #1309  (fix duplicate shelf names in book detail view)  
						
						 
						
						
						
					 
					
						2020-04-18 21:15:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							06fde4fcd0 
							
						 
					 
					
						
						
							
							Fix   #1311  (Enable LDAP Anonymous Login)  
						
						 
						
						
						
					 
					
						2020-04-18 11:48:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							195845ab0c 
							
						 
					 
					
						
						
							
							Fix  
						
						 
						
						
						
					 
					
						2020-04-17 18:17:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							81a329f1e7 
							
						 
					 
					
						
						
							
							Fix for  #1087  ( Caliblur! Theme button alignment)  
						
						 
						
						
						
					 
					
						2020-04-17 18:16:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cd6272a1c9 
							
						 
					 
					
						
						
							
							Update teststatus  
						
						 
						
						
						
					 
					
						2020-04-16 22:00:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							53be752787 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'it/patch-10'  
						
						 
						
						
						
					 
					
						2020-04-16 20:17:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2c42972230 
							
						 
					 
					
						
						
							
							Fix for  #1307  (Oauth login not working)  
						
						 
						
						... 
						
						
						
						- Changed blueprint reference in Backend from name to id, users can now again be found
- Depending on version of flask-dance the resultcode of authorized is set different to prevent redirect loop with newer versions(>1.3)
- Redirect to login page in case no user is linked to current oauth account
- Flash messages upon successfull login, successsfull linked account 
						
					 
					
						2020-04-16 17:58:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								aribes 
							
						 
					 
					
						
						
						
						
							
						
						
							f926e58891 
							
						 
					 
					
						
						
							
							Changing ordering logic when showing books from a category  
						
						 
						
						
						
					 
					
						2020-04-16 11:37:04 +10:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a784c6bd52 
							
						 
					 
					
						
						
							
							Fixes for oauth login after programming basic tests  
						
						 
						
						
						
					 
					
						2020-04-15 22:03:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ElQuimm 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							05d78f5cb5 
							
						 
					 
					
						
						
							
							Update italian version of message.po  
						
						 
						
						... 
						
						
						
						Have a nice day! 
						
					 
					
						2020-04-15 10:59:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ce4f1258b5 
							
						 
					 
					
						
						
							
							Fix   #1293  (error 500 on search without query)  
						
						 
						
						
						
					 
					
						2020-04-14 19:27:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3fbaba6693 
							
						 
					 
					
						
						
							
							Fix   #1307  
						
						 
						
						
						
					 
					
						2020-04-14 18:28:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a8b36aed92 
							
						 
					 
					
						
						
							
							Temporary fix for  #1307  
						
						 
						
						
						
					 
					
						2020-04-14 14:13:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4749eccfa5 
							
						 
					 
					
						
						
							
							Added fix for python2 regex  
						
						 
						
						... 
						
						
						
						Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap 
						
					 
					
						2020-04-14 10:58:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a194216568 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						 
						
						
						
					 
					
						2020-04-05 19:10:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8bee424cc0 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'ldap/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py 
						
					 
					
						2020-04-05 17:31:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							25ab3cabfe 
							
						 
					 
					
						
						
							
							Add question for logfile to Issue Template  
						
						 
						
						
						
					 
					
						2020-04-04 18:28:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							587174b771 
							
						 
					 
					
						
						
							
							Fix   #1272  
						
						 
						
						
						
					 
					
						2020-04-04 08:53:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ec6b346ca1 
							
						 
					 
					
						
						
							
							Update Translation  
						
						 
						
						
						
					 
					
						2020-04-03 19:50:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e99f5bcced 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'english/master'  
						
						 
						
						
						
					 
					
						2020-04-03 19:46:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b89309ab82 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'po/master'  
						
						 
						
						
						
					 
					
						2020-04-03 19:27:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2d230ec96a 
							
						 
					 
					
						
						
							
							Updated Teststatus  
						
						 
						
						
						
					 
					
						2020-04-02 21:13:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4550333f1e 
							
						 
					 
					
						
						
							
							Added redirect after create shelf  
						
						 
						
						
						
					 
					
						2020-04-02 20:19:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3ba610eb64 
							
						 
					 
					
						
						
							
							Revert accidentally committed changes in opds feed  
						
						 
						
						
						
					 
					
						2020-04-02 19:07:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2436c6a118 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'caliblur/master'  
						
						 
						
						
						
					 
					
						2020-04-02 18:27:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4de80b26c1 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'public_shelf/calibre-web_645'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/feed.xml
#	cps/templates/layout.html 
						
					 
					
						2020-04-02 18:24:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							bab14a1fbf 
							
						 
					 
					
						
						
							
							Update shelfs handling, bugfix changed updater  
						
						 
						
						
						
					 
					
						2020-04-02 18:23:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0c27ff11b9 
							
						 
					 
					
						
						
							
							Update Updater  
						
						 
						
						
						
					 
					
						2020-04-01 18:45:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								BeckyDTP 
							
						 
					 
					
						
						
						
						
							
						
						
							734e2ffbb2 
							
						 
					 
					
						
						
							
							Updated Polish translations  
						
						 
						
						
						
					 
					
						2020-03-31 21:53:13 +02:00