mirror of https://github.com/MISP/MISP
Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix
commit
89c590edc0
|
@ -1602,6 +1602,7 @@ class EventsController extends AppController
|
|||
$this->set('defaultFilteringRules', $this->defaultFilteringRules);
|
||||
$this->set('mitreAttackGalaxyId', $this->Event->GalaxyCluster->Galaxy->getMitreAttackGalaxyId());
|
||||
$this->set('modificationMapCSV', $modificationMapCSV);
|
||||
$this->set('title_for_layout', __('Event #%s', $event['Event']['id']));
|
||||
}
|
||||
|
||||
public function view($id = null, $continue=false, $fromEvent=null)
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 881a5664acfbb0e3ef68c70b641a966859ed2f4f
|
||||
Subproject commit dee9a564606ba92c50f13b53884bceaacf6c4522
|
|
@ -1 +1 @@
|
|||
Subproject commit 2c116cbd1ff50b2ed677ea6af08c8a6bf511a6fd
|
||||
Subproject commit 78590f35269658cceb009d0fe282d5274e74ba89
|
Loading…
Reference in New Issue