Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ae9d4a749
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/web.py
#	cps/worker.py 
						
					 | 
					
						2019-04-14 18:18:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							55bdd13fb1
							
						
					 | 
					
						
						
							
							Fix #877
						
						
						
						
						
					 | 
					
						2019-04-14 17:54:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4552208c02
							
						
					 | 
					
						
						
							
							Fix #848
						
						
						
						
						
					 | 
					
						2019-04-14 16:37:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							436c2671d1
							
						
					 | 
					
						
						
							
							Fix delete domain entries
						
						
						
						
						
						
						
						Fix error handling smtp.authentication error 
						
					 | 
					
						2019-04-14 14:08:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							a669eacde9
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'proxy/patch-1'
						
						
						
						
						
					 | 
					
						2019-04-14 11:19:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2253708da7
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'proxy/patch-1' into Develop
						
						
						
						
						
					 | 
					
						2019-04-14 10:54:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							51e591bd25
							
						
					 | 
					
						
						
							
							Added updated translation
						
						
						
						
						
					 | 
					
						2019-04-13 16:46:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							5188c62bea
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'translation/loc-hu'
						
						
						
						
						
					 | 
					
						2019-04-13 16:45:05 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							e754ce313c
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'pycountry/pycountry'
						
						
						
						
						
					 | 
					
						2019-04-13 16:34:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc933f3d66
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'pdf.js/epubjs'
						
						
						
						
						
						
						
						Updated pdf.js 
						
					 | 
					
						2019-04-13 15:02:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Barnabás Nagy
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							afc79416b2
							
						
					 | 
					
						
						
							
							HU Translation updates
						
						
						
						
						
						
						
						Translation of the new untranslated strings 
						
					 | 
					
						2019-04-06 23:38:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Barnabás Nagy
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							93720c9fdf
							
						
					 | 
					
						
						
							
							Merge pull request #1 from janeczku/master
						
						
						
						
						
						
						
						Synch the master 
						
					 | 
					
						2019-04-06 23:06:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Josh Max
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							cdfb6bf3e3
							
						
					 | 
					
						
						
							
							Use HTTP_X_FORWARDED_HOST instead of HTTP_X_FORWARDED_SERVER
						
						
						
						
						
						
						
						Use HTTP_X_FORWARDED_HOST since HTTP_X_FORWARDED_SERVER holds the hostname of the proxy server on HAProxy/Traefik. 
						
					 | 
					
						2019-04-03 01:25:29 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Pavel
							
						 
					 | 
					
						
						
						
						
							
						
						
							858c80bb20
							
						
					 | 
					
						
						
							
							'except' style fix
						
						
						
						
						
					 | 
					
						2019-03-29 17:06:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Pavel
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7e640fd98
							
						
					 | 
					
						
						
							
							support pycountry if iso-639 is not available
						
						
						
						
						
					 | 
					
						2019-03-29 07:00:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Pavel
							
						 
					 | 
					
						
						
						
						
							
						
						
							439ce19b5d
							
						
					 | 
					
						
						
							
							Updated epub.js to v0.3.66
						
						
						
						
						
					 | 
					
						2019-03-28 07:23:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c9ff6421d
							
						
					 | 
					
						
						
							
							Fix uploader
						
						
						
						
						
					 | 
					
						2019-03-26 18:23:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b301a7961
							
						
					 | 
					
						
						
							
							Additional fix for #845 (in case of error)
						
						
						
						
						
					 | 
					
						2019-03-26 18:19:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc93222579
							
						
					 | 
					
						
						
							
							Update 2 column author list view
						
						
						
						
						
					 | 
					
						2019-03-26 17:54:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							772f978b45
							
						
					 | 
					
						
						
							
							Improved code quality
						
						
						
						
						
					 | 
					
						2019-03-24 16:24:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f1db18eae
							
						
					 | 
					
						
						
							
							Simplified typeahead
						
						
						
						
						
					 | 
					
						2019-03-24 16:14:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6940bb9b88
							
						
					 | 
					
						
						
							
							Code improvement
						
						
						
						
						
					 | 
					
						2019-03-24 15:58:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							07649d04a3
							
						
					 | 
					
						
						
							
							Fix updater
						
						
						
						
						
						
						
						Update translations
Code cleaning updater 
						
					 | 
					
						2019-03-24 15:27:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							39a3f70084
							
						
					 | 
					
						
						
							
							Fix for slow updater
						
						
						
						
						
					 | 
					
						2019-03-24 15:22:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8923e71220
							
						
					 | 
					
						
						
							
							Remove debug logging
						
						
						
						
						
					 | 
					
						2019-03-24 15:18:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							843a93fe28
							
						
					 | 
					
						
						
							
							Updater fix for slow servers
						
						
						
						
						
					 | 
					
						2019-03-24 15:15:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							fa36072699
							
						
					 | 
					
						
						
							
							Fix uk translation-file
						
						
						
						
						
					 | 
					
						2019-03-24 08:18:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ab9365688
							
						
					 | 
					
						
						
							
							Prevent error 500 for cover of not exisiting book
						
						
						
						
						
					 | 
					
						2019-03-23 20:29:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chad Bergeron
							
						 
					 | 
					
						
						
						
						
							
						
						
							169ace777a
							
						
					 | 
					
						
						
							
							Fixed infinite scroll for read and unread displays (#855)
						
						
						
						
						
					 | 
					
						2019-03-21 19:18:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elifcan Cakmak
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec2103a3d0
							
						
					 | 
					
						
						
							
							fixed a bug that affects allowing password change for users (#854)
						
						
						
						
						
					 | 
					
						2019-03-20 13:06:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5593d9a7f
							
						
					 | 
					
						
						
							
							Integrated author in sorting functions
						
						
						
						
						
					 | 
					
						2019-03-16 21:14:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f2a9c8bae
							
						
					 | 
					
						
						
							
							Code improvement
						
						
						
						
						
					 | 
					
						2019-03-16 17:33:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c69589c5b
							
						
					 | 
					
						
						
							
							Code cosmetics unrar.js
						
						
						
						
						
					 | 
					
						2019-03-16 17:30:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							149e9b4bd4
							
						
					 | 
					
						
						
							
							Code cosmetis unrar
						
						
						
						
						
					 | 
					
						2019-03-16 17:28:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							a360b1759a
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
						
						
						bugfix import HttpError from pydrive 
						
					 | 
					
						2019-03-16 17:20:14 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							1db1c2e7df
							
						
					 | 
					
						
						
							
							Enabling LDAP working again
						
						
						
						
						
						
						
						LDAP/Github oauth and Google oauth no credentials/parameters are rejected now 
						
					 | 
					
						2019-03-10 11:12:44 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							76d40411dd
							
						
					 | 
					
						
						
							
							Translation updated
						
						
						
						
						
					 | 
					
						2019-03-10 08:04:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8612dce97c
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'author/shorten-authors'
						
						
						
						
						
					 | 
					
						2019-03-09 20:14:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b0e62fdf2
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'dialog/master'
						
						
						
						
						
						
						
						Fix for #833 
						
					 | 
					
						2019-03-09 20:02:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f80a63ca6
							
						
					 | 
					
						
						
							
							Fix for #827
						
						
						
						
						
					 | 
					
						2019-03-09 07:05:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Sullivan
							
						 
					 | 
					
						
						
						
						
							
						
						
							3dfc2f2580
							
						
					 | 
					
						
						
							
							fixing issue #833
						
						
						
						
						
					 | 
					
						2019-03-08 20:44:45 -05:00 | 
					
					
						
						
							
							
							
						
					 |