MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
5,120 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

5120 Commits (7f8a81e161bf6b46e45e036b6f4831b2ed45abb3)

Author SHA1 Message Date
iglocska 7f8a81e161 new: Added caching and pagination to freetext/csv feeds 2016-12-30 16:16:56 +01:00
iglocska 0db59a4bff Merge branch '2.4' into 2.4.59 2016-12-30 10:36:41 +01:00
iglocska 341d23892b fix: org field missing in log entry causing proposal sync to fail 
- Added SYSTEM as the default value
 2016-12-29 16:06:11 +01:00
iglocska 5b54171364 fix: Allow users to fetch their PGP keys 2016-12-29 13:34:41 +01:00
Alexandre Dulaunoy 22d4110524
fix: updated to the latest version of misp galaxy 2016-12-28 18:32:48 +01:00
Alexandre Dulaunoy 7973a0d5aa fix: PyMISP updated to the latest version 2016-12-28 18:31:28 +01:00
iglocska 6b4d80273e Merge branch 'feature/colour' into 2.4.59 2016-12-28 11:25:06 +01:00
iglocska 84f9fc6fcd new: Added session settings to the server settings 
- also, new method for writing the MISP config file
 2016-12-28 11:22:47 +01:00
iglocska 438f13afaa fix: Fixed the colour settings for taxonomies 2016-12-27 16:47:11 +01:00
iglocska 6ca728a674 chg: View the feed index via the API (to easily extract / share the settings) 2016-12-26 14:41:24 +01:00
iglocska 649c1144d0 fix: Show additional flags for non MISP feeds 2016-12-26 14:24:26 +01:00
iglocska 5a58d0d8d5 chg: Added colour fields to sql files 2016-12-25 18:13:51 +01:00
iglocska 446640e1d7 chg: Colour field backticks removed 2016-12-24 23:35:57 +01:00
iglocska e22300080c chg: Added colour fields to taxonomies 2016-12-24 23:35:17 +01:00
Andras Iklody 1b95b84bab Merge pull request #1786 from RichieB2B/ncsc-nl/fix-fuzzy 
Fix STIX exports for malware-sample attributes
 2016-12-23 14:25:01 +01:00
Richard van den Berg 98091a34f7 Fix STIX exports for malware-sample attributes 2016-12-23 14:12:40 +01:00
iglocska dcf08c00a9 fix: Fixed a new issue introduced in ajax response handling 2016-12-23 13:46:53 +01:00
iglocska 0791f72fce Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-12-23 12:54:17 +01:00
iglocska 0e460822dd fix: Invalid element load while browsing the galaxies, fixes #1752 
- was hard to spot at first, but indeed the bug is as described in the issue and masked by an ajax load of the contents
 2016-12-23 12:53:02 +01:00
Andras Iklody ec2cb5d18b Merge pull request #1784 from SteveClement/patch-1 
Broken Image Typo
 2016-12-23 09:34:05 +01:00
Steve Clement f3089cc2dd Broken Image Typo 
Remove bang (!) so it doesn't get interpreted as an image.
 2016-12-23 09:30:08 +01:00
iglocska 07822ffbd6 fix: Only show related events in red if it's created by the same org, fixes #1528 
- was using the local owner id instead of the creator id
 2016-12-23 08:34:12 +01:00
iglocska a169a9bd56 fix: Small fix on the attribute correlation popup's header 
- F-A-I-L
 2016-12-22 21:13:33 +01:00
iglocska e28cf5c17a Merge branch 'feature/disable_correlation' into 2.4 2016-12-22 21:02:35 +01:00
iglocska da433c3549 Merge branch '2.4' of https://github.com/MISP/MISP into feature/disable_correlation 2016-12-22 21:01:58 +01:00
iglocska 59619f7c3a fix: Don't show the attribute level correlation checkboxes if the event correlation is disabled 2016-12-22 20:42:34 +01:00
iglocska bff10779a8 fix: Invalid closing tag 
- copy pasta fail supreme
 2016-12-22 20:31:10 +01:00
iglocska 3a2e051b91 fix: Added an alternative to bcmod if it doesn't exist 
- simply threw an exception if the module wasn't loaded on the event view if it contained an IBAN number
 2016-12-22 18:06:20 +01:00
iglocska b1fa7db672 fix: Added ACL changes 2016-12-22 17:51:46 +01:00
iglocska 672a681819 fix: Some fixes with the automatic publish/unpublish feedback 
- automatically set the event to unpublished in the view when adding/removing tags
- officially the keep @RichieB2B happy patch ;)
 2016-12-22 17:46:52 +01:00
iglocska 4aec4e4beb fix: Unpublish events when tagging/removing tags 
- same for galaxy clusters
- also, new ajax way of showing/hiding published status
 2016-12-22 17:30:27 +01:00
Alexandre Dulaunoy aceba4d098 fix: MISP galaxy update 2016-12-22 16:00:38 +01:00
iglocska e8e248dd42 fix: Invalid lookup caused the same message to be displayed on correlation disabling and enabling for attributs 2016-12-22 15:48:59 +01:00
iglocska ffe880621e new: Disable correlation 
- globally
- on an event level
- on an attribute level
 2016-12-22 15:30:06 +01:00
iglocska 106f8b546f fix: Set event to locked = 1 when importing from a MISP export 2016-12-22 15:11:14 +01:00
iglocska 82ab3ed8d3 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-12-22 14:04:34 +01:00
iglocska dd3ea9f0f4 chg: Updated misp galaxies 2016-12-22 14:04:10 +01:00
Andras Iklody 6a3ae15f13 Merge pull request #1779 from RichieB2B/nscs-nl/fuzzyhash 
Use Fuzzy_Hash_Value for ssdeep
 2016-12-21 23:06:16 +01:00
Richard van den Berg afd88f3b38 Use Fuzzy_Hash_Value for ssdeep 2016-12-21 21:32:52 +01:00
iglocska c14869a35b fix: Changed bro cached export to the .intel extension 2016-12-21 19:10:55 +01:00
Andras Iklody b29ee07a6c fix: Changed bro file extension to .intel 2016-12-21 18:46:06 +01:00
Andras Iklody ac994530e6 fix: broken bro export 
- Sanitisation issues with linebreaks in comments breaking the export
 2016-12-21 17:35:00 +01:00
iglocska 64a65d956a fix: Cluster synonyms were shown twice on the event view, fixes #1777 2016-12-21 09:49:14 +01:00
Andras Iklody 017959ec19 fix: Pull not respecting negated tag rules fixed, fixes #1775 2016-12-20 17:43:24 +01:00
Andras Iklody 871710c7e1 Merge pull request #1774 from enemarke/2.4 
Added support for creating users into different roles depending on ld…
 2016-12-20 15:27:26 +01:00
Emil Enemærke ca3a1b0e9e Added support for creating users into different roles depending on ldap group membership 2016-12-20 14:53:25 +01:00
iglocska 0749273e54 fix: failtypo fixed 2016-12-19 17:48:30 +01:00
iglocska 3661be08cc Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-12-19 17:36:44 +01:00
iglocska 37d9e3b276 Merge branch '2.4.57' into 2.4 2016-12-19 17:36:19 +01:00
iglocska ea4b0c4992 chg: Added documentation on the warninglist enforcement to the automation page 
- also added a bunch of missing parameter descriptions
- added missing code for some of the warninglist enforcement calls
 2016-12-19 17:19:40 +01:00