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

3334 Commits (3c8f5f1442c5dbd5ac6ecc7f539a64c6f13e6444)

Author SHA1 Message Date
Alexandre Dulaunoy 3c8f5f1442 delegation of sharing added in README 
**delegating of sharing**: allows a simple pseudo-anonymous mechanism
to delegate publication of event/indicators to another organization.
 2016-02-13 13:42:04 +01:00
Iglocska b8ecd9fee1 Version bump and footer version fix 2016-02-13 13:14:26 +01:00
Iglocska ed0ccd2053 Merge branch 'features/delegation' into 2.4 2016-02-13 13:03:09 +01:00
Iglocska bb62f2dde1 Hovering over an attribute correlations shows the correlated value 
- this helps with composite attributes where only one half of the attribute correlates
 2016-02-12 12:01:27 +01:00
Iglocska 18e34124ad Merge fixes 2016-02-12 06:08:57 +01:00
Iglocska b51e39200b merge fixes 2016-02-12 05:58:22 +01:00
Iglocska 4c14d3a859 Merge branch '2.4' into features/delegation 
Conflicts:
	app/Controller/AppController.php
	app/Model/AppModel.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/View/Elements/footer.ctp
	app/webroot/css/main.css
 2016-02-12 05:56:32 +01:00
Iglocska e47e880571 Removed an invalid version check 2016-02-12 05:49:10 +01:00
Iglocska a1ffdc7790 First finished version 2016-02-12 05:47:06 +01:00
Iglocska f81960f6ca Version bump 2016-02-11 15:45:45 +01:00
Iglocska e500c67c9a Merge branch 'feature/syncfix' into 2.4 2016-02-11 15:45:18 +01:00
Iglocska a55c344f07 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-02-11 15:45:06 +01:00
Alexandre Dulaunoy 9951eea8bc Merge pull request #931 from Rafiot/pick 
Cherry-picked #930
 2016-02-11 15:41:14 +01:00
Iglocska 50df04f9a1 Fix to the tag import from XML if there is only a single tag 
- Single element XML import issue is back for the event tag
- fixed
 2016-02-11 15:35:37 +01:00
Richard van den Berg 5c5da12f6e Add conditions for generateEmailAttachmentObject 2016-02-11 15:25:20 +01:00
Richard van den Berg b9daebbf33 Add conditions for resolveEmailObservable 2016-02-11 15:25:20 +01:00
Richard van den Berg 4bd7eddc0d Add conditions for generateFileObservable 2016-02-11 15:25:20 +01:00
Richard van den Berg 5336ad7b7e Set conditions for simple observables 2016-02-11 15:25:20 +01:00
Richard van den Berg f591c19d5f Use constant Exploit Target id 2016-02-11 15:25:20 +01:00
Richard van den Berg ab8285af78 Remove leading backslashes 2016-02-11 15:25:20 +01:00
Richard van den Berg c9745f3d7c Fix typo 2016-02-11 15:25:20 +01:00
Richard van den Berg 1acdb9646f Add RegKey hives and conditions 2016-02-11 15:25:20 +01:00
Richard van den Berg d346af1b83 Add ExploitTarget title 2016-02-11 15:25:20 +01:00
Iglocska f943b4539f Merge branch 'feature/syncfix' of https://github.com/MISP/MISP into feature/syncfix 2016-02-11 14:56:46 +01:00
Iglocska e8419f2c5e Remove modified from the fields to keep when updating a sharing group 2016-02-11 14:56:05 +01:00
Iglocska 7dda8f9217 Hunting down the remaining issues 
- creating a random number for the name should only happen on new entries, not on edits
- a sharing group edit can still contain new organisations, create them appropriately
 2016-02-11 14:54:16 +01:00
Alexandre Dulaunoy e17b6e1982 MISP taxonomies added 2016-02-11 14:36:02 +01:00
Iglocska 714af83449 Other half of the fix to the UUID issue with sharing groups 2016-02-10 23:48:39 +01:00
Iglocska 35e255048a first take at the fix to the UUID issue with sharing groups 2016-02-10 21:58:00 +01:00
Alexandre Dulaunoy 4d7d6598fb Merge pull request #926 from wllm-rbnt/2.4 
Fix typos
 2016-02-10 21:36:14 +01:00
William Robinet b726ccf955 Fix typos 2016-02-10 16:38:44 +01:00
Iglocska 5c1a5fad75 Fixes to the event downloads / APIs 
- download event as JSON now has the option to include attachments
- switched to using the restsearch api instead of the deprecated /events/xml API

- added attachment inclusion to both restsearch apis

- fixed some bugs with the API
 2016-02-09 15:43:09 +01:00
Iglocska ba300fcf11 Added option to download CSVs of non published events 
- automatically overrides IDS flag too
 2016-02-08 17:45:13 +01:00
Iglocska e210c60708 Issue with filter taxonomies details, fixes #920 
The filter options are now added to the pagination
 2016-02-08 14:08:48 +01:00
Iglocska 89198e028b Removing PEM from a server connection parameter, fixes #771 
- Added a way to remove the certificate file when editing the server connection
- Also, it shows the currently selected certificate file as it caused some confusion before
 2016-02-07 21:00:40 +01:00
Iglocska 40b348ebfa Order alphabetically organisations in list of organisations to add, fixes #918 2016-02-06 20:01:14 +01:00
Iglocska 28cf469996 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-02-05 19:29:48 +01:00
Iglocska da95a19323 Don't display options to users for which they don't have the rights to use, fixes #880 2016-02-05 19:29:17 +01:00
Andras Iklody 16daf1b545 Merge pull request #919 from deralexxx/patch-1 
Update Whitelist.php
 2016-02-05 11:21:38 +01:00
Alexander J 4a9d486fab Update Whitelist.php 
https://github.com/MISP/MISP/issues/681
 2016-02-05 08:30:02 +01:00
Iglocska ecf404b071 Taxonomies update 2016-02-04 18:25:26 +01:00
Iglocska 9ad6f93e7d Tag / taxonomy enabling made easy, fixes #914 
- Enable tags for a taxonomy in one go
- Have an indicator of how many tags there are in the taxonomy and how many are enabled
 2016-02-04 18:21:02 +01:00
Iglocska cf62635655 Default threat level setting for instance added 2016-02-04 14:19:41 +01:00
Iglocska 1ffa52e032 Fixed the progress bars on the export view, fixes #902 2016-02-03 11:55:05 +01:00
Iglocska 6353de1e58 Template population menu fixes 2016-02-03 10:16:03 +01:00
Iglocska d69065450c Fixed a display issue for the template choices when the name of a template is empty 2016-02-03 10:08:06 +01:00
Iglocska f441d212f9 Removing template elements fixed, fixes #899 2016-02-03 09:59:35 +01:00
Iglocska 07a03abdc7 Fixed adding / removing tags to a template, fixes #898 2016-02-03 09:59:03 +01:00
Iglocska b8591674ef Further fixes to the contact e-mail 2016-02-02 18:19:09 +01:00
Iglocska a69364f786 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-02-02 17:54:11 +01:00