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

2019-05-31 11:17:47 +02:00

..

admin.html

Merge branch 'master' into Develop

2019-05-31 11:17:47 +02:00

author.html

Sorting and filtering of lists working (except file formats)

2019-04-22 19:11:35 +02:00

book_edit.html

Sorting and filtering of lists working (except file formats)

2019-04-22 19:11:35 +02:00

config_edit.html

Fix for sqlalchemy 1.3

2019-03-08 16:29:12 +01:00

config_view_edit.html

Added additional permission viewer

2019-05-19 18:39:34 +02:00

detail.html

Merge branch 'master' into Develop

2019-05-31 11:17:47 +02:00

discover.html

Integrated author in sorting functions

2019-03-16 21:14:01 +01:00

email_edit.html

Uploader progress bar

2019-02-09 18:46:41 +01:00

feed.xml

Refactored generating download links

2019-03-16 16:23:40 +01:00

fragment.html

Show book details in modal dialog

2017-07-08 09:15:40 -07:00

http_error.html

Fix routes

2019-02-09 19:01:57 +01:00

index.html

Update Teststatus

2019-05-12 19:44:52 +02:00

index.xml

Link fixes

2019-02-16 07:23:36 +01:00

json.txt

Refactored generating download links

2019-03-16 16:23:40 +01:00

languages.html

Uploader progress bar

2019-02-09 18:46:41 +01:00

layout.html

Improved sorting for rated,random, hot books, read/unread book

2019-03-16 15:48:09 +01:00

list.html

Sort button is correctly visible on list pages

2019-04-22 19:17:23 +02:00

listenmp3.html

Sorting and filtering of lists working (except file formats)

2019-04-22 19:11:35 +02:00

login.html

Oauth working somehow (?)

2019-02-17 19:10:16 +01:00

osd.xml

Fix for #830

2019-03-03 08:41:50 +01:00

read.html

Merge branch 'master' into Develop

2019-04-13 16:42:09 +02:00

readcbr.html

Merge branch 'master' into Develop

2019-05-31 11:17:47 +02:00

readpdf.html

Merge branch 'master' into Develop

2019-05-31 11:17:47 +02:00

readtxt.html

Uploader progress bar

2019-02-09 18:46:41 +01:00

register.html

Uploader progress bar

2019-02-09 18:46:41 +01:00

remote_login.html

Merge branch 'master' into Develop

2019-05-31 11:17:47 +02:00

search_form.html

Working again (basically)

2019-02-06 21:52:32 +01:00

search.html

Fix updater

2019-03-24 15:27:23 +01:00

shelf_edit.html

More refactoring

2019-02-08 20:12:16 +01:00

shelf_order.html

Uploader progress bar

2019-02-09 18:46:41 +01:00

shelf.html

Sorting and filtering of lists working (except file formats)

2019-04-22 19:11:35 +02:00

shelfdown.html

Integrated author in sorting functions

2019-03-16 21:14:01 +01:00

stats.html

Fix #590, #589.

2018-08-27 22:08:55 +02:00

tasks.html

Working again (basically)

2019-02-06 21:52:32 +01:00

user_edit.html

Added additional permission viewer

2019-05-19 18:39:34 +02:00