You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		4 years ago
..
admin.html	Added fix for python2 regex	4 years ago
author.html	Fix (#1103) Internal server error with Goodreads and no result for author name on Goodreads	5 years ago
book_edit.html	Merge remote-tracking branch 'kobo/shelves' into Develop	4 years ago
book_exists_flash.html	Fix pdf cover	5 years ago
config_edit.html	Fix for #1087 ( Caliblur! Theme button alignment)	4 years ago
config_view_edit.html	Merge remote-tracking branch 'English_texts/master'	4 years ago
detail.html	Fix #1309 (fix duplicate shelf names in book detail view)	4 years ago
discover.html	Merge branch 'Develop'	5 years ago
email_edit.html	Update Translation	4 years ago
feed.xml	Update shelfs handling, bugfix changed updater	4 years ago
fragment.html	Show book details in modal dialog	7 years ago
generate_kobo_auth_url.html	Update Translation (german and russian)	4 years ago
http_error.html	Chang link to issue template	4 years ago
index.html	English Language V2	4 years ago
index.xml	Update shelfs handling, bugfix changed updater	4 years ago
json.txt	Cover upload gives Error 500 fix #972 (leftover from refactoring)	5 years ago
languages.html	Fix for display of format, series, category, ratings,	5 years ago
layout.html	Added redirect after create shelf	4 years ago
list.html	Code cosmetics	4 years ago
listenmp3.html	English Language Updates	4 years ago
login.html	Fixes for oauth login after programming basic tests	4 years ago
logviewer.html	English Language Updates	4 years ago
modal_restriction.html	Merge remote-tracking branch 'english/master'	4 years ago
osd.xml	Fixes for Kobo sync	4 years ago
read.html	English Language Updates	4 years ago
readcbr.html	Merge branch 'Develop'	5 years ago
readpdf.html	Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)	4 years ago
readtxt.html	Merge from master	5 years ago
register.html	English Language Updates	4 years ago
remote_login.html	English Language Updates	4 years ago
search.html	Update shelfs handling, bugfix changed updater	4 years ago
search_form.html	Merge remote-tracking branch 'English_texts/master'	4 years ago
shelf.html	Update Translation	4 years ago
shelf_edit.html	English Language Updates	4 years ago
shelf_order.html	Merge remote-tracking branch 'English_texts/master'	4 years ago
shelfdown.html	Merge branch 'Develop'	5 years ago
stats.html	Fixes for oauth login after programming basic tests	4 years ago
tasks.html	English Language Updates	4 years ago
user_edit.html	Fix text in user config section (random books in Detail View)	4 years ago