Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3b45234beb 
							
						 
					 
					
						
						
							
							Bugfix from testrun  
						
						 
						
						
						
					 
					
						2023-02-09 19:46:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4b7a0f3662 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/opds.py
#	cps/server.py
#	cps/web.py 
						
					 
					
						2023-02-05 12:10:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							98da7dd5b0 
							
						 
					 
					
						
						
							
							remove g.user from before request  
						
						 
						
						
						
					 
					
						2023-02-05 08:47:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d6a31e5db8 
							
						 
					 
					
						
						
							
							config verify password working  
						
						 
						
						
						
					 
					
						2022-06-16 10:44:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							73d48e4ac1 
							
						 
					 
					
						
						
							
							Frontend for password strength  
						
						 
						
						
						
					 
					
						2022-06-16 08:33:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fbac3e38ac 
							
						 
					 
					
						
						
							
							Eenabled send epubs to E-Reader devices  
						
						 
						
						
						
					 
					
						2022-05-08 12:55:54 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f39dc100b4 
							
						 
					 
					
						
						
							
							Migrated some routes to POST  
						
						 
						
						... 
						
						
						
						- shelf massadd
- resetpassword
- delete shelf
- send to kindle 
						
					 
					
						2021-12-30 14:45:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9d9acb058d 
							
						 
					 
					
						
						
							
							Add button to force full kobo sync  
						
						 
						
						
						
					 
					
						2021-12-06 21:02:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6aad9378b8 
							
						 
					 
					
						
						
							
							Fix visiblility upload right on enabled upload feature  
						
						 
						
						
						
					 
					
						2021-11-20 12:44:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ecc5cb167e 
							
						 
					 
					
						
						
							
							Upload setting in user template only visible if upload enabled  
						
						 
						
						... 
						
						
						
						Delete book setting only visible if edit book setting is ticked 
						
					 
					
						2021-11-03 20:32:17 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d72210c6ae 
							
						 
					 
					
						
						
							
							Exclude upload rights visibility if upload is not activated  
						
						 
						
						
						
					 
					
						2021-11-03 19:05:24 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							25f608d109 
							
						 
					 
					
						
						
							
							Bugfixes from testrun (load images from gdrive)  
						
						 
						
						... 
						
						
						
						Fix locale for new users 
						
					 
					
						2021-10-09 09:37:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							50919d4721 
							
						 
					 
					
						
						
							
							Added handling for missing flask-wtf dependency  
						
						 
						
						... 
						
						
						
						Added CSRF protection (via flask-wtf)
Moved upload function to js file
Fixed error page in case of csrf failure 
						
					 
					
						2021-10-04 19:23:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c5e39a7523 
							
						 
					 
					
						
						
							
							Fix divs in user edit page  
						
						 
						
						
						
					 
					
						2021-07-27 08:09:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3c8bfc31e4 
							
						 
					 
					
						
						
							
							fix change name allowd as non admin  
						
						 
						
						
						
					 
					
						2021-07-23 19:34:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6de3aebf3a 
							
						 
					 
					
						
						
							
							Fix for  #1998  (Error 500 with configured oauth on user setup page accessed by admins)  
						
						 
						
						
						
					 
					
						2021-05-28 14:23:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d95838309e 
							
						 
					 
					
						
						
							
							Added config option for shelf sync behavior  
						
						 
						
						
						
					 
					
						2021-05-15 10:45:51 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b100d198e8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						Remove relate to referrer for tag/custom column allow / deny dialog 
						
					 
					
						2020-12-31 15:12:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7849f2fb4b 
							
						 
					 
					
						
						
							
							Remove relate to referrer for tag/custom column allow / deny dialog  
						
						 
						
						
						
					 
					
						2020-12-31 15:08:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f6538b6110 
							
						 
					 
					
						
						
							
							New delete user button  
						
						 
						
						... 
						
						
						
						refactored confirm dialogs 
						
					 
					
						2020-12-21 19:50:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							376001100a 
							
						 
					 
					
						
						
							
							Bugfixes from last testrun  
						
						 
						
						
						
					 
					
						2020-09-28 21:24:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6dfa171b4e 
							
						 
					 
					
						
						
							
							Added id's for testing  
						
						 
						
						... 
						
						
						
						moved downloaded books section 
						
					 
					
						2020-09-27 16:00:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ec3a3a73ef 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-05-23 08:50:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Knepher 
							
						 
					 
					
						
						
						
						
							
						
						
							c79a9e9858 
							
						 
					 
					
						
						
							
							Fix typo "Shelfs" to "Shelves"  
						
						 
						
						
						
					 
					
						2020-05-22 11:43:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0adcd1b3d9 
							
						 
					 
					
						
						
							
							UI Improvements  
						
						 
						
						... 
						
						
						
						Added additional restrictions to Calibre DB interface 
						
					 
					
						2020-05-03 10:55:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							902685a197 
							
						 
					 
					
						
						
							
							Fix text in user config section (random books in Detail View)  
						
						 
						
						
						
					 
					
						2020-04-18 21:30:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2c42972230 
							
						 
					 
					
						
						
							
							Fix for  #1307  (Oauth login not working)  
						
						 
						
						... 
						
						
						
						- Changed blueprint reference in Backend from name to id, users can now again be found
