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

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/5572/head
iglocska 2020-01-29 19:46:34 +01:00
parent 59deec3a37 956259523c
commit af710de896
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit eabc6481d039940ad30b7342a477ccf56c878419
Subproject commit db9c54bb0883296707023cd30f3a23c0c47937bb

2
app/View/Events/merge.ctp
View File

@ -1,7 +1,7 @@
<div class="eventmerge form">
<?php echo $this->Form->create('Event', array('enctype' => 'multipart/form-data'));?>
<fieldset>
<legend><?php echo __('Merge events'); ?></legend>
<legend><?php echo __('Merge events - WARNING: this feature is very outdated and should not be used anymore.'); ?></legend>
<?php
echo $this->Form->hidden('target_id');
echo $this->Form->input('source_id', array(

44
app/files/feed-metadata/defaults.json
View File

@ -450,7 +450,7 @@
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -475,7 +475,7 @@
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -500,7 +500,7 @@
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -557,7 +557,7 @@
"tag_id": "615",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"fixed_event": true,
"delta_merge": true,
"event_id": "0",
"publish": false,
@ -589,7 +589,7 @@
"tag_id": "615",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": true,
"event_id": "0",
"publish": false,
@ -621,7 +621,7 @@
"tag_id": "615",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": true,
"event_id": "0",
"publish": false,
@ -915,7 +915,7 @@
"tag_id": "615",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": true,
"event_id": "0",
"publish": false,
@ -947,7 +947,7 @@
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -971,7 +971,7 @@
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -996,7 +996,7 @@
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -1021,7 +1021,7 @@
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -1046,7 +1046,7 @@
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -1071,7 +1071,7 @@
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -1096,7 +1096,7 @@
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -1121,7 +1121,7 @@
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -1146,7 +1146,7 @@
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -1171,7 +1171,7 @@
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -1196,7 +1196,7 @@
"tag_id": "615",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -1229,7 +1229,7 @@
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -1254,7 +1254,7 @@
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -1279,7 +1279,7 @@
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
@ -1304,7 +1304,7 @@
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,