Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4708347c16 
							
						 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt 
						
					 
					
						2019-07-13 20:54:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0b8624b542 
							
						 
					 
					
						
						
							
							Deleted load metadata from douban, as API seems to be shut down ( #858 )  
						
						 
						
						
						
					 
					
						2019-04-17 19:55:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							91ebe33879 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'image_formats/dev'  
						
						 
						
						
						
					 
					
						2019-04-15 20:57:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fa276fd0d3 
							
						 
					 
					
						
						
							
							Add scrollbar to metadata load screen  
						
						 
						
						... 
						
						
						
						Small UI improvements in metadata load screen 
						
					 
					
						2019-03-01 21:00:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc4b318e8 
							
						 
					 
					
						
						
							
							cover folders beautified  
						
						 
						
						
						
					 
					
						2019-02-03 20:29:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6ec9bc9e5c 
							
						 
					 
					
						
						
							
							Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)  
						
						 
						
						... 
						
						
						
						404 messages on non existing categorys, languages, series
Updated Testresult 
						
					 
					
						2018-10-28 21:33:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							40cc25de7a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'bbb/621'  
						
						 
						
						... 
						
						
						
						Fixes after testing 
						
					 
					
						2018-10-03 14:03:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							016c7b4b1c 
							
						 
					 
					
						
						
							
							Add ability to store and edit publishers  
						
						 
						
						
						
					 
					
						2018-09-30 14:08:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							01fb8ee681 
							
						 
					 
					
						
						
							
							Fix   #609  
						
						 
						
						... 
						
						
						
						Removed formats which are not possible to convert from list of convertable books
