MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
11,389 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

879 Commits (76d14c00cbc2e5215814eb18e8e0f6b6c83c7763)

Author SHA1 Message Date
iglocska 76d14c00cb Merge branch 'thumbnail' into 2.4 2019-03-29 20:29:37 +01:00
Steve Clement b2191c9927
Merge pull request #4252 from mokaddem/sightingFiltering 
Sighting filtering
 2019-03-28 14:50:15 +01:00
iglocska 7141f70b20 Merge branch 'kafka' into 2.4 2019-03-19 17:23:05 +01:00
iglocska 6efd909bfe new: [Required taxonomies] 
- Flip taxonomies into required mode to ensure that events cannot be published without at least one tag from each required taxonomy to be set
 2019-03-19 15:59:31 +01:00
Nikos Filippakis 9d59b10368 Publish events to Kafka 
Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>
 2019-03-18 15:53:22 +01:00
mokaddem 52e2b9dea7 Merge branch '2.4' of github.com:MISP/MISP into sightingFiltering 2019-03-18 13:37:53 +01:00
mokaddem 7c40de3036 chg: [Attribute] Implemented Iglocska review 
- Do not pass image data to the view anymore
- Improved conditions
- Added light support of gif
 2019-03-18 09:59:54 +01:00
Nikos Filippakis b783b5e393 Fix checking of incorrect flags when publishing to ZMQ 
* Check Plugin.ZeroMQ_event_notifications_enable instead of Plugin.ZeroMQ_attribute_notifications_enable in Event.php
* Check Plugin.ZeroMQ_audit_notifications_enable instead of Plugin.ZeroMQ_user_notifications_enable in Log.php
* Check Plugin.ZeroMQ_object_notifications_enable instead of Plugin.ZeroMQ_attribute_notifications_enable in MispObject.php

Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>
 2019-03-13 11:51:40 +01:00
iglocska 6f46c022de fix: [object references] Fixed an issue with the reference type not being loaded correctly 2019-03-11 16:44:34 +01:00
iglocska 45fdac214f fix: [grammar] Pluralisation fixed for the freetext import results, fixes #4021 
- Sunday last minute commit aced
 2019-03-03 23:41:58 +01:00
mokaddem 823078f834 new: [eventFiltering] Added support of sighting filtering 2019-03-01 11:54:29 +01:00
iglocska 71c4014ba5 new: [setting] Use the new setting to set the urls to the current instance on sharing groups when pushing the info via the API 2019-02-19 09:38:37 +01:00
Alexandre Dulaunoy 0a47c3e3be
Merge pull request #4076 from mokaddem/eventFiltering 
Event filtering tool
 2019-02-15 16:34:15 +01:00
mokaddem 1feb96b034 new: [eventFiltering] Added support of toIDS 2019-02-15 16:28:04 +01:00
Hannah Ward 8eb9013f49
fix: Do not increment count after DB query 2019-02-15 14:19:37 +00:00
Hannah Ward d4224f10c1
new: Add pre-pagination result count to headers 
Fixes #4161
 2019-02-15 13:48:48 +00:00
mokaddem c66518afb9 chg: [eventFiltering] Added support of feed and server while filtering 
objects
 2019-02-13 15:39:41 +01:00
mokaddem 5516b4f603 new: [eventFiltering] Added support of server and feed hits filtering 2019-02-13 11:30:05 +01:00
mokaddem 965184da24 Merge branch '2.4' of github.com:MISP/MISP into eventFiltering 2019-02-13 08:48:27 +01:00
Christophe Vandeplas ad9db27010 fix: [API] Galaxies still present as Tag in JSON export fixes #4133 2019-02-10 13:10:40 +01:00
Christophe Vandeplas 67efc70bf5 fix: [style] consistent space indentation 2019-02-10 13:08:55 +01:00
iglocska db88592970 chg: [internal] Moved time resolution to appmodel 2019-02-06 17:46:36 +01:00
mokaddem eeae6f05b8 fix: [eventFiltering] Removed debug commands 2019-02-01 15:17:44 +01:00
mokaddem f791fbbe7a chg: [eventFiltering] Simplified filtering conditions and fixed 
`deletion` proposal layout
 2019-02-01 15:15:30 +01:00
