1
0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-28 05:47:43 +00:00

Merge branch 'master' into Develop

This commit is contained in:
Ozzie Isaacs
2021-08-01 20:23:19 +02:00
45 changed files with 4873 additions and 4631 deletions

View File

@@ -74,7 +74,12 @@ $(function() {
});
});
$("#merge_books").click(function() {
$("#merge_books").click(function(event) {
if ($(this).hasClass("disabled")) {
event.stopPropagation()
} else {
$('#mergeModal').modal("show");
}
$.ajax({
method:"post",
contentType: "application/json; charset=utf-8",