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 
							
						 
					 
					
						
						
						
						
							
						
						
							ba44a15891 
							
						 
					 
					
						
						
							
							changes for  #77  
						
						... 
						
						
						
						Code cosmetics
#75 :
- More debug infos for kindlegen and sending e-mail.
- Button for sending test e-mail.
- timeout of 5min for sending e-mail 
						
					 
					
						2016-12-23 09:53:39 +01:00 
						 
				 
			
				
					
						
							
							
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c582ccf79c 
							
						 
					 
					
						
						
							
							Fix for  #78  
						
						
						
					 
					
						2016-12-20 07:45:04 +01:00 
						 
				 
			
				
					
						
							
							
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b878651e4e 
							
						 
					 
					
						
						
							
							Bugfix epub-Reader  
						
						
						
					 
					
						2016-11-13 12:13:32 +01:00 
						 
				 
			
				
					
						
							
							
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b86864b407 
							
						 
					 
					
						
						
							
							Made kindlegen working on windows (including paths containing umlauts)  
						
						... 
						
						
						
						Added back buttons on edit mail, edit user, and edit book 
						
					 
					
						2016-11-12 10:52:59 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							313116dca7 
							
						 
					 
					
						
						
							
							Uploader is working on windows  
						
						
						
					 
					
						2016-10-30 11:44:02 +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 
						 
				 
			
				
					
						
							
							
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7df88e70a3 
							
						 
					 
					
						
						
							
							First step fix for   #37  wrong search adress  
						
						... 
						
						
						
						@ jschuck, @jgillmann, could you please confirm that you can search now?