mokaddem 494faf2745 chg: [eventFiltering] WIP - Simplified filtering conditions 2019-02-01 10:33:50 +01:00
mokaddem bd47e9c38d chg: [eventFiltering] WIP - fixed filtering bugs and improved warning 
filtering
 2019-02-01 09:46:41 +01:00
mokaddem 7bf66a0d14 chg: [eventFiltering] WIP -Improved filtering and UI 2019-01-31 16:22:11 +01:00
mokaddem 1b3de72883 chg: [eventFiltering] WIP - Integrating new filtering behavior into 
Model
 2019-01-31 14:39:24 +01:00
chrisr3d e33f0caa4e
fix: [Model] Fixed includeAttachments parameters for stix 1&2 export 2019-01-28 08:45:00 +01:00
chrisr3d 6a8e4b139f
fix: [Model] Added disable_correlation flag to the attributes of the original imported file object 2019-01-25 17:12:15 +01:00
iglocska 55fb4e9d17 fix: [copy-pasta] Oops 2019-01-24 16:49:01 +01:00
iglocska 1622fba5cc fix: [stix] Missing data fields added to object malware samples 2019-01-24 16:43:34 +01:00
iglocska e0bcc2eae7 fix: [attribute warnings] financial warnings not showing up in the warnings tab 2019-01-22 13:37:07 +01:00
iglocska 8086b9de0a Merge branch 'features/server_caching' into 2.4 2019-01-18 16:16:00 +01:00
iglocska 24146af9db new: [remote caching] First release version of the remote caching 2019-01-18 16:15:22 +01:00
iglocska eb56fe4e01 chg: [remote cache] Further progress on caching remote instances 2019-01-18 15:33:04 +01:00
mokaddem 8a710ea367 Merge branch '2.4' into UISelector 2019-01-17 14:54:15 +01:00
mokaddem e005c92dd9 fix: [massageTag] variable name collision causing tags to disappear 2019-01-17 09:29:58 +01:00
iglocska 98248f9706 fix: [internal] EventID filter now accepts uuid and ID correctly 2019-01-17 08:31:13 +01:00
iglocska 9318d63156 fix: [internal] Fixed uuid/id lookups not working on the attribute level 2019-01-16 11:08:42 +01:00
iglocska 8f9c6c1be6 Merge branch '2.4' into tag_collections 2019-01-01 17:38:32 +01:00
iglocska 6e8afdaa3a new: [tag collections] Add default tag collection per instance 2019-01-01 17:11:10 +01:00
iglocska 760dbed37d new: [tag collections] First feature complete minimal version of the tag collection system 2019-01-01 16:38:57 +01:00
iglocska 65709a353b Merge branch 'qb' into 2.4 2018-12-31 08:04:12 +01:00
iglocska 1b358f730e fix: [correlations] Invalid orgc loaded in the attribute level correlations, fixes #3948 2018-12-18 10:24:11 +01:00
iglocska 5e8392ae3f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-18 09:46:48 +01:00
iglocska ba3ae0094c chg: [WIP] added function meant to resolve id vs uuid issues for the UI attribute search 
- still needs some love
 2018-12-18 09:46:02 +01:00
Sami Mokaddem ed4f752d3a Merge remote-tracking branch 'origin/2.4' into querybuilder 2018-12-17 16:36:27 +01:00
chrisr3d dee614b4b8
fix: [stix 1&2 import] Fixed version attribute of the original filename 2018-12-12 10:19:40 +01:00
iglocska 06fd4bba4e fix: [internal] Fixed the original file capture tool 2018-12-06 12:01:30 +01:00