Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							302679719d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/converter.py
#	cps/subproc_wrapper.py
#	test/Calibre-Web TestSummary_Linux.html 
						
					 
					
						2021-07-30 16:33:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							616cc2018a 
							
						 
					 
					
						
						
							
							Fix show cover  
						
						 
						
						... 
						
						
						
						Update more debug output for kobo sync 
						
					 
					
						2021-07-12 14:58:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0d247fef6a 
							
						 
					 
					
						
						
							
							Fixes for grab metadata in python  
						
						 
						
						
						
					 
					
						2021-07-06 20:24:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							94da61c57e 
							
						 
					 
					
						
						
							
							Basic Metadata mechanism in python  
						
						 
						
						
						
					 
					
						2021-07-05 18:55:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							97e4707f72 
							
						 
					 
					
						
						
							
							user list column value and tags editor ( #1938 )  
						
						 
						
						... 
						
						
						
						Bugfixes for massedit in user list (#1938 )
Changed no. of debug messages 
						
					 
					
						2021-04-25 10:43:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							450ee43677 
							
						 
					 
					
						
						
							
							Additional logging for emails  
						
						 
						
						
						
					 
					
						2021-04-22 19:14:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9cc14ac5c7 
							
						 
					 
					
						
						
							
							Fix for  #1905   prevent invalid json data in gmail_token  
						
						 
						
						
						
					 
					
						2021-04-18 11:33:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							39bbee0eeb 
							
						 
					 
					
						
						
							
							Books sort with non Books table column working  #1938  
						
						 
						
						
						
					 
					
						2021-04-17 10:27:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8acd1f1fe4 
							
						 
					 
					
						
						
							
							Code refactoring and improved error handling for edit user list  
						
						 
						
						... 
						
						
						
						Update teststatus 
						
					 
					
						2021-04-06 17:29:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							99520d54a5 
							
						 
					 
					
						
						
							
							Added ability to send emails via gmail ( #1905 )  
						
						 
						
						... 
						
						
						
						Gmail email sending 
						
					 
					
						2021-03-28 14:51:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b75247ea3a 
							
						 
					 
					
						
						
							
							Suppress some errors  
						
						 
						
						
						
					 
					
						2021-03-15 13:48:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							725fc658f8 
							
						 
					 
					
						
						
							
							Some code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 13:28:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							bde7921016 
							
						 
					 
					
						
						
							
							Fix modal path id for calibre db filepicker  
						
						 
						
						... 
						
						
						
						Fix SyncToken last-Book-id missing 
						
					 
					
						2020-12-30 10:05:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b637a63e71 
							
						 
					 
					
						
						
							
							Refactored exception logging  
						
						 
						
						
						
					 
					
						2020-12-12 08:11:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							76c3ade394 
							
						 
					 
					
						
						
							
							Changed logging in worker thread  
						
						 
						
						
						
					 
					
						2020-12-11 17:03:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d9b22fd513 
							
						 
					 
					
						
						
							
							log exceptions only in debug mode  
						
						 
						
						
						
					 
					
						2020-12-11 16:46:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d39b28b011 
							
						 
					 
					
						
						
							
							Fix for existing book format with gdrive  
						
						 
						
						
						
					 
					
						2020-12-08 13:34:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c25afdc203 
							
						 
					 
					
						
						
							
							Chunked sync  
						
						 
						
						
						
					 
					
						2020-12-06 13:21:25 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							5930c6d5fb 
							
						 
					 
					
						
						
							
							remove parenthesis in LDAP Message  
						
						 
						
						
						
					 
					
						2020-12-03 14:22:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f620d4a9ca 
							
						 
					 
					
						
						
							
							Fix LDAP errors  
						
						 
						
						
						
					 
					
						2020-11-22 11:19:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e2be655d74 
							
						 
					 
					
						
						
							
							Update LDAP, fix Windows AD login ( #1697 )  
						
						 
						
						
						
					 
					
						2020-11-22 08:17:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9bd51c650b 
							
						 
					 
					
						
						
							
							Add config options for client certificate authentication  
						
						 
						
						
						
					 
					
						2020-11-20 19:47:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e8620a0986 
							
						 
					 
					
						
						
							
							Fix logging error on windows with invalid goodreads key/secret  
						
						 
						
						
						
					 
					
						2020-10-14 20:48:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e3f4f24c3e 
							
						 
					 
					
						
						
							
							Fixes for failed email and conversions with gdrive  
						
						 
						
						
						
					 
					
						2020-10-04 13:59:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							884270093b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'worker/tasks' into Develop  
						
						 
						
						
						
					 
					
						2020-08-31 13:00:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							ef49e2b5b3 
							
						 
					 
					
						
						
							
							Revert daemon in favor of timeout  
						
						 
						
						
						
					 
					
						2020-08-30 13:49:45 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							9b9e29a3b6 
							
						 
					 
					
						
						
							
							Implement worker thread as a daemon  
						
						 
						
						
						
					 
					
						2020-08-30 13:29:42 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1a9a436cbe 
							
						 
					 
					
						
						
							
							Fixed wrong translation string  
						
						 
						
						... 
						
						
						
						Removed unused variables from callback in server.py
Update Testresults 
						
					 
					
						2020-08-30 17:11:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							62dd29d2f3 
							
						 
					 
					
						
						
							
							Renamed email to mail due to naming conflict in python2  
						
						 
						
						
						
					 
					
						2020-08-30 08:49:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							e7eb5b6ea6 
							
						 
					 
					
						
						
							
							Improvements to task processing  
						
						 
						
						... 
						
						
						
						* Moves clean up to separate function for organization
* moves the `self.dequeued.append(item)` immediately after `self.queue.get()` so that we don't wait for it to show up
(cherry picked from commit bc9372e88f0c8855694431f811702d7fb899a97e) 
						
					 
					
						2020-08-29 12:25:33 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							4cb82ea9bd 
							
						 
					 
					
						
						
							
							Revert testing condition that decreased number of tasks kept  
						
						 
						
						
						
					 
					
						2020-08-27 21:49:55 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							572ac4a17b 
							
						 
					 
					
						
						
							
							Fix for deleting old, completed tasks  
						
						 
						
						... 
						
						
						
						(cherry picked from commit e066d7a4b0f47d3327696a11795cdc923ff0f6f3) 
						
					 
					
						2020-08-27 21:46:20 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							508f49df18 
							
						 
					 
					
						
						
							
							Remove completed tasks and sort the tasks by date added when calling .tasks  
						
						 
						
						
						
					 
					
						2020-08-23 23:00:23 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							bec280c6b1 
							
						 
					 
					
						
						
							
							Add some error handling  
						
						 
						
						
						
					 
					
						2020-08-23 21:51:44 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							59d56d5c83 
							
						 
					 
					
						
						
							
							py27 support (I think) and some clean up  
						
						 
						
						
						
					 
					
						2020-08-23 21:21:55 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							42a0639bb5 
							
						 
					 
					
						
						
							
							Fix   #1533  (Invalid LDAP Cert Path no longer crashes app)  
						
						 
						
						
						
					 
					
						2020-07-23 19:23:57 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							88d2c60ee8 
							
						 
					 
					
						
						
							
							Catch some errors related to non writable settings db  
						
						 
						
						
						
					 
					
						2020-06-27 13:22:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b852fb0e26 
							
						 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						 
						
						
						
					 
					
						2020-05-25 21:30:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4368c182a0 
							
						 
					 
					
						
						
							
							Make goodreads compatible for betterreads dependency  
						
						 
						
						
						
					 
					
						2020-05-06 20:57:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b4d7733e0a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/list.html
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot 
						
					 
					
						2020-04-25 20:06:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							24c743d23d 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2020-04-19 19:08:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7bb5afa585 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kobo/shelves' into Develop  
						
						 
						
						
						
					 
					
						2020-04-18 21:12:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							06fde4fcd0 
							
						 
					 
					
						
						
							
							Fix   #1311  (Enable LDAP Anonymous Login)  
						
						 
						
						
						
					 
					
						2020-04-18 11:48:34 +02:00