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 
							
						 
					 
					
						
						
						
						
							
						
						
							bdf28e1475 
							
						 
					 
					
						
						
							
							fix bug for metadata searching result.  
						
						 
						
						
						
					 
					
						2017-03-07 09:49:59 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							a6b2977286 
							
						 
					 
					
						
						
							
							add i18n message for getmeta feature.  
						
						 
						
						
						
					 
					
						2017-03-07 09:46:09 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							338ca61cf9 
							
						 
					 
					
						
						
							
							fixed douban api not working in some cases  
						
						 
						
						
						
					 
					
						2017-02-28 15:17:37 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							1a83ad713c 
							
						 
					 
					
						
						
							
							Additional version info for sqlite database  
						
						 
						
						
						
					 
					
						2017-02-25 09:02:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b876505f22 
							
						 
					 
					
						
						
							
							Delete doubtable.js  
						
						 
						
						
						
					 
					
						2017-02-25 06:15:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							4a2b5b46a3 
							
						 
					 
					
						
						
							
							merge  
						
						 
						
						
						
					 
					
						2017-02-24 14:36:10 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							2f1fdab9de 
							
						 
					 
					
						
						
							
							delete douban_meta.js in master.(This is for Chinese user only)  
						
						 
						
						
						
					 
					
						2017-02-24 14:34:08 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							d6dd28e703 
							
						 
					 
					
						
						
							
							limit search results to 20  
						
						 
						
						
						
					 
					
						2017-02-24 14:29:44 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							41a20fe3e1 
							
						 
					 
					
						
						
							
							Added version info of dependencys in about section  
						
						 
						
						
						
					 
					
						2017-02-23 19:58:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							80e6311b93 
							
						 
					 
					
						
						
							
							fetch metadata from douban while editing metadata  
						
						 
						
						
						
					 
					
						2017-02-21 17:49:43 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							709fa88c62 
							
						 
					 
					
						
						
							
							Navbar reduced to icons on smaller screens  
						
						 
						
						... 
						
						
						
						Feedback updater improved (#81 ) 
						
					 
					
						2017-02-20 19:52:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e712649612 
							
						 
					 
					
						
						
							
							Improvement for  #83 , higher contrast of hamburger menu  
						
						 
						
						... 
						
						
						
						Improvement for #84 , search is excluded from mobile view 
						
					 
					
						2017-02-18 10:38:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ba8e107402 
							
						 
					 
					
						
						
							
							Move vendored css/js to libs folders to fix language stats  
						
						 
						
						
						
					 
					
						2017-02-07 20:33:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ea305ff578 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/move-js-libs'  
						
						 
						
						
						
					 
					
						2017-02-07 20:27:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							98ed740e73 
							
						 
					 
					
						
						
							
							Fixed missing js files for sorting shelfs  
						
						 
						
						
						
					 
					
						2017-02-07 20:14:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								janeczku 
							
						 
					 
					
						
						
						
						
							
						
						
							13919a1d23 
							
						 
					 
					
						
						
							
							Move vendored css/js to libs folders to fix language stats  
						
						 
						
						
						
					 
					
						2017-02-07 19:21:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							18a06e4a25 
							
						 
					 
					
						
						
							
							Fixed typeahead with reverse proxy  
						
						 
						
						... 
						
						
						
						fixed marking of tags in advanced search
seperated js and html 
						
					 
					
						2017-02-05 13:40:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4eee58c21c 
							
						 
					 
					
						
						
							
							Started migration of config to app database  
						
						 
						
						
						
					 
					
						2017-01-22 16:44:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2335252b1f 
							
						 
					 
					
						
						
							
							Merge branch 'Chinese_tanslation' ( #90 )  
						
						 
						
						... 
						
						
						
						Thanks @idalin user language should be detected from browser, or otherwise with enabled anonymous browsing it can be selected as admin (configure language for user guest). Annymous browsing can be deactivated afterwards 
						
					 
					
						2017-01-14 15:05:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fb59647b82 
							
						 
					 
					
						
						
							
							Code cleanup in js and css folders  
						
						 
						
						
						
					 
					
						2017-01-14 13:32:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ea2e8205e3 
							
						 
					 
					
						
						
							
							Added code for rearranging shelfs  #73  
						
						 
						
						
						
					 
					
						2017-01-03 20:19:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a8f7fde333 
							
						 
					 
					
						
						
							
							Bugfix PDF Reader with reverse proxy ( #86 )  
						
						 
						
						... 
						
						
						
						Bugfix Txt Reader
Bugfix for loading covers with reverse proxy 
						
					 
					
						2016-12-28 11:43:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fac83a10eb 
							
						 
					 
					
						
						
							
							Added display and linking of IDs (Amazon, ISBN, and DIO Links are working)  
						
						 
						
						
						
					 
					
						2016-12-27 10:36:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e0459eb62b 
							
						 
					 
					
						
						
							
							Removed unused wishlist code  
						
						 
						
						... 
						
						
						
						Added renaming of shelf name
Added sorting abilty to shelfs
jquery is loaded locally now 
						
					 
					
						2016-12-26 11:33:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							bbf6d9b026 
							
						 
					 
					
						
						
							
							Translation of UI (german and english)  
						
						 
						
						... 
						
						
						
						Bugfix for feeds
    - removed categories related and up
    - load new books now working
    - category random now working
login page is free of non accessible elements
boolean custom column is vivible in UI
books with only with certain languages can be shown
book shelfs can be deleted from UI
Anonymous user view is more resticted
Added browse of series in sidebar
Dependencys in vendor folder are updated to newer versions (licencs files are now present)
Bugfix editing Authors names
Made upload on windows working 
						
					 
					
						2016-11-09 19:24:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a6b6700a73 
							
						 
					 
					
						
						
							
							Removed non working search from epub viewer  
						
						 
						
						
						
					 
					
						2016-11-01 18:49:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							12db39523c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/wuqi/calibre-web  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	.gitignore
#	cps/static/css/colors.css
#	cps/static/css/style.css
#	cps/web.py 
						
					 
					
						2016-10-24 19:04:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wuqi 
							
						 
					 
					
						
						
						
						
							
						
						
							f2de1d4c47 
							
						 
					 
					
						
						
							
							change google fonts to local  
						
						 
						
						
						
					 
					
						2016-07-20 10:41:04 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wuqi 
							
						 
					 
					
						
						
						
						
							
						
						
							b846cc11d8 
							
						 
					 
					
						
						
							
							fix some error  
						
						 
						
						... 
						
						
						
						Fix TypeError: 'bool' object is not callable 
						
					 
					
						2016-07-19 10:59:46 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joel Gillman 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a7117228aa 
							
						 
					 
					
						
						
							
							Update Google Font protocol to HTTPS  
						
						 
						
						
						
					 
					
						2016-07-18 11:10:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wuqi 
							
						 
					 
					
						
						
						
						
							
						
						
							9a8d795eff 
							
						 
					 
					
						
						
							
							Update epub reader and pdf reader  
						
						 
						
						... 
						
						
						
						Update epub reader and use pdf.js tu view pdf files 
						
					 
					
						2016-07-09 16:54:13 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								janeczku 
							
						 
					 
					
						
						
						
						
							
						
						
							91eb7129ac 
							
						 
					 
					
						
						
							
							Update epub.js  
						
						 
						
						
						
					 
					
						2016-06-17 21:22:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							80c3c19c01 
							
						 
					 
					
						
						
							
							some fixes for advanced search  
						
						 
						
						
						
					 
					
						2016-05-03 11:00:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							431b6009a5 
							
						 
					 
					
						
						
							
							add advanced search  
						
						 
						
						
						
					 
					
						2016-05-02 22:43:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							88b134151d 
							
						 
					 
					
						
						
							
							show 'better author and tags editing; partly copied from  https://bitbucket.org/SpeedProg/calibreserver  
						
						 
						
						
						
					 
					
						2016-04-15 23:51:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							826159c432 
							
						 
					 
					
						
						
							
							show 'better author and tags editing; partly copied from  https://bitbucket.org/SpeedProg/calibreserver  
						
						 
						
						
						
					 
					
						2016-04-15 23:51:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							8be85c8e5d 
							
						 
					 
					
						
						
							
							check if wand is available, add dummy cover.jpg otherwise  
						
						 
						
						
						
					 
					
						2016-04-08 22:57:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							748dd2ad1f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						 
						
						
						
					 
					
						2016-04-03 23:52:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							3ddecc007c 
							
						 
					 
					
						
						
							
							Adding unfinished upload function  
						
						 
						
						
						
					 
					
						2016-04-03 23:52:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							7342837aa3 
							
						 
					 
					
						
						
							
							Merge branch 'html-fixes'  
						
						 
						
						
						
					 
					
						2016-04-03 23:33:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							318d65bf3a 
							
						 
					 
					
						
						
							
							Small UI fixes  
						
						 
						
						... 
						
						
						
						* Smart truncate long titles in overview pages
* Fix responsive grid in overview
* Update favicon 
						
					 
					
						2016-04-03 23:33:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							c6500b7eca 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						 
						
						
						
					 
					
						2016-03-29 13:56:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							cd0aeb2857 
							
						 
					 
					
						
						
							
							Add Typeahead for Author input  
						
						 
						
						
						
					 
					
						2016-03-29 00:09:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							13a024a77d 
							
						 
					 
					
						
						
							
							Add logging / Optimize CSS  
						
						 
						
						
						
					 
					
						2016-03-28 21:14:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							34cd613e29 
							
						 
					 
					
						
						
							
							Fixes broken send-to-kindle  
						
						 
						
						
						
					 
					
						2016-03-27 23:41:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							ec7aafe7f0 
							
						 
					 
					
						
						
							
							UI: Details overhaul (buttons, language, tags)  
						
						 
						
						
						
					 
					
						2015-10-13 01:21:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							13f68935dd 
							
						 
					 
					
						
						
							
							Fixes star rating CSS  
						
						 
						
						
						
					 
					
						2015-10-12 17:31:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							af4f7396cd 
							
						 
					 
					
						
						
							
							Fix titles and covers  
						
						 
						
						
						
					 
					
						2015-10-12 04:04:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							597c1ef2a8 
							
						 
					 
					
						
						
							
							Make cover images equal size  
						
						 
						
						
						
					 
					
						2015-10-12 00:54:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							3c8685c986 
							
						 
					 
					
						
						
							
							Don't strip html tags for book description  
						
						 
						
						... 
						
						
						
						Fixes  #2  
						
					 
					
						2015-10-11 21:34:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							64a9cbce2d 
							
						 
					 
					
						
						
							
							Initial Fork from  https://bitbucket.org/raphaelmutschler/calibreserver/  
						
						 
						
						
						
					 
					
						2015-08-02 20:59:11 +02:00