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

14946 Commits (2b2c93b766f9ac05e7bfc5d47de3b005ffe3be8a)

Author SHA1 Message Date
iglocska d2ed0c8956
fix: [internal] Edge case where due to an old invalid update script an instance could end up with the wrong key in user settings 
- this should resolve the issue for affected users
- no change for everyone else
 2020-04-29 16:13:54 +02:00
iglocska e9c00cb1b4
fix: [otp] pre-auth action list only expanded if otp is enabled 2020-04-29 15:55:22 +02:00
iglocska 6ec8391e46
Merge branch '5726' into 2.4 2020-04-29 15:50:01 +02:00
iglocska a922bfa6f5
chg: [otp] monor changes 
- i18n
- function naming convention
 2020-04-29 15:49:15 +02:00
kscheetz 9c0833974c Merge branch 'stix2-info-patch' of https://github.com/pan-unit42/MISP into stix2-info-patch 2020-04-29 09:49:11 -04:00
kscheetz e381621a39 Fixes missing self argument bug. 2020-04-29 09:48:48 -04:00
kscheetz b1124f23d1 Moved info assignment to method. 2020-04-29 09:48:48 -04:00
kscheetz 631800b80e Simplification for code complexity reqs. 2020-04-29 09:48:48 -04:00
kscheetz 9fcc9f91bb Preserve report order. 2020-04-29 09:48:48 -04:00
kscheetz 10cf9e296d Stix2 importer naming change. 2020-04-29 09:48:48 -04:00
iglocska 3bdbe0ed19
fix: [otp] enabling it requires e-mailing to be enabled 2020-04-29 15:48:43 +02:00
iglocska 55d498374b
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-28 17:47:19 +02:00
iglocska 30eeb4e39c
fix: [ACL] a private function was missing the __ causing the ACL checker to return it as an unmapped accessible function 2020-04-28 17:46:38 +02:00
kscheetz 5a724479c7 Merge branch '2.4' into stix2-info-patch 2020-04-28 11:02:05 -04:00
kscheetz 80d80162b4 Fixes missing self argument bug. 2020-04-28 10:28:38 -04:00
Jakub Onderka 4dec19dedf new: [feed] Support for compressed feeds 2020-04-28 16:16:34 +02:00
kscheetz 238a6adeff Moved info assignment to method. 2020-04-28 10:14:29 -04:00
kscheetz 40077e9ea7 Simplification for code complexity reqs. 2020-04-28 10:09:25 -04:00
Andras Iklody f30959f274
Merge pull request #5561 from JakubOnderka/is_rest_cache 
chg: [internal] Cache result of AppController::_isRest method
 2020-04-28 15:46:24 +02:00
iglocska 83985a2c4e
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-28 15:44:23 +02:00
iglocska d08058ea74
Merge branch '5272' into 2.4 2020-04-28 15:44:08 +02:00
iglocska 5ea3cf0250
chg: [advanced extraction] is now the default 2020-04-28 15:43:48 +02:00
iglocska a1810a313c
chg: [small changes] improve double loading of models 
- some minor changes to improve performance slightly
- some i18n additions (weren't present before the PR either)
 2020-04-28 15:42:58 +02:00
iglocska 1c3dc3fe51
Merge branch '2.4' into 5272 2020-04-28 15:31:17 +02:00
Andras Iklody 2217edb8d4
Merge pull request #5816 from Applenice/2.4 
Modify the default parsing settings of Phishtank feed
 2020-04-28 15:24:22 +02:00
iglocska cea8547eb7
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-28 15:23:37 +02:00
iglocska 42c7945de3
Merge branch '5819' into 2.4 2020-04-28 15:23:30 +02:00
kscheetz 12c2f25f31 Merge branch '2.4' into stix2-info-patch 2020-04-28 09:02:17 -04:00
mokaddem ec634e4262
Merge branch 'pr-5827' into 2.4 2020-04-28 14:40:42 +02:00
mokaddem fc8fa6f7c2
Merge remote-tracking branch 'origin/2.4' into pr-5827 2020-04-28 14:40:26 +02:00
mokaddem ce83af7662
Merge branch 'pr5709' into 2.4 2020-04-28 11:48:03 +02:00
mokaddem 90aff9abcf
Merge remote-tracking branch 'origin/2.4' into pr5709 2020-04-28 11:47:50 +02:00
mokaddem 9b56356dfe
Merge branch 'JakubOnderka-event_loading_speedup' into 2.4 2020-04-28 11:40:28 +02:00
mokaddem 94bf826841
Merge remote-tracking branch 'origin/2.4' into JakubOnderka-event_loading_speedup 2020-04-28 11:39:51 +02:00
mokaddem 9cc26821b0
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-28 11:01:11 +02:00
mokaddem f2f1fc2170
chg: [Log:beforeSave] Fallback to `SYSTEM` Org if field empty 2020-04-28 11:00:49 +02:00
mokaddem 3070dab744
Merge branch 'JakubOnderka-patch-96' into 2.4 2020-04-28 10:59:33 +02:00
mokaddem 3bc5bd920f
Merge branch '2.4' into JakubOnderka-patch-96 2020-04-28 10:59:07 +02:00
Andras Iklody 90b8a62ef7
Update SECURITY.md 2020-04-28 10:47:04 +02:00
Andras Iklody 777489acff
Merge pull request #5833 from MISP/Rafiot-patch-5 
Update SECURITY.md
 2020-04-28 10:45:29 +02:00
Raphaël Vinot 9f9944ccb2
Update SECURITY.md 2020-04-28 10:43:00 +02:00
iglocska 8b4751211a
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-28 10:24:46 +02:00
iglocska 4f0ae81952
new: [security] added policy for github 2020-04-28 10:24:16 +02:00
mokaddem 2ad846fbfb
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-28 10:01:19 +02:00
mokaddem ffad8d9189
chg: [events:view] Support of `extended` for posted data 2020-04-28 10:00:36 +02:00
Christophe Vandeplas 5495140c3b
fix: [event] fixes missing correlations with combined types (#5832) 
* fix: [event] fixes missing correlations with combined types

also some other missing variable bug
 2020-04-28 10:00:09 +02:00
mokaddem 35eca844d0
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-28 09:30:17 +02:00
iglocska 8389a32cc8
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-28 09:29:11 +02:00
iglocska ad439e0b4d
fix: [pagination] Fixed bottom pagination links on the bottom 2020-04-28 09:28:42 +02:00
mokaddem c03a31fe5d
Merge branch 'JakubOnderka-redis-delete-multiple' into 2.4 2020-04-28 09:16:40 +02:00