Do you still have logout/login problems? -> redirects to Hostname instead of hostname/calibre?
(got this too with apache server, where as search worked before) 
						
					 
					
						2016-10-04 20:46:35 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							0f8c308973 
							
						 
					 
					
						
						
							
							Fix for deleting kindle mail adresee  #54  
						
						
						
					 
					
						2016-08-08 21:01:38 +02:00 
						 
				 
			
				
					
						
							
							
								wuqi 
							
						 
					 
					
						
						
						
						
							
						
						
							26c293308c 
							
						 
					 
					
						
						
							
							mouse wheel  
						
						
						
					 
					
						2016-07-19 14:48:11 +08:00 
						 
				 
			
				
					
						
							
							
								wuqi 
							
						 
					 
					
						
						
						
						
							
						
						
							b846cc11d8 
							
						 
					 
					
						
						
							
							fix some error  
						
						... 
						
						
						
						Fix TypeError: 'bool' object is not callable 
						
					 
					
						2016-07-19 10:59:46 +08:00 
						 
				 
			
				
					
						
							
							
								wuqi 
							
						 
					 
					
						
						
						
						
							
						
						
							3a54ff0eb4 
							
						 
					 
					
						
						
							
							browser icon change back  
						
						
						
					 
					
						2016-07-16 17:26:40 +08:00 
						 
				 
			
				
					
						
							
							
								wuqi 
							
						 
					 
					
						
						
						
						
							
						
						
							ab97ead264 
							
						 
					 
					
						
						
							
							merge test  
						
						
						
					 
					
						2016-07-16 17:17:43 +08:00 
						 
				 
			
				
					
						
							
							
								wuqi 
							
						 
					 
					
						
						
						
						
							
						
						
							350f4e21e6 
							
						 
					 
					
						
						
							
							Add txt reader  
						
						... 
						
						
						
						add txt file reader,and add select for read the book 
						
					 
					
						2016-07-16 16:44:47 +08:00 
						 
				 
			
				
					
						
							
							
								janeczku 
							
						 
					 
					
						
						
						
						
							
						
						
							d051a1dbeb 
							
						 
					 
					
						
						
							
							Fix login/logout redirect with reverse proxy  
						
						
						
					 
					
						2016-07-15 14:29:57 +02: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 
							
						 
					 
					
						
						
						
						
							
						
						
							374cfd866d 
							
						 
					 
					
						
						
							
							Disable autocomplete in user edit  
						
						
						
					 
					
						2016-06-17 20:01:44 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							c26eb6aa08 
							
						 
					 
					
						
						
							
							add exclude tags to advanced search  
						
						
						
					 
					
						2016-05-03 14:27:38 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							80c3c19c01 
							
						 
					 
					
						
						
							
							some fixes for advanced search  
						
						
						
					 
					
						2016-05-03 11:00:45 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							7fce28790d 
							
						 
					 
					
						
						
							
							add search_form.html  
						
						
						
					 
					
						2016-05-02 23:25:21 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							431b6009a5 
							
						 
					 
					
						
						
							
							add advanced search  
						
						
						
					 
					
						2016-05-02 22:43:50 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							f66d7ce29b 
							
						 
					 
					
						
						
							
							add permission for changing own password  
						
						
						
					 
					
						2016-04-27 16:00:58 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							bc35250f28 
							
						 
					 
					
						
						
							
							permission fix in user_edit.html  
						
						
						
					 
					
						2016-04-27 10:39:52 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							c7b7b3866e 
							
						 
					 
					
						
						
							
							add user-permission management  
						
						
						
					 
					
						2016-04-27 10:35:23 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							b2146ba4b9 
							
						 
					 
					
						
						
							
							add support for is_multiple custom columns  
						
						
						
					 
					
						2016-04-21 19:18:52 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							3f1a54ea59 
							
						 
					 
					
						
						
							
							fix typo in detail.html  
						
						
						
					 
					
						2016-04-21 14:46:19 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							b7f71e563e 
							
						 
					 
					
						
						
							
							fix for custom column 'rating'  
						
						
						
					 
					
						2016-04-21 12:59:49 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							931981a37a 
							
						 
					 
					
						
						
							
							fix for custom column 'rating'  
						
						
						
					 
					
						2016-04-21 12:46:26 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							a21a9d6510 
							
						 
					 
					
						
						
							
							save rating as rating*2 in db and show rating/2 in interface  
						
						
						
					 
					
						2016-04-21 09:04:08 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							f57c9c5951 
							
						 
					 
					
						
						
							
							remove if clauses for int and float in edit_book.html  
						
						
						
					 
					
						2016-04-20 23:53:55 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							704198655b 
							
						 
					 
					
						
						
							
							custom columns unfinished  
						
						
						
					 
					
						2016-04-20 19:25:47 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							202cbc26a7 
							
						 
					 
					
						
						
							
							custom columns unfinished  
						
						
						
					 
					
						2016-04-20 19:25:47 +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 
						 
				 
			
				
					
						
							
							
								JanB 
							
						 
					 
					
						
						
						
						
							
						
						
							76c7cdf465 
							
						 
					 
					
						
						
							
							Add config option for upload feature  
						
						
						
					 
					
						2016-04-15 19:44:13 +02:00 
						 
				 
			
				
					
						
							
							
								JanB 
							
						 
					 
					
						
						
						
						
							
						
						
							952d389dc5 
							
						 
					 
					
						
						
							
							Ship config.ini with defaults; log errors to file; fix OPDS catalog name  
						
						
						
					 
					
						2016-04-15 18:54:23 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							1d295eb954 
							
						 
					 
					
						
						
							
							show 'read in browser' only for epubs  
						
						
						
					 
					
						2016-04-13 00:09:17 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							4e0621479a 
							
						 
					 
					
						
						
							
							don't show upload button for users  
						
						
						
					 
					
						2016-04-06 11:04:06 +02:00 
						 
				 
			
				
					
						
							
							
								Cervinko Cera 
							
						 
					 
					
						
						
						
						
							
						
						
							bda3055a19 
							
						 
					 
					
						
						
							
							improvements for pdf upload function  
						
						
						
					 
					
						2016-04-05 20:50:28 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							f163ef2202 
							
						 
					 
					
						
						
							
							make pretty filenames for downloads; remove random books section on most pages  
						
						
						
					 
					
						2016-03-26 16:12:29 +01:00 
						 
				 
			
				
					
						
							
							
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							350285607b 
							
						 
					 
					
						
						
							
							Add HTTP-BASIC Auth for OPDS downloads  
						
						
						
					 
					
						2015-10-13 19:06:37 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							6b4ddbe946 
							
						 
					 
					
						
						
							
							Fix: admin functions were accessible for regular users  
						
						
						
					 
					
						2015-10-13 18:07:17 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							e21e974457 
							
						 
					 
					
						
						
							
							Add public account registration  
						
						
						
					 
					
						2015-10-13 02:30:55 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							ec7aafe7f0 
							
						 
					 
					
						
						
							
							UI: Details overhaul (buttons, language, tags)  
						
						
						
					 
					
						2015-10-13 01:21:46 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							91c4effcec 
							
						 
					 
					
						
						
							
							Rename "Read online" button  
						
						
						
					 
					
						2015-10-12 17:45:45 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							9db94b04b1 
							
						 
					 
					
						
						
							
							Normal size for shelf button  
						
						
						
					 
					
						2015-10-12 17:38:05 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							79e20d13ee 
							
						 
					 
					
						
						
							
							Changed title logo  
						
						
						
					 
					
						2015-10-12 04:06:06 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							af4f7396cd 
							
						 
					 
					
						
						
							
							Fix titles and covers  
						
						
						
					 
					
						2015-10-12 04:04:47 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							2e4117eac2 
							
						 
					 
					
						
						
							
							support for removing books from shelfs  
						
						
						
					 
					
						2015-10-12 03:09:56 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							181a35c7b5 
							
						 
					 
					
						
						
							
							Fix description breakline  
						
						
						
					 
					
						2015-08-04 04:44:51 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							0b5b3b8424 
							
						 
					 
					
						
						
							
							User edit email fix  
						
						
						
					 
					
						2015-08-02 21:43:33 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							aef608aa10 
							
						 
					 
					
						
						
							
							Refactor (settings database, etc...)  
						
						
						
					 
					
						2015-08-02 21:23:24 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Broer 
							
						 
					 
					
						
						
						
						
							
						
						
							64a9cbce2d 
							
						 
					 
					
						
						
							
							Initial Fork from  https://bitbucket.org/raphaelmutschler/calibreserver/  
						
						
						
					 
					
						2015-08-02 20:59:11 +02:00