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
							
						 
					 | 
					
						
						
						
						
							
						
						
							8acd1f1fe4
							
						
					 | 
					
						
						
							
							Code refactoring and improved error handling for edit user list
						
						
						
						
						
						
						
						Update teststatus 
						
					 | 
					
						2021-04-06 17:29:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b17d71e4c3
							
						
					 | 
					
						
						
							
							Update optional-requirements.txt
						
						
						
						
						
						
						
						Bugfix Mail task after convert task 
						
					 | 
					
						2021-03-28 20:36:08 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							130a4ed2d3
							
						
					 | 
					
						
						
							
							Fix opds and error logging in mail
						
						
						
						
						
					 | 
					
						2021-03-21 11:54:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							59ebc1af8a
							
						
					 | 
					
						
						
							
							Code refactoring
						
						
						
						
						
					 | 
					
						2021-03-21 08:20:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							dd30ac4fbd
							
						
					 | 
					
						
						
							
							Added thumbnails
						
						
						
						
						
						
						
						Merge remote-tracking branch 'cover/thumbnails' into development
# Conflicts:
#	cps/admin.py
#	cps/templates/layout.html
#	cps/ub.py
#	cps/web.py
Update join for sqlalchemy 1.4 
						
					 | 
					
						2021-03-20 11:32:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							725fc658f8
							
						
					 | 
					
						
						
							
							Some code cosmetics
						
						
						
						
						
					 | 
					
						2021-03-14 13:28:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5f754ed0e
							
						
					 | 
					
						
						
							
							improved session handling
						
						
						
						
						
					 | 
					
						2021-01-11 14:18:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f9e52792a
							
						
					 | 
					
						
						
							
							No autoflush on metadata.db change
						
						
						
						
						
					 | 
					
						2021-01-10 11:01:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							a659f2e49d
							
						
					 | 
					
						
						
							
							Improved logging for emails
						
						
						
						
						
						
						
						Removed private data from debug export 
						
					 | 
					
						2021-01-03 19:27:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b637a63e71
							
						
					 | 
					
						
						
							
							Refactored exception logging
						
						
						
						
						
					 | 
					
						2020-12-12 08:11:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							a80a8aab1c
							
						
					 | 
					
						
						
							
							Fix LDAP import user
						
						
						
						
						
					 | 
					
						2020-12-08 20:13:36 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jvoisin
							
						 
					 | 
					
						
						
						
						
							
						
						
							19b2a334e4
							
						
					 | 
					
						
						
							
							Remove unused imports
						
						
						
						
						
					 | 
					
						2020-10-27 11:06:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb03026589
							
						
					 | 
					
						
						
							
							Fixes from merge problems
						
						
						
						
						
					 | 
					
						2020-10-10 07:30:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3b8e5ddfb3
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'worker/db' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/tasks/convert.py 
						
					 | 
					
						2020-10-06 21:40:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3f4f24c3e
							
						
					 | 
					
						
						
							
							Fixes for failed email and conversions with gdrive
						
						
						
						
						
					 | 
					
						2020-10-04 13:59:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb37e3a52b
							
						
					 | 
					
						
						
							
							Fix UI Deelete Buttons in Edit Books page
						
						
						
						
						
						
						
						Fix Conversion of multiple formats of one book in the queue with gdrive 
						
					 | 
					
						2020-10-04 12:09:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							23d66a0d68
							
						
					 | 
					
						
						
							
							Fix
						
						
						
						
						
					 | 
					
						2020-10-03 21:43:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d64692c84
							
						
					 | 
					
						
						
							
							Fix for convert + email task with gdrive
						
						
						
						
						
					 | 
					
						2020-09-30 19:29:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								blitzmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							76c724c783
							
						
					 | 
					
						
						
							
							Remove global session object, this is now wrapped in the CalibreDB class
						
						
						
						
						
					 | 
					
						2020-09-13 21:37:47 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e32b017431
							
						
					 | 
					
						
						
							
							Revert "Test revert global Session"
						
						
						
						
						
						
						
						This reverts commit 393869e538. 
						
					 | 
					
						2020-09-06 10:59:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							393869e538
							
						
					 | 
					
						
						
							
							Test revert global Session
						
						
						
						
						
					 | 
					
						2020-09-06 10:27:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							feacbe8ebd
							
						
					 | 
					
						
						
							
							Possible Fix for database crash after adding new format and accessing calibre database afterwards
						
						
						
						
						
					 | 
					
						2020-09-05 10:24:32 +02: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e5cad0dc8
							
						
					 | 
					
						
						
							
							Merge new worker thread
						
						
						
						
						
					 | 
					
						2020-08-29 11:14:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								blitzmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							f3a3797850
							
						
					 | 
					
						
						
							
							Fail the convert task if the email subtask fails
						
						
						
						
						
					 | 
					
						2020-08-24 21:28:55 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								blitzmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							8634b0c6f0
							
						
					 | 
					
						
						
							
							Remove left over placeholder code
						
						
						
						
						
					 | 
					
						2020-08-24 21:00:15 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 |