Ozzieisaacs 0cc2b49296 Merge branch 'master' into Develop ... # Conflicts: # cps/templates/book_edit.html		2020-05-12 19:10:19 +02:00
..
admin.html	UI Improvements	2020-05-03 10:55:33 +02:00
author.html
book_edit.html	Fix #1390	2020-05-12 19:08:51 +02:00
book_exists_flash.html
book_table.html	Added table view for books	2020-05-12 16:32:26 +02:00
config_edit.html	Automatic username (#1172)	2020-05-12 17:23:58 +02:00
config_view_edit.html	Merge branch 'master' into Develop	2020-05-06 18:47:33 +02:00
detail.html	Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu)	2020-05-12 14:39:13 +02:00
discover.html
email_edit.html	#1141 (Setting for file size limit on email)	2020-05-09 20:29:17 +02:00
feed.xml	Merge remote-tracking branch 'opds/master'	2020-04-26 18:55:23 +02:00
fragment.html
generate_kobo_auth_url.html
grid.html	Fix button color that now matches HEAD on master	2020-04-18 23:32:15 -04:00
http_error.html
index.html
index.xml	Fix opds format errors & extend info	2020-04-11 00:06:50 +08:00
json.txt
languages.html
layout.html	Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop	2020-05-01 17:25:13 +02:00
list.html	Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop	2020-05-01 17:25:13 +02:00
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	Config Options for limiting email size, change username to e-mail adress, use kepubify	2020-05-04 18:19:30 +02:00
readpdf.html
readtxt.html
register.html	Automatic username (#1172)	2020-05-12 17:23:58 +02:00
remote_login.html
search_form.html	UI Improvements	2020-05-03 10:55:33 +02:00
search.html	Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu)	2020-05-12 14:39:13 +02:00
shelf_edit.html
shelf_order.html
shelf.html
shelfdown.html
stats.html	Fixes for oauth login after programming basic tests	2020-04-15 22:03:21 +02:00
tasks.html
user_edit.html	UI Improvements	2020-05-03 10:55:33 +02:00