- Depending on version of flask-dance the resultcode of authorized is set different to prevent redirect loop with newer versions(>1.3)
- Redirect to login page in case no user is linked to current oauth account
- Flash messages upon successfull login, successsfull linked account 
						
					 
					
						2020-04-16 17:58:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a784c6bd52 
							
						 
					 
					
						
						
							
							Fixes for oauth login after programming basic tests  
						
						 
						
						
						
					 
					
						2020-04-15 22:03:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e99f5bcced 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'english/master'  
						
						 
						
						
						
					 
					
						2020-04-03 19:46:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
						
						
							
						
						
							c870f6e87d 
							
						 
					 
					
						
						
							
							English Language V2  
						
						 
						
						
						
					 
					
						2020-03-19 13:10:10 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9fc0c3b3de 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'English_texts/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/config_edit.html
#	cps/templates/config_view_edit.html
#	cps/templates/layout.html
#	cps/templates/search_form.html
#	cps/templates/user_edit.html 
						
					 
					
						2020-02-23 13:27:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ba6b5f8fd1 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-02-17 18:42:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8f518993a4 
							
						 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						 
						
						
						
					 
					
						2020-02-18 00:21:59 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							317e59df4b 
							
						 
					 
					
						
						
							
							Bugfixes from tests  
						
						 
						
						
						
					 
					
						2020-02-15 16:02:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							509071949a 
							
						 
					 
					
						
						
							
							Moved style to css file  
						
						 
						
						
						
					 
					
						2020-02-13 21:05:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							1666e32aaf 
							
						 
					 
					
						
						
							
							Fixes cover layouts in user edit page  
						
						 
						
						
						
					 
					
						2020-02-09 22:31:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							6a69bbe4b5 
							
						 
					 
					
						
						
							
							Fixes cover layouts in user edit page  
						
						 
						
						
						
					 
					
						2020-02-09 22:20:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
						
						
							
						
						
							9b49125776 
							
						 
					 
					
						
						
							
							English Language Updates  
						
						 
						
						... 
						
						
						
						Changes to provide consistency for English language. 
						
					 
					
						2020-02-03 14:22:00 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e44494aad0 
							
						 
					 
					
						
						
							
							Kobo sync enable/disable working  
						
						 
						
						
						
					 
					
						2020-01-27 20:32:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2eec329bdf 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt 
						
					 
					
						2020-01-26 19:29:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Simon Latapie 
							
						 
					 
					
						
						
						
						
							
						
						
							69fa7d0091 
							
						 
					 
					
						
						
							
							new user: disable kobo token on new user page  
						
						 
						
						... 
						
						
						
						kobo token generator function is related to a user id, which is not
present on new user page.
Disable the Kobo token part when creating a new user. 
						
					 
					
						2020-01-25 22:41:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cd9bb56db5 
							
						 
					 
					
						
						
							
							Cleanup Kobo integration  
						
						 
						
						
						
					 
					
						2020-01-20 06:14:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ce66c752c4 
							
						 
					 
					
						
						
							
							Updated czech translation  
						
						 
						
						... 
						
						
						
						removed language selection for guest user 
						
					 
					
						2020-01-14 18:21:31 +01:00