Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							508e2b4d0a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/search.py
#	cps/templates/admin.html
#	cps/web.py
#	setup.cfg
#	test/Calibre-Web TestSummary_Linux.html 
						
					 
					
						2023-01-28 18:52:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
						
						
							
						
						
							b3335f6733 
							
						 
					 
					
						
						
							
							English Language Updates - V3  
						
						 
						
						
						
					 
					
						2023-01-04 13:30:13 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c10708ed07 
							
						 
					 
					
						
						
							
							Backup metadata 4th step  
						
						 
						
						
						
					 
					
						2022-09-19 22:39:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3bde8a5d95 
							
						 
					 
					
						
						
							
							Encrypt passwords  
						
						 
						
						
						
					 
					
						2022-07-02 17:45:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fbac3e38ac 
							
						 
					 
					
						
						
							
							Eenabled send epubs to E-Reader devices  
						
						 
						
						
						
					 
					
						2022-05-08 12:55:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9410b47144 
							
						 
					 
					
						
						
							
							Refactored startup for compatibility with pyinstaller 5.0  
						
						 
						
						
						
					 
					
						2022-04-26 11:10:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6e8445fed5 
							
						 
					 
					
						
						
							
							Changed schedule start- and end-time to schedule start and duration  
						
						 
						
						... 
						
						
						
						Localized display of schedule start-time and duration
Removed displaying scheduling settings if "APScheduler" is missing
Input check for start-time and duration 
						
					 
					
						2022-04-25 17:00:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ae9a970782 
							
						 
					 
					
						
						
							
							Add button to update cover cache (for usecase sideloaded changed cover)  
						
						 
						
						... 
						
						
						
						Bugfix logig start background schedue 
						
					 
					
						2022-04-25 08:24:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							bf049d8240 
							
						 
					 
					
						
						
							
							Make series cover cache invisible  
						
						 
						
						
						
					 
					
						2022-04-24 11:05:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							afaf496fbe 
							
						 
					 
					
						
						
							
							Merge branch 'master' into cover_thumbnail  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/db.py
#	cps/templates/author.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/web.py
#	requirements.txt
#	test/Calibre-Web TestSummary_Linux.html 
						
					 
					
						2022-04-02 11:57:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							14a6e7c42c 
							
						 
					 
					
						
						
							
							Deactivated several functions for kindle tolino and kobo. Opening books now working for ebook readers  
						
						 
						
						
						
					 
					
						2022-03-25 18:30:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mmonkey 
							
						 
					 
					
						
						
						
						
							
						
						
							18ce310b30 
							
						 
					 
					
						
						
							
							Merge branch Develop into thumbnails  
						
						 
						
						
						
					 
					
						2022-01-26 23:51:50 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0548fbb685 
							
						 
					 
					
						
						
							
							Bugfix post commands without updater  
						
						 
						
						
						
					 
					
						2021-12-30 14:45:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6aad9378b8 
							
						 
					 
					
						
						
							
							Fix visiblility upload right on enabled upload feature  
						
						 
						
						
						
					 
					
						2021-11-20 12:44:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d72210c6ae 
							
						 
					 
					
						
						
							
							Exclude upload rights visibility if upload is not activated  
						
						 
						
						
						
					 
					
						2021-11-03 19:05:24 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							aca5324914 
							
						 
					 
					
						
						
							
							Bugfix arrange shelf  
						
						 
						
						... 
						
						
						
						Bugfix remote login
Bugfix perform Update 
						
					 
					
						2021-10-06 22:06:33 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							04a5db5c1d 
							
						 
					 
					
						
						
							
							Resolve merge conflicts  
						
						 
						
						
						
					 
					
						2021-09-16 22:58:54 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a47d6cd937 
							
						 
					 
					
						
						
							
							Fix confirm dialog database change  
						
						 
						
						... 
						
						
						
						Gdrive setup basically working again
Moved basicconfig behind login
Database setup separated from other setup
Config page is using ajax (flask >2 and slow computers) 
						
					 
					
						2021-05-26 14:50:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							20b84a9459 
							
						 
					 
					
						
						
							
							Unified translations  
						
						 
						
						... 
						
						
						
						Update translations for release 
						
					 
					
						2021-05-16 09:37:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c0a4addf30 
							
						 
					 
					
						
						
							
							Cancel button in User edit now leads to the right page back  #1938  
						
						 
						
						
						
					 
					
						2021-04-17 18:30:55 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							3c63f5b204 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2021-03-27 09:46:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							970dbb0c59 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/opds.py
