MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
19,030 Commits
34 Branches
365 Tags
189 MiB
Commit Graph

19030 Commits (df9fa875038652aad331c84bcaa73227601a940e)

Author SHA1 Message Date
mokaddem df9fa87503
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-04-20 15:30:47 +02:00
mokaddem 514b09b4d6
fix: [feed:edit] Fixed bug preventing to recover feed data in the UI 2021-04-20 15:29:05 +02:00
Jakub Onderka c25dd7082a
Merge pull request #7230 from jozuatec/patch-2 
Update OidcAuthenticate.php
 2021-04-20 14:46:30 +02:00
Alexandre Dulaunoy 655fc61ba1
Merge branch '2.4' into develop 2021-04-20 11:37:50 +02:00
Alexandre Dulaunoy 88b7621f3c
chg: [warning-list] updated to the latest version 2021-04-20 11:37:19 +02:00
Raphaël Vinot 6e6487eb91 chg: [PyMISP] Bump. 2021-04-20 00:26:23 +02:00
iglocska 2119c17313
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-04-19 23:47:56 +02:00
iglocska 6c3dc5e0d5
fix: [factories] links and timestamps fixed 
- really annoying timestamp issue
- as discovered during LS21
 2021-04-19 23:46:51 +02:00
Alexandre Dulaunoy d39e9afbbc
Merge branch '2.4' into develop 2021-04-19 23:26:24 +02:00
Alexandre Dulaunoy 5c29288f3c
fix: [doc] moreutils package added (required for sponge) 
Fix #7353
 2021-04-19 23:23:16 +02:00
Raphaël Vinot 223ed9a01c chg: [PyMISP] Bump 2021-04-19 23:14:03 +02:00
Andras Iklody 26bb30cd59
Merge pull request #7235 from imidoriya/patch-1 
chg: [tag] Use detailed message in tag return
 2021-04-19 22:43:23 +02:00
Andras Iklody 5b8afa1a4f
Merge pull request #7342 from Wachizungu/fix-checkForDuplicateObjects-typo 
chg: [MispObject] fix copy paste error in checkForDuplicateObjects
 2021-04-19 22:41:45 +02:00
Andras Iklody ebfc5f21d5
Merge pull request #7343 from Wachizungu/fix-typo-in-editObject 
chg: [MispObject] fix copy paste error in editObject
 2021-04-19 22:41:21 +02:00
Andras Iklody e6eb4a480e
Merge pull request #7345 from Wachizungu/user-count-evolution-widget 
new: [Dashboard] Add user count evolution widget
 2021-04-19 22:41:01 +02:00
Andras Iklody e4c2502143
Merge pull request #7350 from Wachizungu/org-count-evolution-widget 
new: [Dashboard] Add org count evolution widget
 2021-04-19 22:40:26 +02:00
Jakub Onderka bf61ab342f
Merge pull request #7352 from JakubOnderka/revert-composer 
Revert composer
 2021-04-19 16:04:31 +02:00
Jakub Onderka ab37b355dd fix: [audit] Better path to cake version file 2021-04-19 13:31:43 +02:00
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 c36d9d8aa6
fix: [decaying:row_simulation] Removed buggy HTML title 2021-04-19 10:05:36 +02:00
mokaddem 9e4e0decbf
fix: [decaying:row_simulation] Correctly pass event data to galaxy element 2021-04-19 10:05:19 +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 c7e47b1bd9
Merge pull request #7326 from PROTechThor/contribute 
Improve contributing.md, Add coding style, workflow
 2021-04-19 07:42:30 +02:00
Jeroen Pinoy 8472f85ca4
new: [Dashboard] Add org count evolution widget 2021-04-18 00:37:09 +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
Jeroen Pinoy 741c167196
new: [Dashboard] Adding user count evolution widget 2021-04-16 17:41:21 +02:00
Alexandre Dulaunoy bd5aecdfd1
chg: [misp-galaxy] updated to the latest version 2021-04-15 15:22:55 +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
Jeroen Pinoy d1556d21b3
chg: [MispObject] fix copy paste error in editObject 2021-04-15 04:49:03 -07:00
Jeroen Pinoy 233c1f2fe9
chg: [MispObject] fix copy paste error in checkForDuplicateObjects 2021-04-15 04:39:47 -07: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
E. Cleopatra 4285fae3dd
chg: [doc] FIx links 2021-04-13 13:42:21 +01: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 2696246aa0
chg: [doc] Some minor changes 2021-04-12 13:47:32 +01:00