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

fix: [event-graph] Event timeline shortcut do not override the ones from the eventgraph anymore

pull/8357/head
Sami Mokaddem 2022-05-10 15:36:19 +02:00
parent 53b0e4918b
commit 2dfee9f445
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/AppController.php
View File

@ -34,7 +34,7 @@ class AppController extends Controller
public $helpers = array('OrgImg', 'FontAwesome', 'UserName');
private $__queryVersion = '140';
private $__queryVersion = '141';
public $pyMispVersion = '2.4.157';
public $phpmin = '7.2';
public $phprec = '7.4';

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

@ -20,7 +20,7 @@ var relationship_type_mapping = {
'followed-by': 'after',
'preceding-by': 'before',
}
var shortcut_text = "<b>ALT+Mouse_Wheel</b> Zoom IN/OUT"
var shortcut_text_timeline = "<b>ALT+Mouse_Wheel</b> Zoom IN/OUT"
+ "\n<b>CTRL</b> Multi select"
var options = {
template: function (item, element, data) {
@ -604,7 +604,7 @@ function enable_timeline() {
$('.timeline-help').popover({
container: 'body',
title: 'Shortcuts',
content: shortcut_text,
content: shortcut_text_timeline,
placement: 'left',
trigger: 'hover',
template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content preWarp"></div></div>',