MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
6,648 Commits
63 Branches
383 Tags
216 MiB
Commit Graph

6648 Commits (67d37a283faab5c95e88cb539743b26c8e2743d6)

Author SHA1 Message Date
chrisr3d 18f6a751ca Merge branch '2.4' of github.com:MISP/MISP into 2.4 2017-10-25 12:12:23 +02:00
chrisr3d 2c09c28229 Parsing Identity SDOs for 'Person' category attributes 2017-10-25 12:06:35 +02:00
iglocska a5a7bf47b3 fix: Added initialisation of Log model in the editAttribute() function if the save fails 2017-10-25 10:53:04 +02:00
chrisr3d ba71effd12 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2017-10-24 16:10:29 +02:00
Andras Iklody 6c5bbfe01c Merge pull request #2589 from jurg/attrtypefix 
bugfix for selecting type in adding / editing attribute
 2017-10-24 12:14:34 +02:00
chrisr3d 6a79bfe859 Using PyMISP attributes 
wip: Waiting for some PyMISP issues to be fixed
 2017-10-24 11:55:55 +02:00
Andras Iklody 5157141425 fix: Change 2/2 for fixing the feed scheduler fixes #2503 
As described by @lucamemini
 2017-10-23 18:07:14 +02:00
Andras Iklody 87eef1f170 fix: Change 1/2 for fixing the feed scheduler fixes #2503 
As described by @lucamemini
 2017-10-23 18:06:10 +02:00
Raphaël Vinot 0530fe86ed Merge branch '2.4' of github.com:MISP/MISP into 2.4 2017-10-23 14:28:03 +02:00
Raphaël Vinot d1a6cfdd1c Using PyMISP MISPEvent class to parse events 2017-10-23 14:26:32 +02:00
Jorgen Bohnsdalen 34a48b0b82 bugfix for selecting type in adding / editing attribute 2017-10-20 19:41:32 +02:00
Andras Iklody 91c7a78f9d Merge pull request #2585 from ppanero/2.4 
Beautify edit object validation
 2017-10-20 16:40:15 +02:00
Andras Iklody 9fd5897e14 Merge branch '2.4' into 2.4 2017-10-20 16:40:06 +02:00
Andras Iklody f697bb44c8 Merge pull request #2588 from ppanero/bugfix 
bugfix for listing types when editing non object attrs
 2017-10-20 16:36:48 +02:00
ppanero 6b84df2d28 bugfix for listing types when editing non object attrs 2017-10-20 16:33:50 +02:00
ppanero f5703a665f bug fix for listing types when editing non object attr 2017-10-20 16:28:49 +02:00
ppanero 65278f3f0e beautify object edit validattion 2017-10-20 16:28:49 +02:00
iglocska 9716262821 fix: Allow proposing changes to object attributes 2017-10-20 16:00:22 +02:00
iglocska 70ff40a897 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-10-20 15:58:48 +02:00
iglocska ef6f5b490c Revert "Fix: Attribute type list when editing should be the category's one if already selected" 
This reverts commit 27f30aae3b.
 2017-10-20 15:56:18 +02:00
Andras Iklody 82814abad0 Merge pull request #2587 from RichieB2B/ncsc-nl/stixorgs 
Add Reporter and Producer fields to STIX
 2017-10-20 15:31:43 +02:00
Richard van den Berg f6ce819573 Add Reporter to STIX Indicent 
Add Producer to STIX Indicator
 2017-10-20 15:19:18 +02:00
Andras Iklody 0c7559ecb1 Merge pull request #2584 from RichieB2B/ncsc-nl/searchtag 
Speed up tag searches
 2017-10-20 14:35:25 +02:00
iglocska 34eb835f69 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-10-20 14:34:53 +02:00
iglocska a9d156f0e2 fix: Added default category for gender 2017-10-20 14:34:39 +02:00
iglocska 68d9a14ab6 fix: Added missing IP field to logs 2017-10-20 14:34:18 +02:00
Richard van den Berg b5972fb6e7 Speed up tag searches, fixes #2407 2017-10-20 14:22:22 +02:00
Andras Iklody c195239d25 Merge pull request #2582 from ppanero/2.4 
Fix: Attribute type list when editing should be the category's one if…
 2017-10-20 11:38:37 +02:00
ppanero 27f30aae3b Fix: Attribute type list when editing should be the category's one if already selected 2017-10-20 11:28:23 +02:00
iglocska 694e41671c Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-10-20 02:12:05 +02:00
iglocska 0c6e31cf05 fix: Added comment field to objects, fixes #2560 2017-10-20 02:05:58 +02:00
Alexandre Dulaunoy 95847c9b12
fix: misp-objects updated to the latest version 2017-10-19 16:21:29 +02:00
Andras Iklody 83957953bc Merge pull request #2576 from 98Giraffe/fix-type-o-in-diagnostics-settings 
Fixed type-o in  Server Settings -> Diagnostics -> Advanced attachmen…
 2017-10-18 17:34:15 +02:00
Joseph Dane 34598debfb Fixed type-o in Server Settings -> Diagnostics -> Advanced attachment handler, when referencing pymisp the message stated pydeep 2017-10-18 10:46:03 -04:00
chrisr3d f6bdb8c16d Added exploit-kit as a Tool SDO 2017-10-18 14:08:21 +02:00
chrisr3d 08c938cd82 Removed a nonexistent 'non_indicator_attribute' 2017-10-18 10:53:23 +02:00
chrisr3d 7b30a40df3 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2017-10-18 10:40:22 +02:00
iglocska 30521fdcf1 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-10-18 08:26:53 +02:00
iglocska b535adc779 fix: Added email-message-id's default category 2017-10-18 08:26:31 +02:00
chrisr3d d02592d221 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2017-10-17 16:17:39 +02:00
chrisr3d 22d4a8fcf8 Added Course of Action SDO 2017-10-17 16:17:11 +02:00
Alexandre Dulaunoy 74cb1333e3 Merge pull request #2568 from bambenek/2.4 
Take 2: Changing which bambenek consulting DGA feeds are pulled in defaults.json
 2017-10-17 00:20:21 +02:00
John Bambenek b7d77d7806 Typofix 2017-10-16 11:15:32 -05:00
chrisr3d 4dfd5f32c9 Added some Galaxy objects that can be easily mapped 2017-10-16 15:02:59 +02:00
John Bambenek c099154575 Making changes to feed file to point to different bambenek consulting DGA feeds. 2017-10-16 04:17:07 -05:00
Andras Iklody 3ab50ffbd8 Merge pull request #2565 from RichieB2B/ncsc-nl/fix-2561 
Add file objects to STIX 1 export
 2017-10-14 20:07:50 +02:00
iglocska b1808ed5ea fix: Fixed an issue that caused an event edit to fail due to the invalid refresh of the correlations 2017-10-13 17:39:33 +02:00
iglocska 1525f56f95 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-10-13 16:56:30 +02:00
iglocska 7372831614 fix: Fixed a bug with the restSearch API 2017-10-13 16:56:13 +02:00
chrisr3d 3b3b1b42c5 Added malware-sample case 
Also fixed some 'pattern' fields in the dictionary
 2017-10-13 16:31:33 +02:00