Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						130af069aa 
					 
					
						
						
							
							Merge remote-tracking branch 'douban/metadata_provider/douban'  
						
						... 
						
						
						
						# Conflicts:
#	cps/metadata_provider/amazon.py
#	cps/metadata_provider/lubimyczytac.py 
						
						
					 
					
						2022-04-17 10:33:52 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						fe5d684d2c 
					 
					
						
						
							
							Merge branch 'master' into cover_thumbnail  
						
						
						
						
					 
					
						2022-04-13 18:37:44 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						028e6855a7 
					 
					
						
						
							
							Pagination button disapears in standard theme once infinite scroll is triggered  
						
						
						
						
					 
					
						2022-04-12 18:45:06 +02: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 
							
						 
					 
					
						
						
							
						
						3b5e5f9b90 
					 
					
						
						
							
							Undo check of read checkbox in case of error  
						
						... 
						
						
						
						Display error message in details modal dialog
Bugfix set archive bit in booktable
Translate error message readstatus change 
						
						
					 
					
						2022-03-12 22:16:33 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						34478079d8 
					 
					
						
						
							
							Prevent local variable 'from_book' referenced before assignment during merge of books  
						
						... 
						
						
						
						Merge books source book: Each book in own row
Merge books, sources are deleted before dialog shows up again 
						
						
					 
					
						2022-03-09 14:45:51 +01:00 
						 
				 
			
				
					
						
							
							
								Bharat KNV 
							
						 
					 
					
						
						
							
						
						9efd644360 
					 
					
						
						
							
							Change dark theme from black to dark gray and add a black theme  
						
						
						
						
					 
					
						2022-03-06 15:56:54 +05:30 
						 
				 
			
				
					
						
							
							
								xlivevil 
							
						 
					 
					
						
						
							
						
						97cf20764b 
					 
					
						
						
							
							Add exception handling and logger in metadata provider  
						
						
						
						
					 
					
						2022-02-25 12:18:07 +08:00 
						 
				 
			
				
					
						
							
							
								xlivevil 
							
						 
					 
					
						
						
							
						
						695ce83681 
					 
					
						
						
							
							Fix Uncaught RangeError  
						
						
						
						
					 
					
						2022-02-25 01:12:22 +08: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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						18ce310b30 
					 
					
						
						
							
							Merge branch Develop into thumbnails  
						
						
						
						
					 
					
						2022-01-26 23:51:50 -06:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						d9d6fb33ba 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						... 
						
						
						
						# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html 
						
						
					 
					
						2022-01-25 19:33:21 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						17b4643b7c 
					 
					
						
						
							
							fix   #2285  (Fix for shelf handling in caliblur theme)  
						
						
						
						
					 
					
						2022-01-25 19:31:52 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						3b216bfa07 
					 
					
						
						
							
							Kobo sync token is now also created if accessed from localhost( fixes   #1990 )  
						
						... 
						
						
						
						Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status 
						
						
					 
					
						2022-01-24 18:47:34 +01: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 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						d759df0df6 
					 
					
						
						
							
							Kobo sync token is now also created if accessed from localhost( fixes   #1990 )  
						
						... 
						
						
						
						Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status 
						
						
					 
					
						2022-01-22 18:23:43 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						bbef41290f 
					 
					
						
						
							
							Fix delete book format wasn't working  
						
						
						
						
					 
					
						2022-01-22 14:01:32 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						de1bc3f9af 
					 
					
						
						
							
							Fix   #2265  (add book to shelf on popup for book details)  
						
						... 
						
						
						
						Updated testresults 
						
						
					 
					
						2022-01-17 17:46:57 +01:00 
						 
				 
			
				
					
						
							
							
								collerek 
							
						 
					 
					
						
						
							
						
						20b5a9a2c0 
					 
					
						
						
							
							Merge branch 'master' into add_lubimyczytac.pl_meta_provider  
						
						
						
						
					 
					
						2022-01-13 10:49:51 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						e3dbf7a88d 
					 
					
						
						
							
							Bugfixes load metadata  
						
						... 
						
						
						
						Improvements for testing load metadata 
						
						
					 
					
						2022-01-07 12:40:03 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						405f3c181f 
					 
					
						
						
							
							Added korean locale  
						
						
						
						
					 
					
						2022-01-06 14:04:49 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						6d839d5cc7 
					 
					
						
						
							
							Bugfixes from testrun  
						
						
						
						
					 
					
						2022-01-04 21:12:59 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						7b8b2f93a0 
					 
					
						
						
							
							Merge remote-tracking branch 'scholary/master'  
						
						
						
						
					 
					
						2021-12-30 14:55:39 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						ae1f515446 
					 
					
						
						
							
							Bugfix uncheck all ekements in books list and user list  
						
						... 
						
						
						
						Improved testability for books list 
						
						
					 
					
						2021-12-30 14:45:31 +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 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						785726deee 
					 
					
						
						
							
							Migrated some routes to POST  
						
						... 
						
						
						
						- delete shelf, import ldap users
- delete_kobo token, kobo force full sync
- shutdown, reconnect, shutdown 
						
						
					 
					
						2021-12-30 14:45:30 +01:00 
						 
				 
			
				
					
						
							
							
								cbartondock 
							
						 
					 
					
						
						
							
						
						4edd1914b4 
					 
					
						
						
							
							Fixed google scholar issues  
						
						
						
						
					 
					
						2021-12-23 23:16:41 -05: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 
						 
				 
			
				
					
						
							
							
								Bharat KNV 
							
						 
					 
					
						
						
							
						
						0693cb1ddb 
					 
					
						
						
							
							Added basic theming to the epub reader  
						
						
						
						
					 
					
						2021-12-15 21:35:10 +05:30 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						f0399d04b7 
					 
					
						
						
							
							Merge remote-tracking branch 'bookmark_csrf/master'  
						
						
						
						
					 
					
						2021-12-14 17:59:32 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						9b57fa25de 
					 
					
						
						
							
							Merge remote-tracking branch 'zh/master'  
						
						
						
						
					 
					
						2021-12-14 17:52:12 +01:00 
						 
				 
			
				
					
						
							
							
								collerek 
							
						 
					 
					
						
						
							
						
						920acaca99 
					 
					
						
						
							
							everything working to refactor  
						
						
						
						
					 
					
						2021-12-11 01:06:04 +01:00 
						 
				 
			
				
					
						
							
							
								xlivevil 
							
						 
					 
					
						
						
							
						
						a184f4e71a 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						
						
						
					 
					
						2021-12-08 22:58:30 +08:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						9d9acb058d 
					 
					
						
						
							
							Add button to force full kobo sync  
						
						
						
						
					 
					
						2021-12-06 21:02:06 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						fd5ab0ef53 
					 
					
						
						
							
							Bugfix handle archive bit  
						
						
						
						
					 
					
						2021-12-05 18:01:56 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						d217676350 
					 
					
						
						
							
							Upated testresult  
						
						... 
						
						
						
						Bugfix book table 
						
						
					 
					
						2021-12-05 13:09:41 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						cd5711e651 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						... 
						
						
						
						# Conflicts:
#	cps/web.py 
						
						
					 
					
						2021-12-04 20:56:04 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						bd01e840ca 
					 
					
						
						
							
							Delete books in shelfs, downloaded books, kobo sync status, etc on database change ( fixes   #620 )  
						
						
						
						
					 
					
						2021-12-04 11:50:25 +01:00 
						 
				 
			
				
					
						
							
							
								GarcaMan 
							
						 
					 
					
						
						
							
						
						e2eab808c0 
					 
					
						
						
							
							Merge branch 'long_strip_cbrreader' of github.com:GarckaMan/calibre-web into long_strip_cbrreader  
						
						
						
						
					 
					
						2021-12-02 18:20:27 +00:00 
						 
				 
			
				
					
						
							
							
								GarcaMan 
							
						 
					 
					
						
						
							
						
						3ac08a8c0d 
					 
					
						
						
							
							After toggling fullscreen, focus on main container  
						
						
						
						
					 
					
						2021-12-02 18:20:14 +00:00 
						 
				 
			
				
					
						
							
							
								Jonathan Fenske 
							
						 
					 
					
						
						
							
						
						3f91313303 
					 
					
						
						
							
							Update epub.js  
						
						... 
						
						
						
						send the CSRF token when adding bookmarks 
						
						
					 
					
						2021-11-30 22:24:34 -06:00 
						 
				 
			
				
					
						
							
							
								xlivevil 
							
						 
					 
					
						
						
							
						
						67e3721530 
					 
					
						
						
							
							fix(tinymce Simplified Chinese locale):rename zh_CN to zh_Hans_CN  
						
						
						
						
					 
					
						2021-12-01 11:28:03 +08:00 
						 
				 
			
				
					
						
							
							
								Denis Rodríguez 
							
						 
					 
					
						
						
							
						
						3f56f0dca7 
					 
					
						
						
							
							Removed parameter that was wrongly added  
						
						
						
						
					 
					
						2021-11-25 01:30:20 -03:00 
						 
				 
			
				
					
						
							
							
								GarcaMan 
							
						 
					 
					
						
						
							
						
						7fc04b353b 
					 
					
						
						
							
							Selecting Position will not scroll the current image up  
						
						
						
						
					 
					
						2021-11-24 20:22:10 +00:00 
						 
				 
			
				
					
						
							
							
								GarcaMan 
							
						 
					 
					
						
						
							
						
						a8689ae26b 
					 
					
						
						
							
							first commit  
						
						
						
						
					 
					
						2021-11-24 19:41:07 +00:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						6deb527769 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						
						
						
					 
					
						2021-11-21 09:14:36 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
						
						7ad419dc8c 
					 
					
						
						
							
							Fix upload of cover and book formats containing html characters  
						
						
						
						
					 
					
						2021-11-20 13:40:23 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						4fd4cf4355 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						... 
						
						
						
						# Conflicts:
#	cps/static/css/style.css
#	cps/web.py 
						
						
					 
					
						2021-11-13 17:41:16 +04:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						42cc13d1e2 
					 
					
						
						
							
							Mark which functions are selected on list pages  
						
						
						
						
					 
					
						2021-11-03 21:07:16 +04:00