Ozzieisaacs 50ba2e329a Merge branch 'master' into Develop ... # Conflicts: # cps/shelf.py		2020-02-09 07:00:04 +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	Fix #1170 Auth-digest Header no longer crashs calibre-web	2020-02-02 07:47:27 +01:00
reading	Merge from master	2019-12-22 15:28:43 +01:00
caliBlur.js	caliBlur theme: fix custom column display that contain colons	2020-01-12 14:26:07 +01:00
details.js	Updated translations	2019-01-20 19:37:45 +01:00
edit_books.js	Add ability to store and edit publishers	2018-09-30 14:08:55 +02:00
filter_list.js	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00
get_meta.js	Fix #1170 Auth-digest Header no longer crashs calibre-web	2020-02-02 07:47:27 +01: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