Ozzieisaacs 9b74d51f21 Merge remote-tracking branch 'ldap/master' into Develop ...

# Conflicts:
#	cps/server.py
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	optional-requirements-ldap.txt
#	setup.cfg

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

..

admin.html

Fix #937

2019-06-15 21:18:13 +02:00

author.html

Update logging

2019-06-10 14:15:21 +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

Merge remote-tracking branch 'ldap/master' into Develop

2019-06-16 08:20:01 +02: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

…

feed.xml

Refactored generating download links

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

fragment.html

…

http_error.html

…

index.html

Update logging

2019-06-10 14:15:21 +02:00

index.xml

…

json.txt

Refactored generating download links

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

languages.html

…

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

…

logviewer.html

Fix #937

2019-06-15 21:18:13 +02:00

osd.xml

…

read.html

Merge remote-tracking branch 'ldap/master' into Develop

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

readcbr.html

Merge branch 'master' into Develop

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

readpdf.html

Code cosmetics

2019-06-08 13:45:27 +02:00

readtxt.html

…

register.html

…

remote_login.html

Merge branch 'master' into Develop

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

search_form.html

…

search.html

Fix updater

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

shelf_edit.html

…

shelf_order.html

…

shelf.html

Code cosmetics

2019-06-08 13:45:27 +02:00

shelfdown.html

Integrated author in sorting functions

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

stats.html

…

tasks.html

…

user_edit.html

Added additional permission viewer

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