Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0d0660986
							
						
					 | 
					
						
						
							
							Added names for jobs to make log more readable
						
						
						
						
						
						
						
						Bugfix logging delete thumbnail 
						
					 | 
					
						2022-03-20 19:55:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9a83e0638
							
						
					 | 
					
						
						
							
							Merge branch 'master' into cover_thumbnail
						
						
						
						
						
						
						
						# Conflicts:
#	cps/editbooks.py
#	cps/helper.py
#	cps/web.py
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2022-03-14 19:41:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4379669cf8
							
						
					 | 
					
						
						
							
							Database error is more detailed
						
						
						
						
						
						
						
						renamed debug_or_exception to error_or_exception 
						
					 | 
					
						2022-03-12 17:14:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a0dde0371
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'cover_images/thumbnails' into cover_thumbnail
						
						
						
						
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/helper.py
#	cps/tasks/upload.py
#	cps/updater.py
#	cps/web.py 
						
					 | 
					
						2022-02-08 19:55:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3123a914a4
							
						
					 | 
					
						
						
							
							Updated test results
						
						
						
						
						
						
						
						Fix updater
Added comment regarding code taken from calibre source 
						
					 | 
					
						2022-01-30 11:15:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f3c396450
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'lubimyczytac/add_lubimyczytac.pl_meta_provider' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	optional-requirements.txt 
						
					 | 
					
						2022-01-27 18:37:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							50bb74d748
							
						
					 | 
					
						
						
							
							Add CSRF support for schedule task settings, fixed details page not loading
						
						
						
						
						
					 | 
					
						2022-01-27 00:35:45 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							18ce310b30
							
						
					 | 
					
						
						
							
							Merge branch Develop into thumbnails
						
						
						
						
						
					 | 
					
						2022-01-26 23:51:50 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							127bf98aac
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/templates/detail.html
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2022-01-23 17:51:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								collerek
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							20b5a9a2c0
							
						
					 | 
					
						
						
							
							Merge branch 'master' into add_lubimyczytac.pl_meta_provider
						
						
						
						
						
					 | 
					
						2022-01-13 10:49:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							47f5e2ffb4
							
						
					 | 
					
						
						
							
							Remove python2 urllib imports
						
						
						
						
						
						
						
						Fix for "javascript:" script links in identifier 
						
					 | 
					
						2021-12-30 14:45:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e815147fb
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/kobo_sync_status.py
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2021-12-19 10:29:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								collerek
							
						 
					 | 
					
						
						
						
						
							
						
						
							51bf35c2e4
							
						
					 | 
					
						
						
							
							unify scholar
						
						
						
						
						
					 | 
					
						2021-12-13 17:21:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								collerek
							
						 
					 | 
					
						
						
						
						
							
						
						
							d64589914f
							
						
					 | 
					
						
						
							
							add series, languages and isbn to google provider
						
						
						
						
						
					 | 
					
						2021-12-13 15:14:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								collerek
							
						 
					 | 
					
						
						
						
						
							
						
						
							362fdc5716
							
						
					 | 
					
						
						
							
							run lubimyczytac detail pages in threadpool
						
						
						
						
						
					 | 
					
						2021-12-13 02:14:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								collerek
							
						 
					 | 
					
						
						
						
						
							
						
						
							d55626d445
							
						
					 | 
					
						
						
							
							refactor and cleaning
						
						
						
						
						
					 | 
					
						2021-12-13 01:23:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							42bf40d7bb
							
						
					 | 
					
						
						
							
							Change 2 timestamps to utctime
						
						
						
						
						
					 | 
					
						2021-12-12 19:54:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d67168a4a
							
						
					 | 
					
						
						
							
							Update test result
						
						
						
						
						
					 | 
					
						2021-12-06 20:27:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							91a21ababe
							
						
					 | 
					
						
						
							
							Allow download of archived books
						
						
						
						
						
					 | 
					
						2021-12-04 11:16:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed26d34961
							
						
					 | 
					
						
						
							
							Code cleaning (remove python2)
						
						
						
						
						
					 | 
					
						2021-10-04 19:23:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							5edde53fed
							
						
					 | 
					
						
						
							
							Improved sync for kobo with additional table
						
						
						
						
						
					 | 
					
						2021-10-03 09:58:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							46205a1f83
							
						
					 | 
					
						
						
							
							Made long running tasks cancellable. Added cancel button to cancellable tasks in the task list. Added APP_MODE env variable for determining if the app is running in development, test, or production.
						
						
						
						
						
					 | 
					
						2021-09-29 02:40:12 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							26071d4e7a
							
						
					 | 
					
						
						
							
							Added Scheduled Tasks Settings
						
						
						
						
						
					 | 
					
						2021-09-26 02:02:48 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							524ed07a6c
							
						
					 | 
					
						
						
							
							Handle read only access to cache dir gracefully. minor cleanup
						
						
						
						
						
					 | 
					
						2021-09-21 23:39:00 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							8bee2b9552
							
						
					 | 
					
						
						
							
							Added CACHE_DIR env variable, graceful handling when APScheduler is not installed
						
						
						
						
						
					 | 
					
						2021-09-19 22:45:19 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							d648785471
							
						
					 | 
					
						
						
							
							Review feedback fixes
						
						
						
						
						
					 | 
					
						2021-09-17 01:42:56 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							04a5db5c1d
							
						
					 | 
					
						
						
							
							Resolve merge conflicts
						
						
						
						
						
					 | 
					
						2021-09-16 22:58:54 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							10e212fcde
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
					 | 
					
						2021-08-29 10:44:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4cfad6363
							
						
					 | 
					
						
						
							
							Fixed several text problems from tasks
						
						
						
						
						
						
						
						Fixed task update 
						
					 | 
					
						2021-08-28 11:32:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |