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

18990 Commits (74acfacde01918f46a088632a9b69bc0a81ab64f)

Author SHA1 Message Date
Jakub Onderka 74acfacde0 Revert "chg: [internal] Install CakePHP by Composer" 
This reverts commit 74eccfe9
 2021-04-19 13:31:43 +02:00
Jakub Onderka d3b1eb51fb Revert "chg: [internal] Install random_compat by Composer" 
This reverts commit fe7d0a46
 2021-04-19 13:17:20 +02:00
mokaddem 658f30b7b1
fix: [decaying:row_simulation] Correctly pass event data to galaxy element 2021-04-19 09:45:31 +02:00
mokaddem 5dea1088f2
fix: [decaying:row_simulation] Removed buggy HTML title 2021-04-19 09:45:02 +02:00
Alexandre Dulaunoy bf5ab0b42a
Merge pull request #7349 from Wachizungu/multilinechart-make-enabling-total-configurable 
chg: [Dashboard:MultiLineChart] make enabling 'total' line on initial…
 2021-04-17 22:24:39 +02:00
Jeroen Pinoy 3ecb232efa
chg: [Dashboard:MultiLineChart] make enabling 'total' line on initial render configurable 2021-04-17 16:59:05 +02:00
Alexandre Dulaunoy 0f62898715
Merge branch '2.4' into develop 2021-04-15 15:22:29 +02:00
Alexandre Dulaunoy 350b921854
Merge pull request #7336 from stevengoossensB/2.4 
Change config.default.php to have everything needed for Azure AD auth
 2021-04-15 15:21:15 +02:00
Andras Iklody 57913f6238
Merge pull request #7339 from righel/fix-remove-tag-attribute-content-type-header 
fix: fix remove attribute tag showing text/html content-type
 2021-04-15 11:13:57 +02:00
Luciano Righetti 44c0fb27b6 fix: fix remove attribute tag showing text/html content-type 2021-04-15 11:10:11 +02:00
Steven fd9ca80f35 Change config.default.php to have everything needed for Azure AD authentication in there (as suggested in PR 6661) 2021-04-14 14:02:50 +02:00
Alexandre Dulaunoy 3787e9fae3
Merge branch '2.4' into develop 2021-04-14 09:33:31 +02:00
Alexandre Dulaunoy 83a75d3a72
chg: [feed] default feed JSON fixed 2021-04-14 09:33:09 +02:00
Alexandre Dulaunoy b714571ad7
chg: [misp-objects] updated to the latest version 2021-04-14 09:28:04 +02:00
Alexandre Dulaunoy 4bbdc9015b
chg: [PyMISP] updated 2021-04-14 07:03:33 +02:00
Alexandre Dulaunoy 03018e4764
chg: [metadata] JSON fixed 2021-04-13 22:59:35 +02:00
Alexandre Dulaunoy 023b0dbf5c
chg: [feed] JSON fixed 2021-04-13 22:51:21 +02:00
Alexandre Dulaunoy 00b3fe805a
Merge pull request #7304 from StefanKelm/2.4 
add MalwareBazaar and URLhaus
 2021-04-13 22:46:08 +02:00
Alexandre Dulaunoy 3ea0c240cc
Merge branch '2.4' into develop 2021-04-13 22:45:21 +02:00
Alexandre Dulaunoy 10befccb5c
Merge pull request #7320 from PROTechThor/roadmap 
MISP Roadmap
 2021-04-13 22:42:27 +02:00
