Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e734bb120a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'github/config_sql' into Develop  
						
						 
						
						
						
					 
					
						2019-07-09 19:29:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Pavel 
							
						 
					 
					
						
						
						
						
							
						
						
							006e596c72 
							
						 
					 
					
						
						
							
							Moved config class into separate file.  
						
						 
						
						... 
						
						
						
						Moved Goodreads and LDAP services into separate package. 
						
					 
					
						2019-07-07 16:05:51 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							499a66dfb0 
							
						 
					 
					
						
						
							
							Additional glyphicons for music on search and author page  
						
						 
						
						... 
						
						
						
						Fix duplicate user and email (now case insensitive)
Output of calibre on stderr is now logged (full traceback in debug-log, otherwise, only errormessage)
Natural sorting for comic reader
Fix for long running tasks 
						
					 
					
						2019-07-06 14:46:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ad44e58c7a 
							
						 
					 
					
						
						
							
							Sorting for comics  
						
						 
						
						... 
						
						
						
						Audiobook support 
						
					 
					
						2019-06-29 14:23:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							32af660f86 
							
						 
					 
					
						
						
							
							Improvements for logfile viewer  
						
						 
						
						... 
						
						
						
						Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE) 
						
					 
					
						2019-06-22 19:55:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f40fc5aa75 
							
						 
					 
					
						
						
							
							Update LDAP  
						
						 
						
						
						
					 
					
						2019-06-16 08:59:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9b74d51f21 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'ldap/master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/server.py
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	optional-requirements-ldap.txt
#	setup.cfg 
						
					 
					
						2019-06-16 08:20:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d45b1b8ea5 
							
						 
					 
					
						
						
							
							Fix   #937  
						
						 
						
						... 
						
						
						
						logviewerintegrated
Code cosmetics 
						
					 
					
						2019-06-15 21:18:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							546ed65e1d 
							
						 
					 
					
						
						
							
							Update logging  
						
						 
						
						... 
						
						
						
						Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress 
						
					 
					
						2019-06-10 14:15:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							14b6202eec 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						... 
						
						
						
						Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script 
						
					 
					
						2019-06-08 13:45:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							50973ffb72 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop  
						
						 
						
						
						
					 
					
						2019-06-08 06:52:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Krakinou 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9a5ab97d78 
							
						 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						 
						
						
						
					 
					
						2019-06-08 01:41:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Krakinou 
							
						 
					 
					
						
						
						
						
							
						
						
							97d12b94f6 
							
						 
					 
					
						
						
							
							Correct settings update  
						
						 
						
						
						
					 
					
						2019-06-04 00:47:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Krakinou 
							
						 
					 
					
						
						
						
						
							
						
						
							e4d801bbaf 
							
						 
					 
					
						
						
							
							initial flask_simpleldap implementation  
						
						 
						
						
						
					 
					
						2019-06-02 22:07:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4fecce0a0d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/helper.py
