Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							dcab8af8ab 
							
						 
					 
					
						
						
							
							Fixes for kobo sync  
						
						 
						
						
						
					 
					
						2020-12-09 09:41:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e1987c34d9 
							
						 
					 
					
						
						
							
							Revert expire on commit  
						
						 
						
						
						
					 
					
						2020-12-09 08:49:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a80a8aab1c 
							
						 
					 
					
						
						
							
							Fix LDAP import user  
						
						 
						
						
						
					 
					
						2020-12-08 20:13:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d6fbcdb09d 
							
						 
					 
					
						
						
							
							Fix merge problem (ub prefix in ub.py)  
						
						 
						
						
						
					 
					
						2020-12-08 13:56:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d39b28b011 
							
						 
					 
					
						
						
							
							Fix for existing book format with gdrive  
						
						 
						
						
						
					 
					
						2020-12-08 13:34:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8f36128fe3 
							
						 
					 
					
						
						
							
							Merge branch 'session' into Develop  
						
						 
						
						
						
					 
					
						2020-12-08 11:49:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							986d4c99bd 
							
						 
					 
					
						
						
							
							Fix oauth ub session  
						
						 
						
						
						
					 
					
						2020-12-08 11:24:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f677dcb1f4 
							
						 
					 
					
						
						
							
							Fix missing optional parameter initSession  
						
						 
						
						
						
					 
					
						2020-12-08 08:19:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1a9b220ec2 
							
						 
					 
					
						
						
							
							Session no longer expires on commit (only in worker thread)  
						
						 
						
						
						
					 
					
						2020-12-08 08:04:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d15d252af7 
							
						 
					 
					
						
						
							
							Session no longer expires on commit  
						
						 
						
						
						
					 
					
						2020-12-08 08:01:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							5e3618716d 
							
						 
					 
					
						
						
							
							Fix missing session rollback on commit error  
						
						 
						
						
						
					 
					
						2020-12-07 19:53:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f13522559d 
							
						 
					 
					
						
						
							
							Fixed problems on startup with config session  
						
						 
						
						
						
					 
					
						2020-12-07 13:51:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							777c2726d3 
							
						 
					 
					
						
						
							
							Changed session_handing  
						
						 
						
						
						
					 
					
						2020-12-07 08:52:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c25afdc203 
							
						 
					 
					
						
						
							
							Chunked sync  
						
						 
						
						
						
					 
					
						2020-12-06 13:21:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c25f6d7c38 
							
						 
					 
					
						
						
							
							Prefer kepub in kobo sync  
						
						 
						
						
						
					 
					
						2020-12-06 06:01:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							242866948f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-12-05 08:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							15bb0ce990 
							
						 
					 
					
						
						
							
							Fix for  #1439  (send kepub file instead of epub for kobo epub3 request)  
						
						 
						
						... 
						
						
						
						Fix archived books are editable 
						
					 
					
						2020-12-04 19:23:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a82911ea5d 
							
						 
					 
					
						
						
							
							Fixed missing variable exception  
						
						 
						
						
						
					 
					
						2020-12-04 14:50:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9a8f20317b 
							
						 
					 
					
						
						
							
							Update ldap import user -> improve error messages  
						
						 
						
						
						
					 
					
						2020-12-04 11:13:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b605a0f622 
							
						 
					 
					
						
						
							
							Update error message LDAP import user  
						
						 
						
						
						
					 
					
						2020-12-03 21:25:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							046a074c3a 
							
						 
					 
					
						
						
							
							Catch attribute error on ldap import user  
						
						 
						
						... 
						
						
						
						Fixes for Login with Windows AD 
						
					 
					
						2020-12-03 20:15:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7c96fac95c 
							
						 
					 
					
						
						
							
							Removed unnecessary parameters  
						
						 
						
						
						
					 
					
						2020-12-03 17:33:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a3ef53102d 
							
						 
					 
					
						
						
							
							Fix warning message on ldap import  
						
						 
						
						
						
					 
					
						2020-12-03 17:08:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							68513b775b 
							
						 
					 
					
						
						
							
							Wording  
						
						 
						
						
						
					 
					
						2020-12-03 16:20:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a79dcc93f6 
							
						 
					 
					
						
						
							
							Fixed description for LDAP filter  
						
						 
						
						
						
					 
					
						2020-12-03 16:19:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7aabfc573b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/templates/config_edit.html