iglocska 784b982fb0
Merge branch '2.4' into develop 2021-04-13 10:51:59 +02:00
iglocska 5d508ed4c3
fix: [CSRF] issues resolved for the dashboards controller 2021-04-13 10:51:09 +02:00
E. Cleopatra 9edd7a6bb9
chg: [doc] Minor changes 2021-04-09 15:29:14 +01:00
mokaddem 6407b150eb
new: [event:timeline] Fit visible window from provided start/end dates + help tooltip 2021-04-08 16:34:20 +02:00
mokaddem 22c90a58c0
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-04-08 15:51:35 +02:00
mokaddem b86af240b6
new: [servers:diagnostic] Tool to remove orphaned correlations 2021-04-08 15:50:45 +02:00
iglocska c150dbfe6e
Merge branch '2.4' into develop 2021-04-08 11:12:05 +02:00
iglocska a0f08501d2
fix: [security] Sharing group misassociation on sync 
- when an object has a sharing group associated on an event edit, the sharing group object is ignored and instead the passed local ID is reused
- as reported by Jeroen Pinoy
 2021-04-08 10:57:20 +02:00
Steve Clement 46a3772a60
chg: [installer] Update to latest 2021-04-07 14:15:13 +09:00
Steve Clement 3c46dc2439
Merge pull request #7309 from SteveClement/guides 2021-04-07 14:14:28 +09:00
Steve Clement d7c3032d25
fix: [doc] Small regression 2021-04-07 14:13:21 +09:00
Steve Clement 8396da16a3
Merge pull request #7308 from SteveClement/tools 
chg: [installer] Update template for rhel7/8
 2021-04-07 14:08:48 +09:00
Steve Clement dad6515c6b
chg: [installer] Update template for rhel7/8 2021-04-07 14:08:14 +09:00
Steve Clement d4662a1187
Merge pull request #7307 from SteveClement/guides 
chg: [doc] Updates to RHEL7/8 doc
 2021-04-07 14:07:55 +09:00
Steve Clement 12ecbbeaed
chg: [doc] Updates to RHEL7/8 doc 2021-04-07 14:06:09 +09:00
Steve Clement 6a46f2fcc2
chg: [installer] Update to latest 2021-04-07 10:42:44 +09:00
Steve Clement f7830c4f04
Merge pull request #7306 from SteveClement/tools 2021-04-07 10:41:58 +09:00
Steve Clement c92837ecbf
chg: [installer] Updated template for RHEL install 2021-04-07 10:39:12 +09:00
StefanKelm a67c053558
add MalwareBazaar and URLhaus 
https://github.com/MISP/MISP/issues/7176
 2021-04-06 16:46:37 +02:00
mokaddem 6708ef3131
fix: [webroot:index] Make sure MISP works if cakephp is not installed via composer 2021-04-06 15:11:50 +02:00
Andras Iklody 45cfc81de0
Merge pull request #7303 from righel/fix-error-when-restoring-attribute-from-api 
fix: remove call to private method, call __alterAttributeCount() from…
 2021-04-06 14:55:59 +02:00
Luciano Righetti c8286a10f5 fix: remove call to private method, call __alterAttributeCount() from Attribute::restore() method. 2021-04-06 14:33:43 +02:00
mokaddem 10efa547f4
chg: [feeds:edit] Improved saving of edits 
Fix #7293
 2021-04-06 14:29:26 +02:00
mokaddem 108d1a3c76
chg: [event:search] Allow filtering by org uuid. 
Fix #7288
 2021-04-06 14:05:11 +02:00
Steve Clement 703b4ad8d9
chg: [fix] Missing version number 2021-04-06 15:36:14 +09:00
Steve Clement a487bc00ff
chg: [installer] Installer Update, RHEL support added. 2021-04-06 15:09:02 +09:00
Steve Clement 25071f3124
Merge pull request #7302 from SteveClement/tools 
chg: [installer] Minor clean-up
 2021-04-06 15:07:16 +09:00
Steve Clement f2764d6280
chg: [installer] Minor clean-up 2021-04-06 15:06:33 +09:00
Steve Clement 222e99e010
Merge pull request #7301 from SteveClement/tools 2021-04-06 15:03:24 +09:00
Steve Clement 5e4c39e939
Merge branch 'tools' of github.com:SteveClement/MISP into tools 2021-04-06 15:01:31 +09:00