MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
21,807 Commits
33 Branches
364 Tags
186 MiB
Commit Graph

21807 Commits (a11c8172483d415dc45f622a2a48f7d1920175ef)

Author SHA1 Message Date
Alexandre Dulaunoy a11c817248
Merge pull request #8378 from kdrypr/patch-2 
BEAM SOC email updated
 2022-05-16 23:21:38 +02:00
Kadir YAPAR a5622c7463
BEAM SOC email updated 2022-05-16 09:47:09 +03:00
Alexandre Dulaunoy 165f4c8c62
chg: [taxonomies] updated 2022-05-16 08:15:08 +02:00
Alexandre Dulaunoy 29517cf8e0
chg: [taxonomies] updated 2022-05-13 16:02:51 +02:00
Alexandre Dulaunoy 2e01695321
chg: [taxonomies] updated 2022-05-13 16:00:33 +02:00
Alexandre Dulaunoy 435d988e15
chg: [taxonomies] revert 2022-05-13 15:10:29 +02:00
Alexandre Dulaunoy 3aad442f7d
chg: [taxonomies] updated to the latest version 2022-05-13 14:05:33 +02:00
Alexandre Dulaunoy 72a3218862
Merge pull request #8367 from kdrypr/patch-1 
BEAM SOC MISP Community added.
 2022-05-13 09:59:02 +02:00
Kadir YAPAR d0ca9f8dbf
BEAM SOC MISP Community added. 2022-05-13 10:04:04 +03:00
Alexandre Dulaunoy ba6502e66c
chg: [misp-objects] updated to the latest version 2022-05-12 14:37:36 +02:00
Alexandre Dulaunoy f16dd77bf4
chg: [misp-galaxy] updated to the latest version 2022-05-09 15:39:11 +02:00
iglocska 5d86dd0f80
chg: [UI] jquery-ui re-added to fix the report extraction 2022-05-05 15:54:59 +02:00
Alexandre Dulaunoy 78e760f831
chg: [misp-galaxy] updated to the latest version 2022-04-26 09:48:11 +02:00
chrisr3d 15ce69dcc9
fix: [stix1 import] Fixed galaxy tag_names fetching from TTP names 
- Using the techniques identifier to look for tag
  names when the name does not match any known
  galaxy name
- Prevents the galaxy names to be skipped when
  the provided TTP name is given with the
  identifier and the technique name in an inverted
  order (`Spearphishing Attachment - T1566.001` VS
  `T1566.001 - Spearphishing Attachment`)
 2022-04-25 11:57:44 +02:00
Alexandre Dulaunoy a5aa18567b
chg: [misp-galaxy] updated 2022-04-21 15:00:37 +02:00
Andras Iklody d99219f29d
Merge pull request #8292 from tomking2/bug/restSearch_SharingGroup 
fix: Enable sharing group filter for Event controller not just attribute
 2022-04-21 12:20:59 +02:00
Tom King d3f2dc07c8 fix: Enable sharing group filter for Event controller not just attribute 2022-04-21 11:16:26 +01:00
iglocska 9f1a239a87
Merge branch 'develop' into 2.4 2022-04-21 10:04:14 +02:00
Sami Mokaddem ddd41560e0
chg: [events:index] Quick search in event index for different scopes 
Allow to change the scope of the quick search for filtering an index. It's a compromise between a time consuming full text search and the user experience.
 2022-04-21 09:53:56 +02:00
Luciano Righetti 52f20abdc3 fix: revert ec2cb29fe0 2022-04-21 08:22:10 +02:00
chrisr3d 6bb57ca7b5 Merge branch '2.4' of https://github.com/MISP/MISP into develop 2022-04-20 19:37:59 +02:00
chrisr3d 3d5d77344a Merge branch 'develop' of https://github.com/MISP/MISP into develop 2022-04-20 19:37:49 +02:00
chrisr3d a3d87b6854
fix: [stix2 import] Fixed attribute types import mapping 2022-04-20 19:32:59 +02:00
chrisr3d 25012b650e
fix: [stix2 import] Fixed labels parsing & custom properties parsing 2022-04-20 19:32:17 +02:00
Andras Iklody e608ee5cd7
Merge pull request #8290 from silvian-io/2.4 
fix: [email] user emails sent two times
 2022-04-20 14:03:20 +02:00
Silvian I a5b8886c7c fix: [email] user emails sent two times 2022-04-20 13:06:00 +02:00
Andras Iklody 1e21ac616d
Merge pull request #8289 from righel/fix-event-set_filter_value 
fix: revert Event::set_filter_value() changes
 2022-04-20 12:45:24 +02:00
Luciano Righetti 5fd52252e7 fix: revert ec2cb29fe0 2022-04-20 12:33:26 +02:00
Jakub Onderka ba1a3c4c15
Merge pull request #8287 from MISP/2.4 
Merge 2.4 to develop
 2022-04-20 11:29:26 +02:00
Jakub Onderka c4fe045d36
Merge pull request #8286 from JakubOnderka/fix-freetext-import 
fix: [freetext] Internal server error
 2022-04-20 11:00:16 +02:00
Jakub Onderka 4c2b3dd3eb fix: [freetext] Internal server error 2022-04-20 10:00:47 +02:00
iglocska d1fde56c52
Merge branch '2.4' into develop 2022-04-20 08:36:10 +02:00
iglocska ecceb79f53
chg: [version] bump 2022-04-20 08:35:47 +02:00
iglocska 1c0df3687a
Merge branch 'develop' into 2.4 2022-04-19 15:26:25 +02:00
iglocska b36207a8c2
Merge branch 'custom_email_templates' into develop 2022-04-19 15:25:35 +02:00
iglocska be9fb9e802
Merge branch 'develop' of github.com:MISP/MISP into develop 2022-04-19 15:18:40 +02:00
iglocska 63840c8b68
Merge branch 'pentest_fixes' into develop 2022-04-19 15:18:25 +02:00
Alexandre Dulaunoy c090a5dc43
chg: [taxonomies] updated 2022-04-19 10:00:22 +02:00
Alexandre Dulaunoy 09fd59cf7b
chg: [misp-galaxy] updated 2022-04-19 09:59:59 +02:00
Alexandre Dulaunoy 850111c33c
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2022-04-19 09:59:47 +02:00
Alexandre Dulaunoy e4fd3d3af9
chg: [warning-lists] updated 2022-04-19 09:59:32 +02:00
Alexandre Dulaunoy f2c27861c8
chg: [taxonomies] updated 2022-04-19 09:58:37 +02:00
Alexandre Dulaunoy 68087bd580
chg: [misp-galaxy] updated 2022-04-19 09:58:11 +02:00
Alexandre Dulaunoy c77a52598f
chg: [warning-lists] updated 2022-04-19 09:57:51 +02:00
Jakub Onderka eb86544b72
Merge pull request #8281 from JakubOnderka/freetext-import-simplify 
chg: [internal] Simplify and speedup code for freetext importing
 2022-04-18 20:11:19 +02:00
Jakub Onderka 1289eaf6aa chg: [HTML] Remove unnecessary classes and ID 2022-04-18 19:54:13 +02:00
Jakub Onderka 1dc2f57f62 chg: [JS] Simplify code 2022-04-18 19:54:13 +02:00
Jakub Onderka 62d055d360 chg: [JS] Int should be int 2022-04-18 19:54:13 +02:00
Jakub Onderka a5495fc763 chg: [UI] Try to delete jQuery UI 2022-04-18 19:54:13 +02:00
Jakub Onderka 20013e49fb chg: [UI] Event ID is not required for deleteObject method 2022-04-18 19:54:13 +02:00