Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9bc085a23e
							
						
					 | 
					
						
						
							
							Fixes for comic reader
						
						
						
						
						
					 | 
					
						2020-05-02 09:35:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a92d79ec0
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/static/css/style.css
#	cps/ub.py
#	cps/web.py 
						
					 | 
					
						2020-05-01 17:25:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b95f6563cc
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'read-config/remove-duplicate-read-status-without-filter' into Develop
						
						
						
						
						
					 | 
					
						2020-05-01 17:19:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							700cb3b553
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'NL/master'
						
						
						
						
						
						
						
						Updated all strings 
						
					 | 
					
						2020-05-01 17:15:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8646f8f23a
							
						
					 | 
					
						
						
							
							Merge branch 'Develop'
						
						
						
						
						
						
						
						# Conflicts:
#	cps/__init__.py 
						
					 | 
					
						2020-05-01 14:51:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c5d76908a
							
						
					 | 
					
						
						
							
							Added missing upload format
						
						
						
						
						
					 | 
					
						2020-05-01 13:34:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							832b34fc54
							
						
					 | 
					
						
						
							
							Improved errorhandling for resending password
						
						
						
						
						
						
						
						Improved errorhandling for editing user 
						
					 | 
					
						2020-05-01 12:00:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							000b85ff81
							
						
					 | 
					
						
						
							
							Fixes for deleting books(error handling and user feedback)
						
						
						
						
						
					 | 
					
						2020-05-01 10:26:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb317d54f2
							
						
					 | 
					
						
						
							
							Fix reject reset password without configured email server
						
						
						
						
						
					 | 
					
						2020-05-01 08:37:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6f41d8dc0
							
						
					 | 
					
						
						
							
							Fix error 404 on reset password (Fix #1342)
						
						
						
						
						
					 | 
					
						2020-05-01 08:33:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marcel
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6dff5ed679
							
						
					 | 
					
						
						
							
							NL language update
						
						
						
						
						
					 | 
					
						2020-04-30 21:30:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb8b6310d5
							
						
					 | 
					
						
						
							
							Fix from tests
						
						
						
						
						
					 | 
					
						2020-04-30 20:58:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							02aaf17ac5
							
						
					 | 
					
						
						
							
							Fix #1339 (Proxyfix import with old werkzeug versions causes traceback)
						
						
						
						
						
					 | 
					
						2020-04-30 19:21:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b160a8de0b
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/__init__.py
#	cps/comic.py
#	cps/editbooks.py
#	cps/helper.py
#	cps/kobo.py
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/uploader.py
#	cps/web.py 
						
					 | 
					
						2020-04-30 18:08:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3246fd751
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'key'
						
						
						
						
						
					 | 
					
						2020-04-30 17:29:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb18ab1ca5
							
						
					 | 
					
						
						
							
							Fix #866 (Recent book sidebar element can't be removed anymore)
						
						
						
						
						
					 | 
					
						2020-04-29 18:57:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							01ff55c84e
							
						
					 | 
					
						
						
							
							Removed non working filters for search
						
						
						
						
						
					 | 
					
						2020-04-29 17:57:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jvoisin
							
						 
					 | 
					
						
						
						
						
							
						
						
							523aab2e9e
							
						
					 | 
					
						
						
							
							Don't use an hardcoded session key
						
						
						
						
						
						
						
						This fixes a trivial authentication bypass,
according to https://flask.palletsprojects.com/en/1.1.x/quickstart/#sessions 
						
					 | 
					
						2020-04-29 13:59:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a7d9da654
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'js_caliblur/xss'
						
						
						
						
						
					 | 
					
						2020-04-29 12:08:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9446556a1
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'ru/master'
						
						
						
						
						
					 | 
					
						2020-04-29 12:06:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jvoisin
							
						 
					 | 
					
						
						
						
						
							
						
						
							806a5f209f
							
						
					 | 
					
						
						
							
							Fix two minor xss
						
						
						
						
						
					 | 
					
						2020-04-29 11:33:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ZIzA
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c864b368b0
							
						
					 | 
					
						
						
							
							Russian language update
						
						
						
						
						
					 | 
					
						2020-04-29 01:30:14 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							27eb09fb19
							
						
					 | 
					
						
						
							
							Add unrar Support
						
						
						
						
						
					 | 
					
						2020-04-28 20:23:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							bea7223a0a
							
						
					 | 
					
						
						
							
							Renabled cbrimage extraction (via unrar and rarfile)
						
						
						
						
						
					 | 
					
						2020-04-28 16:50:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0297823bda
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'codecosmetic/move_var'
						
						
						
						
						
					 | 
					
						2020-04-28 15:33:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d1bce5c2d9
							
						
					 | 
					
						
						
							
							Update nl translation from development branch
						
						
						
						
						
					 | 
					
						2020-04-27 21:15:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							46c0ae3ccc
							
						
					 | 
					
						
						
							
							Revert accidently deleted nl translation strings
						
						
						
						
						
					 | 
					
						2020-04-27 21:11:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce6b689147
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
					 | 
					
						2020-04-27 20:22:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d92818613
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
					 | 
					
						2020-04-27 20:01:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jvoisin
							
						 
					 | 
					
						
						
						
						
							
						
						
							487878819e
							
						
					 | 
					
						
						
							
							Move a few variables around
						
						
						
						
						
						
						
						This should prevent a couple of crashes
due to undeclared variables. 
						
					 | 
					
						2020-04-27 12:03:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6682b1ced1
							
						
					 | 
					
						
						
							
							Fix download of book covers with enabled pillow from url
						
						
						
						
						
					 | 
					
						2020-04-26 21:00:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc89b0658a
							
						
					 | 
					
						
						
							
							Fix deletion of books with multiple custom column links
						
						
						
						
						
						
						
						Fix delete of author-folder in case last book of author was deleted (#1269) 
						
					 | 
					
						2020-04-26 20:44:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9dde36c74
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'improve_read/sort-book-name' search results are ordered according to sort field in book title
						
						
						
						
						
					 | 
					
						2020-04-26 19:00:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							44284ea5fb
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'opds/master'
						
						
						
						
						
						
						
						# Conflicts:
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot 
						
					 | 
					
						2020-04-26 18:55:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f0c0b34af
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'order_category/master'
						
						
						
						
						
					 | 
					
						2020-04-26 18:50:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							87ec44aed5
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'
						
						
						
						
						
					 | 
					
						2020-04-26 18:38:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							898e6b4f80
							
						
					 | 
					
						
						
							
							Calibre-Web is rebooted everytime login type ic shanged (from and to standard authentication and between login methods)
						
						
						
						
						
					 | 
					
						2020-04-26 18:24:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							dea2600913
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'oauth/patch-2' Fix oauth in combination with nginx reverse proxy
						
						
						
						
						
					 | 
					
						2020-04-26 18:23:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc46ad16ae
							
						
					 | 
					
						
						
							
							Bugfix view shelfs on book detail page
						
						
						
						
						
					 | 
					
						2020-04-26 11:35:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							456550a943
							
						
					 | 
					
						
						
							
							Bugfix view shelfs on detiled page
						
						
						
						
						
						
						
						bugfix datetime in archive mode 
						
					 | 
					
						2020-04-26 11:34:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b789b3701
							
						
					 | 
					
						
						
							
							Fix opds with shelves
						
						
						
						
						
						
						
						Fix errorhandler ldap without ldap 
						
					 | 
					
						2020-04-26 08:40:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0480d493cf
							
						
					 | 
					
						
						
							
							Fix opds login with ldap, if ldap server is down
						
						
						
						
						
					 | 
					
						2020-04-25 21:12:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b4d7733e0a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/templates/list.html
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot 
						
					 | 
					
						2020-04-25 20:06:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b8fe7a0ae
							
						
					 | 
					
						
						
							
							bugfix on create shelv via kobo sync protocol
						
						
						
						
						
						
						
						bugfix for totally wrong json requests
prevent empty shelf names on kobo create shelf
Removed errorhandler 404 
						
					 | 
					
						2020-04-25 20:02:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d657330584
							
						
					 | 
					
						
						
							
							Fix for removing admin role from last admin user (in addition to prevent delete of last admin user) #1326
						
						
						
						
						
					 | 
					
						2020-04-25 07:13:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							36cb79de62
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'turkish/master'
						
						
						
						
						
					 | 
					
						2020-04-24 22:14:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							063ee5e855
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'remove_usage_local_var_undeclared'
						
						
						
						
						
						
						
						Code cosmetics 
						
					 | 
					
						2020-04-24 21:05:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7393b69757
							
						
					 | 
					
						
						
							
							Fix for #1326 (typo)
						
						
						
						
						
					 | 
					
						2020-04-24 19:25:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8bd1903d98
							
						
					 | 
					
						
						
							
							Fix for #1326 (opds feed user login not working -> download was not possible)
						
						
						
						
						
					 | 
					
						2020-04-24 18:37:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jvoisin
							
						 
					 | 
					
						
						
						
						
							
						
						
							d8bf540db2
							
						
					 | 
					
						
						
							
							Remove an undeclared and useless local variable
						
						
						
						
						
					 | 
					
						2020-04-24 18:04:27 +02:00 | 
					
					
						
						
							
							
							
						
					 |