Ozzieisaacs 146068c936 Merge branch 'Develop' ...

# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html

2020-02-23 13:15:30 +01:00

..

archive

Merge from master

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

io

Merge branch 'Develop'

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

libs

Updated pdf viewer to 2.2.228 (#1184)

2020-02-09 17:02:47 +01:00

reading

Update Updater

2020-02-23 07:54:58 +01:00

caliBlur.js

Merge with branch develop

2020-02-23 09:08:01 +01:00

details.js

…

edit_books.js

…

filter_list.js

Merge branch 'Develop'

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

get_meta.js

Fix #1210

2020-02-21 18:25:02 -03:00

kthoom.js

Update comic reader js

2019-06-17 19:48:17 +02:00

logviewer.js

Merge with develop:

2020-01-13 18:37:29 +01:00

main.js

Make Kobo optional

2020-01-12 13:42:39 +01:00

shelforder.js

Fix #1170 Auth-digest Header no longer crashs calibre-web

2020-02-02 07:47:27 +01:00

table.js

Handle stream output in logviewer

2020-01-07 20:26:59 +01:00

uploadprogress.js

Merge branch 'Develop'

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