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
							
						 
					 | 
					
						
						
						
						
							
						
						
							4545f4a20d
							
						
					 | 
					
						
						
							
							Better epub cover parsing with multiple cover-image items
						
						
						
						
						
						
						
						Code cosmetics
renamed variables
refactored xml page generation
refactored prepare author 
						
					 | 
					
						2022-03-13 19:00:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							18ce310b30
							
						
					 | 
					
						
						
							
							Merge branch Develop into thumbnails
						
						
						
						
						
					 | 
					
						2022-01-26 23:51:50 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3dbf7a88d
							
						
					 | 
					
						
						
							
							Bugfixes load metadata
						
						
						
						
						
						
						
						Improvements for testing load metadata 
						
					 | 
					
						2022-01-07 12:40:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbadfa2251
							
						
					 | 
					
						
						
							
							bugfixes load metadata
						
						
						
						
						
					 | 
					
						2022-01-04 21:11:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f9da94a18
							
						
					 | 
					
						
						
							
							Tie visibility of upload buttons to upload right only
						
						
						
						
						
					 | 
					
						2021-11-27 17:43:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							bad4c01474
							
						
					 | 
					
						
						
							
							Fix stored css bug in all typeahead functions (update typeahead -> bugfix typeahead)
						
						
						
						
						
					 | 
					
						2021-10-10 18:02:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d8f9e2feb2
							
						
					 | 
					
						
						
							
							Bugfixes for user import with default locale and default language
						
						
						
						
						
						
						
						Bugfixes from testrun 
						
					 | 
					
						2021-10-06 18:41:01 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							e064a3ec2b
							
						
					 | 
					
						
						
							
							Removed unnecessary spaces in book convert texts
						
						
						
						
						
					 | 
					
						2021-10-02 07:53:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd3791f5f4
							
						
					 | 
					
						
						
							
							Always use full-sized image for book edit and details pages
						
						
						
						
						
					 | 
					
						2021-09-30 01:43:31 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							0bd544704d
							
						
					 | 
					
						
						
							
							Added series cover thumbnail generation. Better cache file handling.
						
						
						
						
						
					 | 
					
						2021-09-25 03:04:38 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							be28a91315
							
						
					 | 
					
						
						
							
							Simplified all of the thumbnail generation and loading.
						
						
						
						
						
					 | 
					
						2021-09-24 03:11:14 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mmonkey
							
						 
					 | 
					
						
						
						
						
							
						
						
							04a5db5c1d
							
						
					 | 
					
						
						
							
							Resolve merge conflicts
						
						
						
						
						
					 | 
					
						2021-09-16 22:58:54 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ceec1051d5
							
						
					 | 
					
						
						
							
							Added option to save books with no nenglish characters
						
						
						
						
						
						
						
						Imporvements on metadata search 
						
					 | 
					
						2021-08-01 13:50:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							53603f79bd
							
						
					 | 
					
						
						
							
							Get_meta button unfocused on return to edit books
						
						
						
						
						
					 | 
					
						2021-07-31 09:00:34 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							e69b1adccd
							
						
					 | 
					
						
						
							
							Fix #2053 (Add tooltip for complete title on hover over cover and title)
						
						
						
						
						
					 | 
					
						2021-07-12 14:17:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec7803fa76
							
						
					 | 
					
						
						
							
							Update python search Metadata
						
						
						
						
						
					 | 
					
						2021-07-10 07:38:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa2d3d2b36
							
						
					 | 
					
						
						
							
							Update python search Metadata
						
						
						
						
						
					 | 
					
						2021-07-07 21:24:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5e9cdc5b7
							
						
					 | 
					
						
						
							
							Search Metadata improvements
						
						
						
						
						
					 | 
					
						2021-07-07 21:10:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0f48b7f00
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
					 | 
					
						2021-05-26 19:58:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							94b07d05c1
							
						
					 | 
					
						
						
							
							First half of #1996 (editing single books)
						
						
						
						
						
					 | 
					
						2021-05-26 19:57:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4392fec7f5
							
						
					 | 
					
						
						
							
							Added fullscreen cover viewer
						
						
						
						
						
					 | 
					
						2021-05-26 19:40:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							251780bed6
							
						
					 | 
					
						
						
							
							Added google scholar as metadata provider
						
						
						
						
						
					 | 
					
						2021-05-16 13:24:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3648187ff
							
						
					 | 
					
						
						
							
							Bugfix search for publishdates and custom column dates
						
						
						
						
						
						
						
						Bugfix save umplauts in comments unescaped (as calibre does)
