Ozzieisaacs b160a8de0b Merge branch 'master' into Develop ... # Conflicts: # cps/__init__.py # cps/comic.py # cps/editbooks.py # cps/helper.py # cps/kobo.py # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/ub.py # cps/uploader.py # cps/web.py		2020-04-30 18:08:28 +02:00
..
archive	Fix #950 (sorting order in comics)	2020-03-14 07:15:15 +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 branch 'master' into Develop	2020-04-30 18:08:28 +02:00
details.js	Add UI support for archived books.	2020-01-26 00:27:54 -05:00
edit_books.js	Add ability to store and edit publishers	2018-09-30 14:08:55 +02:00
filter_list.js	Code cosmetics	2020-04-27 20:01:13 +02:00
get_meta.js	Merge remote-tracking branch 'remove_usage_local_var_undeclared'	2020-04-24 21:05:56 +02:00
kthoom.js	Update comic reader js	2019-06-17 19:48:17 +02:00
logviewer.js	Update updater	2020-03-29 16:44:24 +02:00
main.js	Merge remote-tracking branch 'remove_usage_local_var_undeclared'	2020-04-24 21:05:56 +02:00
shelforder.js	Fix #1170 Auth-digest Header no longer crashs calibre-web	2020-02-02 07:47:27 +01:00
table.js	Code cosmetics	2020-04-27 20:01:13 +02:00
uploadprogress.js	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00