MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'hotfix-2.3.73'

pull/516/head v2.3.73
Iglocska 2015-06-03 11:41:26 +02:00
parent 37c04b0a48 b200cbb83a
commit 8b3081a06b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":72}
{"major":2, "minor":3, "hotfix":73}

5
app/webroot/js/ajaxification.js
View File

@ -14,9 +14,9 @@ function publishPopup(id, type) {
if (type == "publish") action = "publish";
var destination = 'attributes';
$.get( "/events/" + action + "/" + id, function(data) {
$("#confirmation_box").html(data);
$("#confirmation_box").fadeIn();
$("#gray_out").fadeIn();
$("#confirmation_box").html(data);
});
}
@ -505,6 +505,7 @@ function submitPopoverForm(context_id, referer, update_context_id) {
type:"post",
url:url
});
$("#popover_form").empty();
}
};
@ -1387,7 +1388,7 @@ function lookupPGPKey(emailFieldName) {
type: "get",
url: "https://pgp.mit.edu/pks/lookup?op=get&search=" + $('#' + emailFieldName).val(),
success: function (data) {
var result = $("<div>").html(data)[0].getElementsByTagName("pre")[0]['innerText'];
var result = data.split("<pre>")[1].split("</pre>")[0];
$("#UserGpgkey").val(result);
showMessage('success', "Key found!");
},