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

Merge remote-tracking branch 'origin/2.4' into develop

pull/6899/head
mokaddem 2021-01-25 13:44:11 +01:00
parent 7f5fb2e462 afe9d26e8a
commit 6be121f6fb
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/AppController.php
View File

@ -25,7 +25,7 @@ class AppController extends Controller
public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
private $__queryVersion = '121';
private $__queryVersion = '122';
public $pyMispVersion = '2.4.137';
public $phpmin = '7.2';
public $phprec = '7.4';

6
app/webroot/js/event-timeline.js
View File

@ -459,13 +459,12 @@ function reload_timeline() {
}
adjust_text_length(item);
}
itemIds[item.attribute_id] = item.content;
if (selectedScope == 'sightings') {
itemIds[item.attribute_id] = item.content;
item.group = item.attribute_id;
item.content = '';
}
}
items_timeline.add(data.items);
handle_not_seen_enabled($('#checkbox_timeline_display_hide_not_seen_enabled').prop('checked'), false)
if (selectedScope == 'sightings') {
var groups = Object.keys(itemIds).map(function(id) {
@ -475,8 +474,9 @@ function reload_timeline() {
eventTimeline.setOptions({selectable: false});
} else {
eventTimeline.setOptions({selectable: true});
eventTimeline.setGroups([]);
eventTimeline.setGroups(null);
}
items_timeline.add(data.items);
},
error: function( jqXhr, textStatus, errorThrown ){
console.log( errorThrown );