Update language files to be po-edit compatible 
						
					 
					
						2018-09-09 18:17:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0bcb20f674 
							
						 
					 
					
						
						
							
							Fix   #604  
						
						 
						
						... 
						
						
						
						Added missing translation for "select option" 
						
					 
					
						2018-09-03 19:12:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0e1711631c 
							
						 
					 
					
						
						
							
							Fix for  #600  
						
						 
						
						... 
						
						
						
						publisher-info  is shown on edit page (#599 ) 
						
					 
					
						2018-09-02 17:21:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3f2d0ea7bb 
							
						 
					 
					
						
						
							
							Fix   #601  
						
						 
						
						... 
						
						
						
						Removed trailing comma on edit page 
						
					 
					
						2018-09-02 14:05:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4a95404e17 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'Convert_all/ebookconvert-any'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/web.py 
						
					 
					
						2018-08-31 15:00:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
						
						
							
						
						
							22ecdfd2bc 
							
						 
					 
					
						
						
							
							Refactor edit_books.js for unused code; re-add glyphicon to convert button; Add form validation for convert button  
						
						 
						
						
						
					 
					
						2018-08-29 00:49:50 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
						
						
							
						
						
							4f386c8a00 
							
						 
					 
					
						
						
							
							Updated GUI buttons for ebook-convert feature  
						
						 
						
						
						
					 
					
						2018-08-28 19:13:04 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
						
						
							
						
						
							3ec000ad85 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/janeczku/calibre-web  into ebookconvert-any  
						
						 
						
						
						
					 
					
						2018-08-28 09:56:08 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a7a91ae54c 
							
						 
					 
					
						
						
							
							Added posibility to upload cover from local drive ( #439 )  
						
						 
						
						... 
						
						
						
						Updated language files 
						
					 
					
						2018-08-28 14:07:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
						
						
							
						
						
							e160efbdac 
							
						 
					 
					
						
						
							
							Add GUI functions for ebookconvert any format feature  
						
						 
						
						
						
					 
					
						2018-08-27 21:27:16 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cedc183987 
							
						 
					 
					
						
						
							
							Fix   #590 ,  #589 .  
						
						 
						
						... 
						
						
						
						Unified wording Calibre-Web
Replaced one table on admin page, deleted password column
Removed spaces on layout page
Removed uesless commit calls during db migration
Implementation of registering by email 
						
					 
					
						2018-08-27 22:08:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cdb1b52652 
							
						 
					 
					
						
						
							
							Bugfix Get gdrive instances ( #554 ,  #525 )  
						
						 
						
						... 
						
						
						
						Metadata.db download works again
removed DEVELOPMENT constant
removed db logging in debug mode (too, noisy, to less information)
code refactoring url_for_other_page
feed languge set to en-EN
update status shos local time instead of UTC
Error handling (back to index page) in case of gdrive authenticate aborted
Mistyping page register fixed
Mistyping bokk fixed
Added uploaded books to tasklist (#442 )
Error handling for failed file update added
Code refactoring worker thread
Tasks now never show any decimal values
Converter function unified
removed shell from subprocess call
preparation for limiting domain for registering emails
Book series can now increased in 0.1 steps (#562 )
Accordion panels in config are now usable on touch devices like iPad (#545 )
Gdrive authenticate button only visible after logged in (#525 )
Fixed misstyping in german translation 
						
					 
					
						2018-08-16 21:17:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3db682cd15 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'del_books/delete-book-formats'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/helper.py
Implemented delete on gdrive 
						
					 
					
						2018-08-04 18:22:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1f9527f0e1 
							
						 
					 
					
						
						
							
							Fix   #496  
						
						 
						
						
						
					 
					
						2018-05-06 09:55:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d01d7b91a8 
							
						 
					 
					
						
						
							
							Added error messages in log and UI if cover url can't downloaded, changed label for cover URL to clarify function  #449  
						
						 
						
						
						
					 
					
						2018-03-27 20:42:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							9086f4e0e7 
							
						 
					 
					
						
						
							
							Added option to upload a new format to a given book  
						
						 
						
						
						
					 
					
						2017-09-11 10:48:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							866f7944eb 
							
						 
					 
					
						
						
							
							Meta data improvements  
						
						 
						
						... 
						
						
						
						* Add buttons to show/hide results from Douban & Google
* Trigger search with "Enter" key
* Use Underscore.js template instead of build HTML strings in JavaScript
* Keep click event handler in JavaScript instead of using HTML's `onclick`
* Normalize Douban & Google results
* Update cover image & add cover URL to the form input 
						
					 
					
						2017-08-15 22:11:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							8171943b8e 
							
						 
					 
					
						
						
							
							Update to ES5 standards  
						
						 
						
						... 
						
						
						
						Also fix ESLint issues 
						
					 
					
						2017-08-12 22:46:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							61e0405f75 
							
						 
					 
					
						
						
							
							Move TinyMCE into edit_books.js  
						
						 
						
						
						
					 
					
						2017-07-23 13:36:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							5715d27c97 
							
						 
					 
					
						
						
							
							Show localized date over top of date input  
						
						 
						
						... 
						
						
						
						Also move datepicker logic into edit_books.js and edit_books.js below the datepicker file declaration(s) 
						
					 
					
						2017-07-23 13:36:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							36c2b35588 
							
						 
					 
					
						
						
							
							Use bootstrap-datepicker to add datepicking UI for browsers that do not have one built-in  
						
						 
						
						
						
					 
					
						2017-07-23 13:35:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							a07798b0db 
							
						 
					 
					
						
						
							
							Standardize indentation  
						
						 
						
						
						
					 
					
						2017-07-23 13:35:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							04b04e200f 
							
						 
					 
					
						
						
							
							Add ability to edit publish date  
						
						 
						
						... 
						
						
						
						If a date is not set, default to “0101-01-01” 
						
					 
					
						2017-07-23 13:35:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							15531324ea 
							
						 
					 
					
						
						
							
							Add translation of rich text editor  
						
						 
						
						
						
					 
					
						2017-07-08 11:19:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							7853cb2602 
							
						 
					 
					
						
						
							
							Add TinyMCE to provide rich-text editing for descriptions  
						
						 
						
						
						
					 
					
						2017-06-22 08:59:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1366b36c32 
							
						 
					 
					
						
						
							
							Added integer-field to supported custom colums  
						
						 
						
						
						
					 
					
						2017-05-25 08:20:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nanu-c 
							
						 
					 
					
						
						
						
						
							
						
						
							26f314d371 
							
						 
					 
					
						
						
							
							support int custom fields  
						
						 
						
						
						
					 
					
						2017-05-22 22:54:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ede8ae6742 
							
						 
					 
					
						
						
							
							Fix   #182 ,  #176  
						
						 
						
						
						
					 
					
						2017-04-21 20:44:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cd0d450829 
							
						 
					 
					
						
						
							
							Allow deleting books ( fixes   #119 )  
						
						 
						
						
						
					 
					
						2017-04-14 20:29:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7c6d527a55 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2017-04-02 10:05:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							986f40b80a 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2017-03-30 21:17:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							74a3e6842a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kennyl/travis'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/web.py 
						
					 
					
						2017-03-12 21:13:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							16cac6ac4f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'polish_update/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
Fix for #147  
						
					 
					
						2017-03-12 19:12:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							7bae79d826 
							
						 
					 
					
						
						
							
							fix conflict  
						
						 
						
						
						
					 
					
						2017-03-08 23:56:20 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							38c782fcf1 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'Douban/prod'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/book_edit.html 
						
					 
					
						2017-03-07 20:30:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							edadf84710 
							
						 
					 
					
						
						
							
							Added editing star rating graphically  
						
						 
						
						... 
						
						
						
						Added ability to reload database connection (refresh problem)
Bugfix display hot books (no hot books, hot books are deleted books, no longer result in error 500) 
						
					 
					
						2017-03-07 19:10:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							a6b2977286 
							
						 
					 
					
						
						
							
							add i18n message for getmeta feature.  
						
						 
						
						
						
					 
					
						2017-03-07 09:46:09 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							54bc299e88 
							
						 
					 
					
						
						
							
							get metadata from douban and google while editing.  
						
						 
						
						
						
					 
					
						2017-02-28 14:58:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							e100702345 
							
						 
					 
					
						
						
							
							get metadata from douban and google while editing.  
						
						 
						
						
						
					 
					
						2017-02-28 14:52:55 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							40c6ef3a18 
							
						 
					 
					
						
						
							
							More generic aproach for postion of epub coverfile ( #122 )  
						
						 
						
						
						
					 
					
						2017-02-24 20:20:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							80e6311b93 
							
						 
					 
					
						
						
							
							fetch metadata from douban while editing metadata  
						
						 
						
						
						
					 
					
						2017-02-21 17:49:43 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								janeczku 
							
						 
					 
					
						
						
						
						
							
						
						
							13919a1d23 
							
						 
					 
					
						
						
							
							Move vendored css/js to libs folders to fix language stats  
						
						 
						
						
						
					 
					
						2017-02-07 19:21:14 +01:00