Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop ... # Conflicts: # cps/config_sql.py # cps/ub.py # cps/web.py		2020-04-16 20:12:27 +02:00
..
admin.html	Added fix for python2 regex	2020-04-14 10:58:32 +02:00
author.html	Fix (#1103) Internal server error with Goodreads and no result for author name on Goodreads	2019-12-12 20:08:16 +01:00
book_edit.html
book_exists_flash.html	Fix pdf cover	2019-11-26 08:19:03 +01:00
config_edit.html	Added fix for python2 regex	2020-04-14 10:58:32 +02:00
config_view_edit.html
detail.html
discover.html
email_edit.html
feed.xml
fragment.html
generate_kobo_auth_url.html	Update Translation (german and russian)	2020-02-24 19:38:12 +01:00
http_error.html	Chang link to issue template	2020-03-07 11:27:50 +01:00
index.html
index.xml
json.txt
languages.html
layout.html	Added redirect after create shelf	2020-04-02 20:19:05 +02:00
list.html
listenmp3.html
login.html	Fixes for oauth login after programming basic tests	2020-04-15 22:03:21 +02:00
logviewer.html
modal_restriction.html	Merge remote-tracking branch 'english/master'	2020-04-03 19:46:26 +02:00
osd.xml
read.html
readcbr.html	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00
readpdf.html	Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)	2020-02-29 09:55:54 +01:00
readtxt.html
register.html
remote_login.html	English Language Updates	2020-02-03 14:22:00 +11:00
search_form.html
search.html	Update shelfs handling, bugfix changed updater	2020-04-02 18:23:24 +02:00
shelf_edit.html	English Language Updates	2020-02-03 14:22:00 +11:00
shelf_order.html
shelf.html
shelfdown.html	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00
stats.html	Fixes for oauth login after programming basic tests	2020-04-15 22:03:21 +02:00
tasks.html
user_edit.html	Fix for #1307 (Oauth login not working)	2020-04-16 17:58:42 +02:00