Ozzieisaacs 48495f0d66 Merge branch 'master' into Develop ...

# Conflicts:
#	cps/helper.py
#	cps/templates/user_edit.html
#	cps/web.py

2020-01-04 07:57:54 +01:00

..

admin.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

author.html

Fix (#1103) Internal server error with Goodreads and no result for author name on Goodreads

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

book_edit.html

Improvements for limit tags

2020-01-01 17:30:08 +01:00

book_exists_flash.html

Fix pdf cover

2019-11-26 08:19:03 +01:00

config_edit.html

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

2019-12-30 15:15:07 +01:00

config_view_edit.html

Improvements for limit tags

2020-01-01 17:30:08 +01:00

detail.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

discover.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

email_edit.html

Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)

2020-01-01 17:29:01 +01:00

feed.xml

Unified wording for recently added books, series, categories, etc in opds and web UI ( #1045)

2019-12-15 13:32:34 +01:00

fragment.html

Show book details in modal dialog

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

generate_kobo_auth_url.html

git add missing generate_kobo_auth_url.html

2019-12-20 01:08:15 -05:00

http_error.html

Fix #652

2019-07-21 18:19:07 +02:00

index.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

index.xml

Unified wording for recently added books, series, categories, etc in opds and web UI ( #1045)

2019-12-15 13:32:34 +01:00

json.txt

Cover upload gives Error 500 fix #972 (leftover from refactoring)

2019-07-24 18:43:23 +02:00

languages.html

Fix for display of format, series, category, ratings,

2019-07-22 21:38:52 +02:00

layout.html

Improvements for limit tags

2020-01-01 17:30:08 +01:00

list.html

Fix #1021

2019-09-06 18:57:41 +02:00

listenmp3.html

FIx for (#1092 listening to mp3 not working)

2019-12-01 12:36:55 +01:00

login.html

Test Email now send to user's email address (#834)

2019-12-15 17:08:17 +01:00

logviewer.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

modal_restriction.html

Improvements for limit tags

2020-01-01 17:30:08 +01:00

osd.xml

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

read.html

Fix #1095 (epub viewer not working if only viewer rule wa sapplied)

2019-12-01 12:21:21 +01:00

readcbr.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

readpdf.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

readtxt.html

Merge from master

2019-12-22 15:28:43 +01:00

register.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

remote_login.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

search_form.html

Implemented #1083 (Advanced search for extensions)

2019-12-15 11:35:07 +01:00

search.html

support douban book search using apikey

2019-12-04 11:59:06 +08:00

shelf_edit.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

shelf_order.html

Fixed typo and column size for LG screens

2019-10-19 12:02:14 +02:00

shelf.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

shelfdown.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

stats.html

Merge remote-tracking branch 'github_3/hotfix/epub-import'

2019-10-20 15:48:06 +02:00

tasks.html

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

user_edit.html

Merge branch 'master' into Develop

2020-01-04 07:57:54 +01:00