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 4fecce0a0d Merge branch 'master' into Develop ... # Conflicts: # cps/helper.py # cps/static/js/archive/unrar.js # cps/templates/readcbr.html # cps/templates/readpdf.html # cps/translations/de/LC_MESSAGES/messages.mo # cps/translations/de/LC_MESSAGES/messages.po # cps/translations/es/LC_MESSAGES/messages.mo # cps/translations/es/LC_MESSAGES/messages.po # cps/translations/fr/LC_MESSAGES/messages.mo # cps/translations/fr/LC_MESSAGES/messages.po # cps/translations/it/LC_MESSAGES/messages.mo # cps/translations/it/LC_MESSAGES/messages.po # cps/translations/ja/LC_MESSAGES/messages.mo # cps/translations/ja/LC_MESSAGES/messages.po # cps/translations/km/LC_MESSAGES/messages.mo # cps/translations/km/LC_MESSAGES/messages.po # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/translations/pl/LC_MESSAGES/messages.mo # cps/translations/pl/LC_MESSAGES/messages.po # cps/translations/ru/LC_MESSAGES/messages.mo # cps/translations/ru/LC_MESSAGES/messages.po # cps/translations/sv/LC_MESSAGES/messages.mo # cps/translations/sv/LC_MESSAGES/messages.po # cps/translations/uk/LC_MESSAGES/messages.mo # cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo # cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po # cps/web.py # messages.pot # optional-requirements.txt		6 years ago
..
admin.html	Merge branch 'master' into Develop	6 years ago
author.html	Sorting and filtering of lists working (except file formats)	6 years ago
book_edit.html	Sorting and filtering of lists working (except file formats)	6 years ago
config_edit.html	Fix for sqlalchemy 1.3	6 years ago
config_view_edit.html	Added additional permission viewer	6 years ago
detail.html	Merge branch 'master' into Develop	6 years ago
discover.html	Integrated author in sorting functions	6 years ago
email_edit.html	Uploader progress bar	6 years ago
feed.xml	Refactored generating download links	6 years ago
fragment.html	Show book details in modal dialog	7 years ago
http_error.html	Fix routes	6 years ago
index.html	Update Teststatus	6 years ago
index.xml	Link fixes	6 years ago
json.txt	Refactored generating download links	6 years ago
languages.html	Uploader progress bar	6 years ago
layout.html	Improved sorting for rated,random, hot books, read/unread book	6 years ago
list.html	Sort button is correctly visible on list pages	6 years ago
listenmp3.html	Sorting and filtering of lists working (except file formats)	6 years ago
login.html	Oauth working somehow (?)	6 years ago
osd.xml	Fix for #830	6 years ago
read.html	Merge branch 'master' into Develop	6 years ago
readcbr.html	Merge branch 'master' into Develop	6 years ago
readpdf.html	Merge branch 'master' into Develop	6 years ago
readtxt.html	Uploader progress bar	6 years ago
register.html	Uploader progress bar	6 years ago
remote_login.html	Merge branch 'master' into Develop	6 years ago
search.html	Fix updater	6 years ago
search_form.html	Working again (basically)	6 years ago
shelf.html	Sorting and filtering of lists working (except file formats)	6 years ago
shelf_edit.html	More refactoring	6 years ago
shelf_order.html	Uploader progress bar	6 years ago
shelfdown.html	Integrated author in sorting functions	6 years ago
stats.html	Fix #590, #589.	6 years ago
tasks.html	Working again (basically)	6 years ago
user_edit.html	Added additional permission viewer	6 years ago