Improved testability 
						
					 | 
					
						2021-05-15 07:51:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b009dfe4ee
							
						
					 | 
					
						
						
							
							Always use bootstrap datepicker
						
						
						
						
						
					 | 
					
						2021-05-14 19:58:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6bf360fbfb
							
						
					 | 
					
						
						
							
							Added "comments" type to supported custom columns
						
						
						
						
						
					 | 
					
						2021-05-13 14:00:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0cc52e0aa
							
						
					 | 
					
						
						
							
							Enable custom column datetime (adv. search not working yet) #1984
						
						
						
						
						
					 | 
					
						2021-05-13 10:39:36 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6538b6110
							
						
					 | 
					
						
						
							
							New delete user button
						
						
						
						
						
						
						
						refactored confirm dialogs 
						
					 | 
					
						2020-12-21 19:50:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							560ade00b4
							
						
					 | 
					
						
						
							
							Fix browser caching problem on change cover
						
						
						
						
						
					 | 
					
						2020-11-22 10:03:10 +01: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c8f6ce62f
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/comic.py
#	cps/editbooks.py
#	cps/isoLanguages.py 
						
					 | 
					
						2020-09-26 07:54:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							da909ff084
							
						
					 | 
					
						
						
							
							Fixes from test of upload restrictions
						
						
						
						
						
					 | 
					
						2020-09-23 20:50:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3bde0408f
							
						
					 | 
					
						
						
							
							Improvederror handling for editing identifier
						
						
						
						
						
					 | 
					
						2020-09-05 18:47:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							34d3225984
							
						
					 | 
					
						
						
							
							Errorhandling edit identifier
						
						
						
						
						
					 | 
					
						2020-09-05 18:46:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad144922fb
							
						
					 | 
					
						
						
							
							Merge with master
						
						
						
						
						
					 | 
					
						2020-08-22 09:23:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							94ad93ebd7
							
						
					 | 
					
						
						
							
							Added series like custom columns #1501
						
						
						
						
						
					 | 
					
						2020-08-11 18:56:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f80c67828b
							
						
					 | 
					
						
						
							
							Fix #1500 (Custom ratings of increment 0.5 are allowed)
						
						
						
						
						
					 | 
					
						2020-07-05 14:35:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							22344a3971
							
						
					 | 
					
						
						
							
							Improvements for delete book
						
						
						
						
						
					 | 
					
						2020-06-18 20:39:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4038cb5b85
							
						
					 | 
					
						
						
							
							Internal paged Search prepared
						
						
						
						
						
						
						
						Search for table list is working 
						
					 | 
					
						2020-06-08 17:34:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0fc18bf3b1
							
						
					 | 
					
						
						
							
							Fix for #1398 (prevent empty series_index field)
						
						
						
						
						
					 | 
					
						2020-05-25 19:34:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							44d5adc16f
							
						
					 | 
					
						
						
							
							Fix #1390
						
						
						
						
						
					 | 
					
						2020-05-12 19:08:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f749fc641b
							
						
					 | 
					
						
						
							
							Temporary fix for #1390
						
						
						
						
						
					 | 
					
						2020-05-12 17:42:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6f41d8dc0
							
						
					 | 
					
						
						
							
							Fix error 404 on reset password (Fix #1342)
						
						
						
						
						
					 | 
					
						2020-05-01 08:33:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e29f17ac46
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'kobo/shelves' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/kobo.py
#	cps/shelf.py 
						
					 | 
					
						2020-04-24 16:56:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6c04b9b84
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
					 | 
					
						2020-03-29 16:48:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							09e7d76c6f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'kobo_book_delete' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/kobo.py
#	cps/services/SyncToken.py
#	cps/templates/book_edit.html
#	cps/ub.py 
						
					 | 
					
						2020-03-12 20:43:39 +01:00 | 
					
					
						
						
							
							
							
						
					 |