Ozzieisaacs 80582573f5 Merge remote-tracking branch 'oauth/oauth' into Develop ...

# Conflicts:
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/web.py

2019-01-27 11:22:22 +01:00

..

admin.html

New updater with default setting -> only stable releases #653

2019-01-20 17:46:26 +01:00

author.html

Add anchor tags to titles

2018-10-09 11:52:16 +00:00

book_edit.html

Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)

2018-10-28 21:33:12 +01:00

config_edit.html

Merge remote-tracking branch 'oauth/oauth' into Develop

2019-01-27 11:22:22 +01:00

config_view_edit.html

Merge remote-tracking branch 'theme/master'

2019-01-12 09:01:08 +01:00

detail.html

Merge remote-tracking branch 'audiobook/Branch_c27805b'

2019-01-27 11:14:38 +01:00

discover.html

Add anchor tags to titles

2018-10-09 11:52:16 +00:00

email_edit.html

Fix #590, #589.

2018-08-27 22:08:55 +02:00

feed.xml

Update Updater

2018-11-01 13:44:00 +01:00

fragment.html

Show book details in modal dialog

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

http_error.html

Choosing Theme is now a global setting

2019-01-11 08:36:28 +01:00

index.html

Merge remote-tracking branch 'audiobook/Branch_c27805b'

2019-01-27 11:14:38 +01:00

index.xml

Fix for #672

2018-10-30 22:33:19 +01:00

json.txt

Fix #339

2017-09-30 15:24:18 +02:00

languages.html

Merge remote-tracking branch 'Comic/comic_server'

2018-08-31 10:47:58 +02:00

layout.html

Choosing Theme is now a global setting

2019-01-11 08:36:28 +01:00

list.html

Choosing Theme is now a global setting

2019-01-11 08:36:28 +01:00

listenmp3.html

Merge remote-tracking branch 'audiobook/Branch_c27805b'

2019-01-27 11:14:38 +01:00

login.html

Add OAuth support: GitHub & Google

2018-10-14 16:51:00 +08:00

osd.xml

Fix #590, #589.

2018-08-27 22:08:55 +02:00

read.html

Merge remote-tracking branch 'audiobook/Branch_c27805b'

2019-01-27 11:14:38 +01:00

readcbr.html

Merge remote-tracking branch 'Comic/comic_server'

2018-08-31 10:47:58 +02:00

readpdf.html

Update testing

2019-01-14 20:27:53 +01:00

readtxt.html

read PDF/TXT without temporary files (#197)

2017-05-25 08:46:33 +02:00

register.html

Add OAuth support: GitHub & Google

2018-10-14 16:51:00 +08:00

remote_login.html

Merge remote-tracking branch 'Convert_all/ebookconvert-any'

2018-08-31 15:00:22 +02:00

search_form.html

Update testing

2019-01-14 20:27:53 +01:00

search.html

Add anchor tags to titles

2018-10-09 11:52:16 +00:00

shelf_edit.html

Fixes from testing:

2018-09-23 19:15:50 +02:00

shelf_order.html

Move vendored css/js to libs folders to fix language stats

2017-02-07 20:33:08 +01:00

shelf.html

Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop

2019-01-27 11:16:11 +01:00

shelfdown.html

Download only shelf

2018-10-10 23:01:05 +02:00

stats.html

Fix #590, #589.

2018-08-27 22:08:55 +02:00

tasks.html

Fix for #617

2018-10-03 15:58:37 -04:00

user_edit.html

Merge remote-tracking branch 'oauth/oauth' into Develop

2019-01-27 11:22:22 +01:00