Ozzie Isaacs 127bf98aac Merge branch 'master' into Develop ... # Conflicts: # cps/templates/detail.html # test/Calibre-Web TestSummary_Linux.html		2022-01-23 17:51:54 +01:00
..
compress
libs	Added korean locale	2022-01-06 14:04:49 +01:00
reading	Update epub.js	2021-11-30 22:24:34 -06:00
caliBlur.js
details.js	Fix #2265 (add book to shelf on popup for book details)	2022-01-17 17:46:57 +01:00
edit_books.js	Fix upload of cover and book formats containing html characters	2021-11-20 13:40:23 +01:00
filter_grid.js	Mark which functions are selected on list pages	2021-11-03 21:07:16 +04:00
filter_list.js	Mark which functions are selected on list pages	2021-11-03 21:07:16 +04:00
fullscreen.js
get_meta.js	Bugfixes load metadata	2022-01-07 12:40:03 +01:00
kthoom.js
logviewer.js
main.js	Kobo sync token is now also created if accessed from localhost(fixes #1990)	2022-01-22 18:23:43 +01:00
remote_login.js
shelforder.js
table.js	Merge branch 'master' into Develop	2022-01-23 17:51:54 +01:00
uploadprogress.js