Ozzieisaacs 09e7d76c6f Merge remote-tracking branch 'kobo_book_delete' into Develop ...

# Conflicts:
#	cps/kobo.py
#	cps/services/SyncToken.py
#	cps/templates/book_edit.html
#	cps/ub.py

2020-03-12 20:43:39 +01:00

..

admin.html

English Language Updates

2020-02-03 14:22:00 +11: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

Merge remote-tracking branch 'kobo_book_delete' into Develop

2020-03-12 20:43:39 +01:00

book_exists_flash.html

Fix pdf cover

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

config_edit.html

Merge remote-tracking branch 'English_texts/master'

2020-02-23 13:27:44 +01:00

config_view_edit.html

Merge remote-tracking branch 'English_texts/master'

2020-02-23 13:27:44 +01:00

detail.html

Merge remote-tracking branch 'kobo_book_delete' into Develop

2020-03-12 20:43:39 +01:00

discover.html

Merge branch 'Develop'

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

email_edit.html

Update Translation

2020-02-23 20:07:21 +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

Update Translation (german and russian)

2020-02-24 19:38:12 +01:00

http_error.html

Chang link to issue template

2020-03-07 11:27:50 +01:00

index.html

Merge branch 'Develop'

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

index.xml

Fixes for Kobo sync

2020-03-07 11:07:43 +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

Update Translation

2020-02-23 20:07:21 +01:00

list.html

Fix #1021

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

listenmp3.html

English Language Updates

2020-02-03 14:22:00 +11:00

login.html

English Language Updates

2020-02-03 14:22:00 +11:00

logviewer.html

English Language Updates

2020-02-03 14:22:00 +11:00

modal_restriction.html

Renamed restrict -> deny

2020-02-15 10:21:45 +01:00

osd.xml

Fixes for Kobo sync

2020-03-07 11:07:43 +01:00

read.html

English Language Updates

2020-02-03 14:22:00 +11:00

readcbr.html

Merge branch 'Develop'

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

readpdf.html

Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)

2020-02-29 09:55:54 +01:00

readtxt.html

Merge from master

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

register.html

English Language Updates

2020-02-03 14:22:00 +11:00

remote_login.html

English Language Updates

2020-02-03 14:22:00 +11:00

search_form.html

Merge remote-tracking branch 'English_texts/master'

2020-02-23 13:27:44 +01:00

search.html

Update Translation

2020-02-23 20:07:21 +01:00

shelf_edit.html

English Language Updates

2020-02-03 14:22:00 +11:00

shelf_order.html

Merge remote-tracking branch 'English_texts/master'

2020-02-23 13:27:44 +01:00

shelf.html

Update Translation

2020-02-23 20:07:21 +01:00

shelfdown.html

Merge branch 'Develop'

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

stats.html

English Language Updates

2020-02-03 14:22:00 +11:00

tasks.html

English Language Updates

2020-02-03 14:22:00 +11:00

user_edit.html

Merge remote-tracking branch 'English_texts/master'

2020-02-23 13:27:44 +01:00