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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0be17ed157 
							
						 
					 
					
						
						
							
							Refactored sidebar (some parts are missing)  
						
						 
						
						
						
					 
					
						2019-03-04 19:34:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f0de822ce7 
							
						 
					 
					
						
						
							
							Start refactor sidebar and view settings sidebar  
						
						 
						
						
						
					 
					
						2019-03-03 19:42:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fb23db57b4 
							
						 
					 
					
						
						
							
							Added filtering of authors, series, categories, publishers  
						
						 
						
						
						
					 
					
						2019-03-03 15:37:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							11b770b3fb 
							
						 
					 
					
						
						
							
							Fix for  #830  
						
						 
						
						... 
						
						
						
						Fix user with umlauts 
						
					 
					
						2019-03-03 08:41:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fda977b155 
							
						 
					 
					
						
						
							
							Fix for users with umlauts  
						
						 
						
						
						
					 
					
						2019-03-03 08:38:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							68a36597ab 
							
						 
					 
					
						
						
							
							Fix opds login on python3  
						
						 
						
						
						
					 
					
						2019-03-03 07:37:15 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							de58d0a4d8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'metadata/Develop' into Develop  
						
						 
						
						... 
						
						
						
						Update logger for updater 
						
					 
					
						2019-03-01 19:09:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							361a1243d7 
							
						 
					 
					
						
						
							
							Improvements  #828  
						
						 
						
						
						
					 
					
						2019-02-27 19:30:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							15aa49e163 
							
						 
					 
					
						
						
							
							shorten authors in author / discover / index / search and shelf  
						
						 
						
						
						
					 
					
						2019-02-25 19:27:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							3272b4ca1e 
							
						 
					 
					
						
						
							
							configuration field for max_authors  
						
						 
						
						
						
					 
					
						2019-02-25 19:26:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f6fbe2e135 
							
						 
					 
					
						
						
							
							Fix   #766  
						
						 
						
						... 
						
						
						
						Update pdf upload
Translation of uploadprogress dialog 
						
					 
					
						2019-02-24 19:23:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cc3088c52f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/book_formats.py
#	cps/static/js/libs/bootstrap.min.js
#	cps/templates/detail.html
#	cps/templates/layout.html
#	cps/web.py
Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering 
						
					 
					
						2019-02-24 10:39:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0facb8fffa 
							
						 
					 
					
						
						
							
							Fix   #766  
						
						 
						
						
						
					 
					
						2019-02-23 18:28:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1a7052b287 
							
						 
					 
					
						
						
							
							Update pdf upload  
						
						 
						
						... 
						
						
						
						Translation of uploadprogress dialog 
						
					 
					
						2019-02-23 14:26:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							17b7333992 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'caliblur/master'  
						
						 
						
						
						
					 
					
						2019-02-20 20:00:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3d5d95904a 
							
						 
					 
					
						
						
							
							Oauth working somehow (?)  
						
						 
						
						
						
					 
					
						2019-02-17 19:10:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a0be02e687 
							
						 
					 
					
						
						
							
							Ldap working  
						
						 
						
						
						
					 
					
						2019-02-17 09:09:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							37007dafee 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md 
						
					 
					
						2019-02-16 10:17:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							56826f67fc 
							
						 
					 
					
						
						
							
							progressbar during upload thanks to jim3ma  
						
						 
						
						
						
					 
					
						2019-02-16 10:05:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0fa45f5800 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'github/master'  
						
						 
						
						... 
						
						
						
						Improvement for #814  
						
					 
					
						2019-02-16 08:03:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4230226716 
							
						 
					 
					
						
						
							
							Link fixes  
						
						 
						
						... 
						
						
						
						Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub 
						
					 
					
						2019-02-16 07:23:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1fc4bc5204 
							
						 
					 
					
						
						
							
							Fix routes  
						
						 
						
						... 
						
						
						
						Fix error page 
						
					 
					
						2019-02-09 19:01:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f5235b1d4c 
							
						 
					 
					
						
						
							
							Uploader progress bar  
						
						 
						
						... 
						
						
						
						Fixes imports and routes
Merge branch 'master' into Develop
Finished routing 
						
					 
					
						2019-02-09 18:46:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d6ee8f75e9 
							
						 
					 
					
						
						
							
							More refactoring  
						
						 
						
						
						
					 
					
						2019-02-08 20:12:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a00d93a2d9 
							
						 
					 
					
						
						
							
							Working again (basically)  
						
						 
						
						
						
					 
					
						2019-02-06 21:52:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							561d40f8ff 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2019-02-03 20:30:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc4b318e8 
							
						 
					 
					
						
						
							
							cover folders beautified  
						
						 
						
						
						
					 
					
						2019-02-03 20:29:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7f34073955 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/web.py
#	readme.md 
						
					 
					
						2019-02-03 17:33:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ea98323c06 
							
						 
					 
					
						
						
							
							Fixes Google Drive  
						
						 
						
						... 
						
						
						
						Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update 
						
					 
					
						2019-02-03 16:38:27 +01:00