Ozzieisaacs da3fcb9a72 Merge branch 'master' into Develop ...

# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot

2019-03-10 08:31:10 +01:00

..

admin.html

Code cosmetics

2019-03-05 17:34:51 +01:00

author.html

Merge branch 'master' into Develop

2019-03-10 08:31:10 +01:00

book_edit.html

Add scrollbar to metadata load screen

2019-03-01 21:00:09 +01:00

config_edit.html

Fix for sqlalchemy 1.3

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

config_view_edit.html

Merge branch 'master' into Develop

2019-03-10 08:31:10 +01:00

detail.html

Fix #766

2019-02-24 19:23:51 +01:00

discover.html

Merge branch 'master' into Develop

2019-03-10 08:31:10 +01:00

email_edit.html

Uploader progress bar

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

feed.xml

More refactoring

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

Merge branch 'master' into Develop

2019-03-10 08:31:10 +01:00

index.xml

Link fixes

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

json.txt

Link fixes

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

languages.html

Uploader progress bar

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

layout.html

Fix uncompressed cbz files

2019-03-05 20:59:30 +01:00

list.html

Fix for sqlalchemy 1.3

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

listenmp3.html

Uploader progress bar

2019-02-09 18:46:41 +01: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-02-16 10:17:46 +01:00

readcbr.html

Uploader progress bar

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

readpdf.html

Uploader progress bar

2019-02-09 18:46:41 +01: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

Uploader progress bar

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

search_form.html

Working again (basically)

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

search.html

Merge branch 'master' into Develop

2019-03-10 08:31:10 +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

Merge branch 'master' into Develop

2019-03-10 08:31:10 +01:00

shelfdown.html

Uploader progress bar

2019-02-09 18:46:41 +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

Code cosmetics

2019-03-05 17:34:51 +01:00