Ozzieisaacs 52489a484a Merge remote-tracking branch 'Knepherbird/master' into master ...

# Conflicts:
#	cps/jinjia.py
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/web.py

2020-10-10 12:47:49 +02:00

..

admin.html

Merge branch 'master' into Develop

2020-08-23 21:23:00 +02:00

author.html

Merge remote-tracking branch 'Knepherbird/master' into master

2020-10-10 12:47:49 +02:00

book_edit.html

Fix UI Deelete Buttons in Edit Books page

2020-10-04 12:09:52 +02:00

book_exists_flash.html

…

book_table.html

Paginated search and advanced search

2020-10-04 19:23:06 +02:00

config_edit.html

Merge remote-tracking branch 'jef/jef/download-kobo' into master

2020-08-23 21:22:44 +02:00

config_view_edit.html

Merge branch 'master' into Develop

2020-05-23 08:50:24 +02:00

detail.html

Merge branch 'master' into Develop

2020-09-26 07:54:38 +02:00

discover.html

Merge remote-tracking branch 'Knepherbird/master' into master

2020-10-10 12:47:49 +02:00

email_edit.html

Bugfix empty email attachment size

2020-09-07 18:19:54 +02:00

feed.xml

Fix XML parsing error when using OPDS feeds

2020-05-18 20:07:02 +02:00

fragment.html

…

generate_kobo_auth_url.html

Prevent invalid variable

2020-06-28 09:48:05 +02:00

grid.html

Added id's for testing

2020-09-27 16:00:17 +02:00

http_error.html

Renamed CalibLur.css

2020-10-10 12:22:52 +02:00

index.html

Merge remote-tracking branch 'Knepherbird/master' into master

2020-10-10 12:47:49 +02:00

index.xml

…

json.txt

…

languages.html

Store last selected view for sidebar (not for categories, series, publishers, ..)

2020-07-11 12:09:34 +02:00

layout.html

Renamed CalibLur.css

2020-10-10 12:22:52 +02:00

list.html

Added id's for testing

2020-09-27 16:00:17 +02:00

listenmp3.html

…

login.html

…

logviewer.html

…

modal_dialogs.html

Improvements for delete book

2020-06-18 20:39:45 +02:00

osd.xml

…

read.html

…

readcbr.html

Config Options for limiting email size, change username to e-mail adress, use kepubify

2020-05-04 18:19:30 +02:00

readpdf.html

…

readtxt.html

…

register.html

Automatic username (#1172)

2020-05-12 17:23:58 +02:00

remote_login.html

…

search_form.html

same fix but hopefully better

2020-10-10 13:15:02 +03:00

search.html

Merge remote-tracking branch 'Knepherbird/master' into master

2020-10-10 12:47:49 +02:00

shelf_edit.html

…

shelf_order.html

Fix #1574 (author name not shown in change book order in shelfs)

2020-08-22 15:37:40 +02:00

shelf.html

Merge remote-tracking branch 'Knepherbird/master' into master

2020-10-10 12:47:49 +02:00

shelfdown.html

Merge remote-tracking branch 'Knepherbird/master' into master

2020-10-10 12:47:49 +02:00

stats.html

Fix #1502 (program info only visible in about section if user is admin)

2020-07-05 14:00:40 +02:00

tasks.html

…

user_edit.html

Bugfixes from last testrun

2020-09-28 21:24:47 +02:00