#	cps/templates/admin.html 
						
					 
					
						2021-03-27 09:38:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gavin Mogan 
							
						 
					 
					
						
						
						
						
							
						
						
							657cba042a 
							
						 
					 
					
						
						
							
							Use btn classes on anchors not div so the entire button is clickable  
						
						 
						
						
						
					 
					
						2021-03-22 17:25:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9864d932e0 
							
						 
					 
					
						
						
							
							Changed user.nickname to user.name  
						
						 
						
						... 
						
						
						
						Added function to view downloads of all users for admins 
						
					 
					
						2021-03-21 18:55:02 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							251a77c8b4 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Development  
						
						 
						
						... 
						
						
						
						Improved packaging support 
						
					 
					
						2021-02-07 08:54:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e6fb460071 
							
						 
					 
					
						
						
							
							New restart routine for executable files  
						
						 
						
						... 
						
						
						
						Fix log in updater
New source option updater available 
						
					 
					
						2021-02-06 09:42:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							33a0a4c173 
							
						 
					 
					
						
						
							
							Changed function for getting path in js file  
						
						 
						
						
						
					 
					
						2021-01-31 18:55:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							62447d6b89 
							
						 
					 
					
						
						
							
							Basic User edit in tables  
						
						 
						
						
						
					 
					
						2021-01-31 10:17:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2d3ae71a3d 
							
						 
					 
					
						
						
							
							Fixed button for email config ( Fix   #1766 )  
						
						 
						
						
						
					 
					
						2020-12-21 19:13:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d5ed5cd665 
							
						 
					 
					
						
						
							
							Fixes from tests  
						
						 
						
						
						
					 
					
						2020-12-12 15:16:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9130aceb5a 
							
						 
					 
					
						
						
							
							Changed admin page  
						
						 
						
						
						
					 
					
						2020-12-11 20:55:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b8336c03c3 
							
						 
					 
					
						
						
							
							Changed admin page  
						
						 
						
						
						
					 
					
						2020-12-11 20:54:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9bd51c650b 
							
						 
					 
					
						
						
							
							Add config options for client certificate authentication  
						
						 
						
						
						
					 
					
						2020-11-20 19:47:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							32b7b39223 
							
						 
					 
					
						
						
							
							Added function to download debug information  
						
						 
						
						
						
					 
					
						2020-11-15 14:25:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							400f6e02a5 
							
						 
					 
					
						
						
							
							Fix   #1668  (upload of books with language set to different than UI language and not showing all books)  
						
						 
						
						... 
						
						
						
						Fix for only showing external port if kobo is really activated in admin menu 
						
					 
					
						2020-11-07 11:44:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cdaad2fb4a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-08-23 21:23:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							843279bacb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'jef/jef/download-kobo' into master  
						
						 
						
						
						
					 
					
						2020-08-23 21:22:44 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							7b4306b1d6 
							
						 
					 
					
						
						
							
							UI improvements (same colors of buttons, etc.)  
						
						 
						
						... 
						
						
						
						Changed Editable default value 
						
					 
					
						2020-06-09 20:46:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0adcd1b3d9 
							
						 
					 
					
						
						
							
							UI Improvements  
						
						 
						
						... 
						
						
						
						Added additional restrictions to Calibre DB interface 
						
					 
					
						2020-05-03 10:55:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4749eccfa5 
							
						 
					 
					
						
						
							
							Added fix for python2 regex  
						
						 
						
						... 
						
						
						
						Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap 
						
					 
					
						2020-04-14 10:58:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a194216568 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						 
						
						
						
					 
					
						2020-04-05 19:10:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8bee424cc0 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'ldap/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py 
						
					 
					
						2020-04-05 17:31:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
						
						
							
						
						
							c870f6e87d 
							
						 
					 
					
						
						
							
							English Language V2  
						
						 
						
						
						
					 
					
						2020-03-19 13:10:10 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
						
						
							
						
						
							9b49125776 
							
						 
					 
					
						
						
							
							English Language Updates  
						
						 
						
						... 
						
						
						
						Changes to provide consistency for English language. 
						
					 
					
						2020-02-03 14:22:00 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ground7 
							
						 
					 
					
						
						
						
						
							
						
						
							54c4f40188 
							
						 
					 
					
						
						
							
							added LDAP import  
						
						 
						
						... 
						
						
						
						update defaults 
						
					 
					
						2019-12-27 23:12:18 -07:00