#	cps/static/js/archive/unrar.js
#	cps/templates/readcbr.html
#	cps/templates/readpdf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.mo
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.mo
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.mo
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.mo
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.mo
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
#	optional-requirements.txt 
						
					 
					
						2019-05-31 11:17:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							26e45f1f57 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'comic-reader/master'  
						
						 
						
						
						
					 
					
						2019-05-31 08:43:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ecedf92783 
							
						 
					 
					
						
						
							
							Update version  
						
						 
						
						... 
						
						
						
						Make custom columns visible (#904 ) 
						
					 
					
						2019-05-30 10:21:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d106ada9ed 
							
						 
					 
					
						
						
							
							Changed version  
						
						 
						
						... 
						
						
						
						Update translation 
						
					 
					
						2019-05-30 09:07:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ed91048a63 
							
						 
					 
					
						
						
							
							Fix for magic link with python 3  
						
						 
						
						
						
					 
					
						2019-05-26 11:31:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f70c839014 
							
						 
					 
					
						
						
							
							Added additional permission viewer  
						
						 
						
						
						
					 
					
						2019-05-19 18:39:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e6ff2f1d90 
							
						 
					 
					
						
						
							
							Fix file not found loading-icon.gif  
						
						 
						
						
						
					 
					
						2019-05-16 19:42:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0c80f5c63a 
							
						 
					 
					
						
						
							
							Update Teststatus  
						
						 
						
						
						
					 
					
						2019-05-12 19:44:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								subdiox 
							
						 
					 
					
						
						
						
						
							
						
						
							c0d136ccd8 
							
						 
					 
					
						
						
							
							Fix slow loading  
						
						 
						
						
						
					 
					
						2019-05-10 08:16:03 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a42ebdc096 
							
						 
					 
					
						
						
							
							Fix for  #897  
						
						 
						
						
						
					 
					
						2019-05-07 19:54:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9b3b2acb49 
							
						 
					 
					
						
						
							
							Sort button is correctly visible on list pages  
						
						 
						
						... 
						
						
						
						Publisher list is working 
						
					 
					
						2019-04-22 19:17:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							406d1c76c9 
							
						 
					 
					
						
						
							
							Sorting and filtering of lists working (except file formats)  
						
						 
						
						... 
						
						
						
						Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view 
						
					 
					
						2019-04-22 19:11:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								subdiox 
							
						 
					 
					
						
						
						
						
							
						
						
							c2bfb29726 
							
						 
					 
					
						
						
							
							Add reading direction settings to readcbr page  
						
						 
						
						
						
					 
					
						2019-04-21 18:20:15 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2de4bfdcf2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/book_formats.py
#	cps/helper.py
#	cps/web.py 
						
					 
					
						2019-04-20 18:32:46 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							4ae9d4a749 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/web.py
#	cps/worker.py 
						
					 
					
						2019-04-14 18:18:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4552208c02 
							
						 
					 
					
						
						
							
							Fix   #848  
						
						 
						
						
						
					 
					
						2019-04-14 16:37:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2a5f2ff7b3 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/readpdf.html
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/web.py 
						
					 
					
						2019-04-13 16:42:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							dc933f3d66 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'pdf.js/epubjs'  
						
						 
						
						... 
						
						
						
						Updated pdf.js 
						
					 
					
						2019-04-13 15:02:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Pavel 
							
						 
					 
					
						
						
						
						
							
						
						
							439ce19b5d 
							
						 
					 
					
						
						
							
							Updated epub.js to v0.3.66  
						
						 
						
						
						
					 
					
						2019-03-28 07:23:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							dc93222579 
							
						 
					 
					
						
						
							
							Update 2 column author list view  
						
						 
						
						
						
					 
					
						2019-03-26 17:54:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							07649d04a3 
							
						 
					 
					
						
						
							
							Fix updater  
						
						 
						
						... 
						
						
						
						Update translations
Code cleaning updater 
						
					 
					
						2019-03-24 15:27:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e5593d9a7f 
							
						 
					 
					
						
						
							
							Integrated author in sorting functions  
						
						 
						
						
						
					 
					
						2019-03-16 21:14:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							765b817384 
							
						 
					 
					
						
						
							
							Refactored shelf.py and editbooks.py  
						
						 
						
						
						
					 
					
						2019-03-16 16:53:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							baf83b2f5a 
							
						 
					 
					
						
						
							
							Refactored generating download links  
						
						 
						
						
						
					 
					
						2019-03-16 16:23:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9c1b3f136f 
							
						 
					 
					
						
						
							
							Improved sorting for rated,random, hot books, read/unread book  
						
						 
						
						
						
					 
					
						2019-03-16 15:48:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a66873a9e2 
							
						 
					 
					
						
						
							
							Added file formats view  
						
						 
						
						
						
					 
					
						2019-03-11 18:42:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a0a15b4598 
							
						 
					 
					
						
						
							
							Fix max authors shown  
						
						 
						
						
						
					 
					
						2019-03-10 19:26:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4a33278596 
							
						 
					 
					
						
						
							
							Update ratings  
						
						 
						
						
						
					 
					
						2019-03-10 19:22:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6d2270d931 
							
						 
					 
					
						
						
							
							Fixes for Oauth  
						
						 
						
						
						
					 
					
						2019-03-10 12:54:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							da3fcb9a72 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot 
						
					 
					
						2019-03-10 08:31:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8612dce97c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'author/shorten-authors'  
						
						 
						
						
						
					 
					
						2019-03-09 20:14:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9144a7ceb9 
							
						 
					 
					
						
						
							
							Fix for sqlalchemy 1.3  
						
						 
						
						
						
					 
					
						2019-03-08 16:29:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							feb6a71f95 
							
						 
					 
					
						
						
							
							Fix uncompressed cbz files  
						
						 
						
						... 
						
						
						
						merge from master -> file extension limitation 
						
					 
					
						2019-03-05 20:59:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f483ca3214 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						... 
						
						
						
						Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature 
						
					 
					
						2019-03-05 17:34:51 +01:00