#	cps/web.py 
						
					 
					
						2020-12-03 16:03:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							56505457eb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'ldap_import/feat/ldap-import-user-identifier' into master  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py 
						
					 
					
						2020-12-03 16:01:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							5930c6d5fb 
							
						 
					 
					
						
						
							
							remove parenthesis in LDAP Message  
						
						 
						
						
						
					 
					
						2020-12-03 14:22:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c3b9888b31 
							
						 
					 
					
						
						
							
							Fix   #1739  (opds download with anonymous browsing enabled) -> download rights of guest user are now respected again  
						
						 
						
						
						
					 
					
						2020-12-03 09:42:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cb8dfdde4c 
							
						 
					 
					
						
						
							
							Fix   #1739  (opds download with anonymous browsing enabled)  
						
						 
						
						
						
					 
					
						2020-12-03 08:25:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8eb4b6288a 
							
						 
					 
					
						
						
							
							Added id's for testablility  
						
						 
						
						
						
					 
					
						2020-12-02 18:19:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f18836be90 
							
						 
					 
					
						
						
							
							Fix for  #1435  (download not allowed with for opds links, with ldap login and a cookie in the download request)  
						
						 
						
						
						
					 
					
						2020-12-02 14:19:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3372070a58 
							
						 
					 
					
						
						
							
							Fix change title regex  
						
						 
						
						... 
						
						
						
						Merge branch 'Develop' into master 
						
					 
					
						2020-12-02 11:09:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f99e2ebd13 
							
						 
					 
					
						
						
							
							Changed wording for tooltips  
						
						 
						
						
						
					 
					
						2020-12-02 09:08:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4feb26eefb 
							
						 
					 
					
						
						
							
							Added series order option ( #1715 )  
						
						 
						
						... 
						
						
						
						Added authors order option (#1301 )
Added tooltips for ordering options
Fixed ratings, formats, languages order option 
						
					 
					
						2020-12-01 14:51:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2da7cd2064 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'it/patch-18' into master  
						
						 
						
						
						
					 
					
						2020-12-01 14:11:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9d7daf7afd 
							
						 
					 
					
						
						
							
							Kobo links to /v1/products/books/external are responded  
						
						 
						
						... 
						
						
						
						Merge remote-tracking branch 'kobo/patch-1' into master 
						
					 
					
						2020-12-01 14:03:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cb1ebc1cd0 
							
						 
					 
					
						
						
							
							Drag 'n drop for files  
						
						 
						
						
						
					 
					
						2020-12-01 13:52:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6ad56a0859 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-11-30 18:37:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8515781564 
							
						 
					 
					
						
						
							
							Fix   #1727  (import rarfile 4.0 fails on python3.5)  
						
						 
						
						
						
					 
					
						2020-11-30 18:36:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ElQuimm 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7e2bfbd255 
							
						 
					 
					
						
						
							
							update italian message.po  
						
						 
						
						... 
						
						
						
						some minors changes. 
						
					 
					
						2020-11-26 14:35:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jennifer Thakar 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e2325f7ba4 
							
						 
					 
					
						
						
							
							Forward Overdrive requests to Kobo Store  
						
						 
						
						... 
						
						
						
						When loading books from OverDrive, Kobo readers make requests to `/v1/products/books/external/<overdrive ids>`.
This adds a route to forward these requests to the Kobo Store, so that OverDrive still works when using Calibre-Web's Kobo sync server. 
						
					 
					
						2020-11-22 15:06:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9afdab8c52 
							
						 
					 
					
						
						
							
							Fix from merge convert_from _to  
						
						 
						
						
						
					 
					
						2020-11-22 11:57:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f620d4a9ca 
							
						 
					 
					
						
						
							
							Fix LDAP errors  
						
						 
						
						
						
					 
					
						2020-11-22 11:19:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fb1e763bbe 
							
						 
					 
					
						
						
							
							Fix browser caching problem on change cover  
						
						 
						
						
						
					 
					
						2020-11-22 10:07:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ecea7e7493 
							
						 
					 
					
						
						
							
							Revert "Fix browser caching problem on change cover"  
						
						 
						
						... 
						
						
						
						This reverts commit b9536812f4 . 
						
					 
					
						2020-11-22 10:06:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							560ade00b4 
							
						 
					 
					
						
						
							
							Fix browser caching problem on change cover  
						
						 
						
						
						
					 
					
						2020-11-22 10:03:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							81ea24ad54 
							
						 
					 
					
						
						
							
							Merge branch 'master' into df  
						
						 
						
						
						
					 
					
						2020-11-22 09:34:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							747b25046a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-11-22 09:16:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b9536812f4 
							
						 
					 
					
						
						
							
							Fix browser caching problem on change cover  
						
						 
						
						
						
					 
					
						2020-11-22 09:09:41 +01:00