Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							146068c936 
							
						 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html 
						
					 
					
						2020-02-23 13:15:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3b8c5ef21a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'get_metadata/patch-1'  
						
						 
						
						... 
						
						
						
						Fix  #1210  Load multiple authors correct via get metadata 
						
					 
					
						2020-02-23 13:14:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e60ef8fc97 
							
						 
					 
					
						
						
							
							Calibre-web version visible in about section  
						
						 
						
						... 
						
						
						
						Update Calibre-web Version info 
						
					 
					
						2020-02-23 12:40:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							24d755b123 
							
						 
					 
					
						
						
							
							Update translations  
						
						 
						
						... 
						
						
						
						Merge remote-tracking branch 'it/patch-7' 
						
					 
					
						2020-02-23 10:55:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7c89f0b5b9 
							
						 
					 
					
						
						
							
							Merge with branch develop  
						
						 
						
						... 
						
						
						
						Release version 
						
					 
					
						2020-02-23 09:08:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							134a10f56c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/Develop' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/updater.py 
						
					 
					
						2020-02-23 08:58:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3a70c86f49 
							
						 
					 
					
						
						
							
							Update updater to handle venv folders  
						
						 
						
						
						
					 
					
						2020-02-23 08:58:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							371097eb4d 
							
						 
					 
					
						
						
							
							Update Updater  
						
						 
						
						
						
					 
					
						2020-02-23 07:54:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							372c284ad4 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-02-22 16:24:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Johnny A. dos Santos 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							29cb8bfec4 
							
						 
					 
					
						
						
							
							Fix   #1210  
						
						 
						
						
						
					 
					
						2020-02-21 18:25:02 -03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b7f3e00fbf 
							
						 
					 
					
						
						
							
							Update updater to handle venv folders  
						
						 
						
						
						
					 
					
						2020-02-21 18:04:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							27a18d60a7 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'fix/robust_proxy' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/kobo.py 
						
					 
					
						2020-02-19 18:20:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6893635251 
							
						 
					 
					
						
						
							
							Handle kobo auth request  
						
						 
						
						... 
						
						
						
						Handle access from localhost for kobo 
						
					 
					
						2020-02-18 20:36:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ElQuimm 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							94a38a3b47 
							
						 
					 
					
						
						
							
							udate message.po in italian  
						
						 
						
						... 
						
						
						
						Hello, 
updated one more time the translation :-)
I think the string "Author list" is missing.
Thank you!
Quimm 
						
					 
					
						2020-02-17 21:03:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							df3eb40e3c 
							
						 
					 
					
						
						
							
							Make KoboStore proxying more robust.  
						
						 
						
						... 
						
						
						
						* Add a timeout to prevent hanging when the KoboStore isn't reachable.
* Add back a the dummy auth implementation for when proxying is
disabled.
* Return the dummy auth response as a fallback when failing to contact
the KoboStore.
* Don't contact the KoboStore during the /sync API call when proxying is
disabled. 
						
					 
					
						2020-02-17 14:37:02 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ba6b5f8fd1 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-02-17 18:42:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8f518993a4 
							
						 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						 
						
						
						
					 
					
						2020-02-18 00:21:59 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							29f6463ed9 
							
						 
					 
					
						
						
							
							Fix   #1149  (Prevent invalid file extensions on Kindle Paperwhite download)  
						
						 
						
						
						
					 
					
						2020-02-16 19:55:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ed0bdbf31d 
							
						 
					 
					
						
						
							
							Fix for  #1199  (missing referrer)  
						
						 
						
						
						
					 
					
						2020-02-16 19:39:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b152d3e06d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token'  
						
						 
						
						
						
					 
					
						2020-02-16 19:24:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							16cd57fe55 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'  
						
						 
						
						
						
					 
					
						2020-02-16 19:19:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3f578122a3 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'it/patch-6'  
						
						 
						
						
						
					 
					
						2020-02-16 18:56:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							51a27322be 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cn/master'  
						
						 
						
						
						
					 
					
						2020-02-16 18:53:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e3ddc16657 
							
						 
					 
					
						
						
							
							Fix opds login not working anymore (due to kobo sync protocol)  
						
						 
						
						
						
					 
					
						2020-02-16 14:25:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								André Frimberger 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							33cdf20cd5 
							
						 
					 
					
						
						
							
							Remove trailing whitespaces  
						
						 
						
						
						
					 
					
						2020-02-16 10:25:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							317e59df4b 
							
						 
					 
					
						
						
							
							Bugfixes from tests  
						
						 
						
						
						
					 
					
						2020-02-15 16:02:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a9a6f5b97e 
							
						 
					 
					
						
						
							
							Renamed restrict -> deny  
						
						 
						
						
						
					 
					
						2020-02-15 10:21:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8b1444ebc2 
							
						 
					 
					
						
						
							
							Improved testability  
						
						 
						
						... 
						
						
						
						Less content exposed with restricted content
