blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							6a8ae9c0c4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into tasks  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/helper.py 
						
					 
					
						2020-08-23 21:38:56 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							ac22483f98 
							
						 
					 
					
						
						
							
							Add error handling to the email task within the convert task  
						
						 
						
						
						
					 
					
						2020-08-23 21:35:05 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							59d56d5c83 
							
						 
					 
					
						
						
							
							py27 support (I think) and some clean up  
						
						 
						
						
						
					 
					
						2020-08-23 21:21:55 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							843279bacb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'jef/jef/download-kobo' into master  
						
						 
						
						
						
					 
					
						2020-08-23 21:22:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							a000de0270 
							
						 
					 
					
						
						
							
							Some clean up  
						
						 
						
						
						
					 
					
						2020-08-23 13:33:57 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							bf41b04cfa 
							
						 
					 
					
						
						
							
							Remove convert task from db.py - with the fixed from  #1565 , this no longer seems to be needed  
						
						 
						
						
						
					 
					
						2020-08-23 13:07:24 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							9ce2e8ea53 
							
						 
					 
					
						
						
							
							Fix progress indication for emails that have been completed.  
						
						 
						
						
						
					 
					
						2020-08-23 12:58:24 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cf35c9dcef 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'name/patch-2' into master  
						
						 
						
						
						
					 
					
						2020-08-23 10:53:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							45ff9394f2 
							
						 
					 
					
						
						
							
							Fix comma separated author names during for upload  
						
						 
						
						
						
					 
					
						2020-08-23 09:44:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							414043ded1 
							
						 
					 
					
						
						
							
							Remove references to old worker, turn off calibre_db task queue (for now until I can determine if it's needed still), and attempt to re-implement email progress tracking (not working at the moment)  
						
						 
						
						
						
					 
					
						2020-08-22 23:35:48 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							2533c9c14e 
							
						 
					 
					
						
						
							
							Continue converting tasks - email and upload tasks  
						
						 
						
						
						
					 
					
						2020-08-22 22:44:28 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							f10f0dada6 
							
						 
					 
					
						
						
							
							First working PoC with a new task structure  
						
						 
						
						
						
					 
					
						2020-08-22 16:31:00 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							282859bc1b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'github/master' into master  
						
						 
						
						
						
					 
					
						2020-08-22 15:38:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a3ae97a5a3 
							
						 
					 
					
						
						
							
							Fix   #1574  (author name not shown in change book order in shelfs)  
						
						 
						
						
						
					 
					
						2020-08-22 15:37:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b9c0f2a3d3 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into master  
						
						 
						
						
						
					 
					
						2020-08-21 19:27:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0cc07362b8 
							
						 
					 
					
						
						
							
							Fix for  #1573  
						
						 
						
						
						
					 
					
						2020-08-21 19:26:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Ingli 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4ee5dcaff3 
							
						 
					 
					
						
						
							
							Elevate Log Messages in web.py  
						
						 
						
						... 
						
						
						
						Elevates login failure log messages and register failure log messages from INFO to WARNING, "Unknown Error" to ERROR, and fixes misspelling of "address" in web.py log messages. Misspelling remains in variable names to avoid breaking changes. 
						
					 
					
						2020-08-17 11:29:10 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4d44746a88 
							
						 
					 
					
						
						
							
							Change settings database gdrive watch to JSON  
						
						 
						
						
						
					 
					
						2020-08-15 15:07:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1535bdbcd8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'memorydatabase/issue/1564'  
						
						 
						
						
						
					 
					
						2020-08-15 12:08:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f9c6fb30bf 
							
						 
					 
					
						
						
							
							Excluded series type again, as it causes problems upon reconnect  
						
						 
						
						
						
					 
					
						2020-08-14 19:43:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							94ad93ebd7 
							
						 
					 
					
						
						
							
							Added series like custom columns  #1501  
						
						 
						
						
						
					 
					
						2020-08-11 18:56:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							0e1ec5034e 
							
						 
					 
					
						
						
							
							Fix for  #1564  - using memory database in multiple threads.  
						
						 
						
						... 
						
						
						
						See also: https://docs.sqlalchemy.org/en/13/dialects/sqlite.html#using-a-memory-database-in-multiple-threads  
						
					 
					
						2020-08-11 12:44:55 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b309c1fc91 
							
						 
					 
					
						
						
							
							Fix filenames (Escape "\") for searching calibre excecutable on windows  
						
						 
						
						
						
					 
					
						2020-08-09 15:11:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Holmes 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							969105b205 
							
						 
					 
					
						
						
							
							Trim whitespace from filename  
						
						 
						
						... 
						
						
						
						This avoids an OSError when the book's metadata has whitespace at the end of it. 
						
					 
					
						2020-08-09 01:08:00 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Holmes 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							28bfb06c67 
							
						 
					 
					
						
						
							
							Revert the deletion of another line  
						
						 
						
						... 
						
						
						
						This was done by mistake, whoops! 
						
					 
					
						2020-08-09 00:57:30 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Holmes 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							704dcb3e58 
							
						 
					 
					
						
						
							
							Move assignment of new_coverpath  
						
						 
						
						... 
						
						
						
						With the assignment originally being within the try, if the try failed, the exception wouldn't have access to the value 
						
					 
					
						2020-08-09 00:55:56 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1a1d105fae 
							
						 
					 
					
						
						
							
							Fix   #1538  (Floating point numbers showing 2 decimals on details page  
						
						 
						
						
						
					 
					
						2020-07-23 19:31:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							42a0639bb5 
							
						 
					 
					
						
						
							
							Fix   #1533  (Invalid LDAP Cert Path no longer crashes app)  
						
						 
						
						
						
					 
					
						2020-07-23 19:23:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e27b08203d 
							
						 
					 
					
						
						
							
							Fix   #1531  (white background on transparent cover instead of black one)  
						
						 
						
						
						
					 
					
						2020-07-23 18:41:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							25fc6f1937 
							
						 
					 
					
						
						
							
							Further fixes for  #1530  (Handle improper migrated database with config_mature_content_tags, allowed_tags, denied_tags, denied_column_value, allowed_column_value NULL instead of "")  
						
						 
						
						
						
					 
					
						2020-07-22 18:44:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0ccc3f7252 
							
						 
					 
					
						
						
							
							Fixes for windows (moving files not allowed -> Close pdf after metadata extracting, add os.path.normcase to path while renaming folders, as thi caused also trouble  
						
						 
						
						... 
						
						
						
						Added hint for missing ghostcript on cover extraction 
						
					 
					
						2020-07-21 20:14:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							66acd1821d 
							
						 
					 
					
						
						
							
							Update Gdrive integration (Error Handling on Callback and wording)  
						
						 
						
						
						
					 
					
						2020-07-21 18:01:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							93a0217d5f 
							
						 
					 
					
						
						
							
							Fix for  #1530  (Handle improper migrated database with config_mature_content_tags NULL instead of "")  
						
						 
						
						
						
					 
					
						2020-07-20 20:28:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jef LeCompte 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							711a697570 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into jef/download-kobo  
						
						 
						
						
						
					 
					
						2020-07-13 01:50:38 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							450411a732 
							
						 
					 
					
						
						
							
							#1344  (Support Multiple authors, but not showing up on Kobo reader)  
						
						 
						
						... 
						
						
						
						Fix for #1439  (reading progress was not stored, as user login was wrong) 
						
					 
					
						2020-07-05 20:54:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f80c67828b 
							
						 
					 
					
						
						
							
							Fix   #1500  (Custom ratings of increment 0.5 are allowed)  
						
						 
						
						
						
					 
					
						2020-07-05 14:35:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d1889a5e06 
							
						 
					 
					
						
						
							
							Fix   #1502  (program info only visible in about section if user is admin)  
						
						 
						
						
						
					 
					
						2020-07-05 14:00:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							12263ff02f 
							
						 
					 
					
						
						
							
							Fix   #1423  (OverflowError thrown during sync on some Linux Systems if one of the timestamps is outside range 1970 to 2038)  
						
						 
						
						
						
					 
					
						2020-07-05 13:55:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							76f914cbc2 
							
						 
					 
					
						
						
							
							Fixed logging in SyncToken  
						
						 
						
						
						
					 
					
						2020-07-05 13:52:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c1f5252b3f 
							
						 
					 
					
						
						
							
							Fix   #1509  (OSError thrown during sync on Windows if one of the timestamps is outside range 1970 to 2038)  
						
						 
						
						
						
					 
					
						2020-07-05 13:40:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							20c6f79a44 
							
						 
					 
					
						
						
							
							Changed behavior delete books with subfolders (additional warning message, but book is deleted)  
						
						 
						
						
						
					 
					
						2020-07-05 10:44:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ee6f1405d4 
							
						 
					 
					
						
						
							
							Fix   #1456  (Added route to robots.txt)  
						
						 
						
						
						
					 
					
						2020-07-04 21:22:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ee3541d74e 
							
						 
					 
					
						
						
							
							Fix kobo links for reverse proxies with subdomains (and docker?)  #1470  
						
						 
						
						
						
					 
					
						2020-07-04 13:35:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jef LeCompte 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e048388213 
							
						 
					 
					
						
						
							
							feat(api): include external port option  
						
						 
						
						... 
						
						
						
						Signed-off-by: Jef LeCompte <jeffreylec@gmail.com> 
						
					 
					
						2020-07-03 12:58:58 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8608ff11f7 
							
						 
					 
					
						
						
							
							Fix   #1507  (Password generation on python2 working again)  
						
						 
						
						
						
					 
					
						2020-06-30 19:58:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							601464083b 
							
						 
					 
					
						
						
							
							Fix for task wrap around  
						
						 
						
						
						
					 
					
						2020-06-28 13:44:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ba10657829 
							
						 
					 
					
						
						
							
							Add fix for read only gdrive file  
						
						 
						
						
						
					 
					
						2020-06-28 12:06:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6315655f93 
							
						 
					 
					
						
						
							
							Re-add missing po files  
						
						 
						
						
						
					 
					
						2020-06-28 12:05:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							533cb23b73 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'next/bug/login-next-get-param'  
						
						 
						
						
						
					 
					
						2020-06-28 10:01:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							852f252d13 
							
						 
					 
					
						
						
							
							Prevent invalid variable  
						
						 
						
						... 
						
						
						
						Make text in kobo_auth_screen consistent 
						
					 
					
						2020-06-28 09:48:05 +02:00