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
..
admin.html	Added fix for python2 regex	2020-04-14 10:58:32 +02:00
author.html
book_edit.html	Merge remote-tracking branch 'kobo/shelves' into Develop	2020-04-24 16:56:08 +02:00
book_exists_flash.html
config_edit.html	Fix for #1087 ( Caliblur! Theme button alignment)	2020-04-17 18:16:28 +02:00
config_view_edit.html	Merge remote-tracking branch 'English_texts/master'	2020-02-23 13:27:44 +01:00
detail.html	Fix #1309 (fix duplicate shelf names in book detail view)	2020-04-18 21:15:02 +02:00
discover.html
email_edit.html	Update Translation	2020-02-23 20:07:21 +01:00
feed.xml	Update shelfs handling, bugfix changed updater	2020-04-02 18:23:24 +02:00
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	English Language V2	2020-03-19 13:10:10 +11:00
index.xml	Update shelfs handling, bugfix changed updater	2020-04-02 18:23:24 +02:00
json.txt
languages.html
layout.html	Added redirect after create shelf	2020-04-02 20:19:05 +02:00
list.html	Code cosmetics	2020-04-19 19:08:58 +02:00
listenmp3.html	English Language Updates	2020-02-03 14:22:00 +11:00
login.html	Fixes for oauth login after programming basic tests	2020-04-15 22:03:21 +02:00
logviewer.html	English Language Updates	2020-02-03 14:22:00 +11:00
modal_restriction.html	Merge remote-tracking branch 'english/master'	2020-04-03 19:46:26 +02:00
osd.xml	Fixes for Kobo sync	2020-03-07 11:07:43 +01:00
read.html	English Language Updates	2020-02-03 14:22:00 +11:00
readcbr.html
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	English Language Updates	2020-02-03 14:22:00 +11:00
remote_login.html	English Language Updates	2020-02-03 14:22:00 +11:00
search_form.html	Merge remote-tracking branch 'English_texts/master'	2020-02-23 13:27:44 +01:00
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	Merge remote-tracking branch 'English_texts/master'	2020-02-23 13:27:44 +01:00
shelf.html	Update Translation	2020-02-23 20:07:21 +01:00
shelfdown.html
stats.html	Fixes for oauth login after programming basic tests	2020-04-15 22:03:21 +02:00
tasks.html	English Language Updates	2020-02-03 14:22:00 +11:00
user_edit.html	Fix text in user config section (random books in Detail View)	2020-04-18 21:30:28 +02:00