Tornado restart and stop working with systemd 
						
					 
					
						2020-02-15 09:08:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							509071949a 
							
						 
					 
					
						
						
							
							Moved style to css file  
						
						 
						
						
						
					 
					
						2020-02-13 21:05:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ElQuimm 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							697d857549 
							
						 
					 
					
						
						
							
							message.po italian  
						
						 
						
						
						
					 
					
						2020-02-13 11:29:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2ea45b1fdc 
							
						 
					 
					
						
						
							
							Removed shebang on non executable scripts  
						
						 
						
						
						
					 
					
						2020-02-10 18:37:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							726595e117 
							
						 
					 
					
						
						
							
							Update for testability  
						
						 
						
						
						
					 
					
						2020-02-10 18:34:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							1666e32aaf 
							
						 
					 
					
						
						
							
							Fixes cover layouts in user edit page  
						
						 
						
						
						
					 
					
						2020-02-09 22:31:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							6a69bbe4b5 
							
						 
					 
					
						
						
							
							Fixes cover layouts in user edit page  
						
						 
						
						
						
					 
					
						2020-02-09 22:20:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								André Frimberger 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7a608b4fb0 
							
						 
					 
					
						
						
							
							fix binascii.Error with reverse proxy bearer token  
						
						 
						
						... 
						
						
						
						When an authenticating reverse proxy (e.g. Keycloak Gatekeeper) adds a Bearer token in the Authorization header, every request fails with HTTP status code 500.  The corresponding error in the logs is: binascii.Error: Incorrect padding. 
