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

Merge branch '2.4' into develop

pull/8099/head
Steve Clement 2022-01-06 18:45:30 +09:00
parent 49ed062216 2b7e302c08
commit 6483e5b986
No known key found for this signature in database
GPG Key ID: 69A20F509BE4AEE9
18 changed files with 170130 additions and 87763 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/Component/RestResponseComponent.php
View File

@ -1617,7 +1617,7 @@ class RestResponseComponent extends Component
'type' => 'integer',
'operators' => array('equal'),
'validation' => array('min' => 0, 'step' => 1),
'help' => __('A tad ID to attach to created events')
'help' => __('A tag ID to attach to created events')
),
'tags' => array(
'input' => 'select',

12
app/Locale/cake_dev.pot
View File

@ -17,6 +17,18 @@ msgstr ""
msgid "Could not describe table for %s"
msgstr ""
#: Plugin/LinOTPAuth/Controller/Component/Auth/LinOTPAuthenticate.php:128
msgid "LinOTP: Missing \"baseUrl\" configuration - access denied!"
msgstr ""
#: Plugin/LinOTPAuth/Controller/Component/Auth/LinOTPAuthenticate.php:147
msgid "Missing OTP Token."
msgstr ""
#: Plugin/LinOTPAuth/Controller/Component/Auth/LinOTPAuthenticate.php:197
msgid "User could not be authenticated by LinOTP."
msgstr ""
#: View/Layouts/error.ctp:19
msgid "CakePHP: the rapid development php framework"
msgstr ""

17476
app/Locale/cze/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

17660
app/Locale/dan/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

5508
app/Locale/default.pot
View File

File diff suppressed because it is too large Load Diff

17548
app/Locale/deu/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

17688
app/Locale/fra/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

17592
app/Locale/ita/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

17630
app/Locale/jpn/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

17367
app/Locale/kor/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

17724
app/Locale/no/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

17390
app/Locale/pol/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

17700
app/Locale/pt_BR/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

17516
app/Locale/rus/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

17428
app/Locale/spa/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

23973
app/Locale/th_TH/LC_MESSAGES/default.po Normal file
View File

File diff suppressed because it is too large Load Diff

17675
app/Locale/zh-s/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

4
docs/API_Doc.md
View File

@ -435,7 +435,7 @@ POST a MISP Feed descriptor JSON to this API to add a Feed.
| delta_merge |integer |Merge attributes (only add new attribute, remove revoked attributes) |
| distribution |integer | |
| sharing_group_id |integer | |
| tag_id |integer |A tad ID to attach to created events |
| tag_id |integer |A tag ID to attach to created events |
| pull_rules |string |Not supported |
| rules |string |Not supported |
| event_id |integer | |
@ -472,7 +472,7 @@ POST a MISP Feed descriptor JSON to this API to edit a Feed.
| delta_merge |integer |Merge attributes (only add new attribute, remove revoked attributes) |
| distribution |integer | |
| sharing_group_id |integer | |
| tag_id |integer |A tad ID to attach to created events |
| tag_id |integer |A tag ID to attach to created events |
| pull_rules |string |Not supported |
| rules |string |Not supported |
| event_id |integer | |