Despite "reverse_proxy_header_login" is enabled, calibre-web tries first to base64decode the bearer token and fails. This patch just reverses the order in which the authentication methods  are checked. 
						
					 
					
						2020-02-09 17:21:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							814ad87a42 
							
						 
					 
					
						
						
							
							Updated pdf viewer to 2.2.228 ( #1184 )  
						
						 
						
						
						
					 
					
						2020-02-09 17:02:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3e4b5e23fa 
							
						 
					 
					
						
						
							
							Updated pdf viewer to 2.2.228 ( #1184 )  
						
						 
						
						
						
					 
					
						2020-02-09 17:02:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ab24ed8088 
							
						 
					 
					
						
						
							
							Handle sorting of hidden books  #1123  
						
						 
						
						... 
						
						
						
						Prevent downloading of covers from hidden books 
						
					 
					
						2020-02-09 14:31:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							50ba2e329a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/shelf.py 
						
					 
					
						2020-02-09 07:00:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e04aa80fd6 
							
						 
					 
					
						
						
							
							Fix   #1181  and  Fix   #1182  handle removed "is_xhr" on werkzeug version 1.0.0  
						
						 
						
						
						
					 
					
						2020-02-08 14:40:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2535bbbcf1 
							
						 
					 
					
						
						
							
							Fix   #1180  working on windows with tornado and python <3.8 again  
						
						 
						
						
						
					 
					
						2020-02-08 13:24:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6698773d81 
							
						 
					 
					
						
						
							
							Improved testability  
						
						 
						
						
						
					 
					
						2020-02-08 11:33:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								xcffl 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							aefaf47f4c 
							
						 
					 
					
						
						
							
							Update Simplified Chinese translation  
						
						 
						
						
						
					 
					
						2020-02-03 17:26:17 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
						
						
							
						
						
							9b49125776 
							
						 
					 
					
						
						
							
							English Language Updates  
						
						 
						
						... 
						
						
						
						Changes to provide consistency for English language. 
						
					 
					
						2020-02-03 14:22:00 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b33a2ac90d 
							
						 
					 
					
						
						
							
							Fix   #1170  Auth-digest Header no longer crashs calibre-web  
						
						 
						
						... 
						
						
						
						Fix  #1161  Shelfs are reordering again
Update Sortable.js to 2.10.1
Code cosmetics 
						
					 
					
						2020-02-02 07:47:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f67953c447 
							
						 
					 
					
						
						
							
							Update translation  
						
						 
						
						... 
						
						
						
						Merge remote-tracking branch 'cz/patch-11' 
						
					 
					
						2020-02-01 15:03:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							981632f599 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'it/patch-5'  
						
						 
						
						
						
					 
					
						2020-02-01 15:02:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a6c453d826 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'pl/pl_translate_update'  
						
						 
						
						
						
					 
					
						2020-02-01 15:01:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4087e685f4 
							
						 
					 
					
						
						
							
							Fix auto detection of locale  
						
						 
						
						
						
					 
					
						2020-02-01 13:40:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							5255085de1 
							
						 
					 
					
						
						
							
							Fix auto detection of locale  
						
						 
						
						
						
					 
					
						2020-02-01 13:38:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ElQuimm 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9247ded710 
							
						 
					 
					
						
						
							
							Update - italian version of message.po  
						
						 
						
						
						
					 
					
						2020-01-29 21:41:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jerzy Piątek 
							
						 
					 
					
						
						
						
						
							
						
						
							0bb0cbaef0 
							
						 
					 
					
						
						
							
							Updated polish translations  
						
						 
						
						
						
					 
					
						2020-01-28 22:28:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukáš Heroudek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0f7d272e13 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						
						
					 
					
						2020-01-28 10:03:40 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							00dafe3121 
							
						 
					 
					
						
						
							
							Fix restrict columns  
						
						 
						
						
						
					 
					
						2020-01-27 20:34:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e44494aad0 
							
						 
					 
					
						
						
							
							Kobo sync enable/disable working  
						
						 
						
						
						
					 
					
						2020-01-27 20:32:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4ab3dc2599 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py 
						
					 
					
						2020-01-27 18:20:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							acfad7a982 
							
						 
					 
					
						
						
							
							Update Italian translation  
						
						 
						
						
						
					 
					
						2020-01-27 18:17:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b29b5b7ac1 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'github/fix-admin-view-log-file'  
						
						 
						
						
						
					 
					
						2020-01-27 18:14:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ElQuimm 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7803ffb995 
							
						 
					 
					
						
						
							
							Update italian message.po  
						
						 
						
						... 
						
						
						
						Thank you. 
						
					 
					
						2020-01-27 15:07:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ghighi Eftimie 
							
						 
					 
					
						
						
						
						
							
						
						
							fc79cdfaa2 
							
						 
					 
					
						
						
							
							fix mismerge  
						
						 
						
						
						
					 
					
						2020-01-27 15:24:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ghighi Eftimie 
							
						 
					 
					
						
						
						
						
							
						
						
							647e954e8a 
							
						 
					 
					
						
						
							
							fix admin view of error log  
						
						 
						
						
						
					 
					
						2020-01-26 20:53:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							004d9118bc 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-01-26 19:37:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							594c8aad91 
							
						 
					 
					
						
						
							
							Update Version Info  
						
						 
						
						
						
					 
					
						2020-01-26 19:36:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							542a0008c9 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'ru/master'  
						
						 
						
						
						
					 
					
						2020-01-26 19:33:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							24f7918aa4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'it/patch-4'  
						
						 
						
						
						
					 
					
						2020-01-26 19:31:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2eec329bdf 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt 
						
					 
					
						2020-01-26 19:29:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0411d4a8c9 
							
						 
					 
					
						
						
							
							Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo  
						
						 
						
						... 
						
						
						
						Added fix for kobo reader generating requests without right port number, causing url_for not working correct 
						
					 
					
						2020-01-26 16:52:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a986faea56 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'fix/fix_creation_time' into Develop  
						
						 
						
						
						
					 
					
						2020-01-26 16:50:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ad71d0a03f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kobo_/develop/fix-new-user' into Develop  
						
						 
						
						
						
					 
					
						2020-01-26 14:43:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0955c6d6fb 
							
						 
					 
					
						
						
							
							Update Kobo  
						
						 
						
						
						
					 
					
						2020-01-26 14:42:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							d30b44ee0f 
							
						 
					 
					
						
						
							
							Minor formatting changes per codacy review.  
						
						 
						
						
						
					 
					
						2020-01-26 01:12:52 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							a6f4db0f25 
							
						 
					 
					
						
						
							
							Fix bug where last_created is incorectly set in the SyncToken.  
						
						 
						
						
						
					 
					
						2020-01-26 00:32:05 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Simon Latapie 
							
						 
					 
					
						
						
						
						
							
						
						
							69fa7d0091 
							
						 
					 
					
						
						
							
							new user: disable kobo token on new user page  
						
						 
						
						... 
						
						
						
						kobo token generator function is related to a user id, which is not
present on new user page.
Disable the Kobo token part when creating a new user. 
						
					 
					
						2020-01-25 22:41:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ZIzA 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e1d6aec682 
							
						 
					 
					
						
						
							
							quick fix  
						
						 
						
						... 
						
						
						
						sorry 
						
					 
					
						2020-01-21 23:06:22 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ZIzA 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							155795a18e 
							
						 
					 
					
						
						
							
							Russian language update  
						
						 
						
						
						
					 
					
						2020-01-21 22:29:23 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3c63e2b7e4 
							
						 
					 
					
						
						
							
							Update version number  
						
						 
						
						
						
					 
					
						2020-01-21 07:04:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ElQuimm 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a17c1c063e 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						... 
						
						
						
						:-)
Thank you 
						
					 
					
						2020-01-20 22:05:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6728f5da2d 
							
						 
					 
					
						
						
							
							Update Czech translation  
						
						 
						
						
						
					 
					
						2020-01-20 20:32:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukáš Heroudek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							16adeae5c3 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						
						
					 
					
						2020-01-20 15:23:54 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukáš Heroudek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							485eba94cc 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						
						
					 
					
						2020-01-20 14:41:51 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukáš Heroudek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5a074348ac 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						
						
					 
					
						2020-01-20 14:02:23 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cd9bb56db5 
							
						 
					 
					
						
						
							
							Cleanup Kobo integration  
						
						 
						
						
						
					 
					
						2020-01-20 06:14:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Сергей 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4c8f3f7bae 
							
						 
					 
					
						
						
							
							Add files via upload  
						
						 
						
						
						
					 
					
						2020-01-20 01:46:41 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							165cbad67b 
							
						 
					 
					
						
						
							
							Delete tess.py  
						
						 
						
						
						
					 
					
						2020-01-19 15:04:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b30da58eb9 
							
						 
					 
					
						
						
							
							Update german translation  
						
						 
						
						
						
					 
					
						2020-01-18 12:55:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b0fb6b858d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'swedish/patch-4'  
						
						 
						
						
						
					 
					
						2020-01-18 12:29:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jony 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							53ce22ef5e 
							
						 
					 
					
						
						
							
							Update Swedish translation  
						
						 
						
						... 
						
						
						
						I translated the new strings. 
						
					 
					
						2020-01-18 12:18:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8e7a52f44e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'swedish/master'  
						
						 
						
						
						
					 
					
						2020-01-18 12:04:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jony 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4406220f70 
							
						 
					 
					
						
						
							
							Update Swedish translation  
						
						 
						
						... 
						
						
						
						Update file 
						
					 
					
						2020-01-18 11:25:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8f4253adbd 
							
						 
					 
					
						
						
							
							Fix for limiting domains (now no restriction to domain only)  
						
						 
						
						
						
					 
					
						2020-01-18 10:32:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							65105d9dbe 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cc/develop/custom_float' into Develop  
						
						 
						
						
						
					 
					
						2020-01-15 17:58:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3a4d351a57 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop  
						
						 
						
						
						
					 
					
						2020-01-15 17:57:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ce66c752c4 
							
						 
					 
					
						
						
							
							Updated czech translation  
						
						 
						
						... 
						
						
						
						removed language selection for guest user 
						
					 
					
						2020-01-14 18:21:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukáš Heroudek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4e42a179fa 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						
						
					 
					
						2020-01-14 16:45:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							973f555544 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						(updated tinymce and bootstrap datepicker) 
						
					 
					
						2020-01-13 18:39:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1d7e52c198 
							
						 
					 
					
						
						
							
							Merge with develop:  
						
						 
						
						... 
						
						
						
						- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup 
						
					 
					
						2020-01-13 18:37:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1b42dd1043 
							
						 
					 
					
						
						
							
							Update czech and german translation  
						
						 
						
						
						
					 
					
						2020-01-13 18:24:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukáš Heroudek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							77e0022252 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						... 
						
						
						
						Added missing and clenup 
						
					 
					
						2020-01-13 10:29:14 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Simon Latapie 
							
						 
					 
					
						
						
						
						
							
						
						
							56964a890b 
							
						 
					 
					
						
						
							
							caliBlur theme: fix custom column display that contain colons  
						
						 
						
						
						
					 
					
						2020-01-12 14:26:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							68ca0b86da 
							
						 
					 
					
						
						
							
							Updated tiniymce + locale  
						
						 
						
						... 
						
						
						
						updated datepicker + locale
Included cs, fi language, updated ru language 
						
					 
					
						2020-01-12 14:11:53 +01:00