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

14 Commits (898ea1d97c5aae2841450b1afc2fa7cb88f65277)

Author SHA1 Message Date
Andreas Ziegler 898ea1d97c remove whitespace (space/tab) from empty lines 2016-06-04 01:08:16 +02:00
Iglocska f4b7c101e5 chg: Attribute search download also offered as JSON, fixes #1035 
- also added some convenience functions for JSON/XML collections in the appropriate export tools
- can start reusing them in other functionalities
 2016-05-02 10:31:40 +02:00
Iglocska 968fb75165 Pretty print event JSONs 2016-04-18 10:06:16 +02:00
Iglocska 3c98d3fa9b JSON structure inconsistencies and bug, fixes #1065 2016-04-08 16:47:22 +02:00
iglocska 627f9abbd6 Fix to several issues with the sync and and an issue preventing the editing of events, fixes #788, fixes #784 2015-12-24 15:22:05 +01:00
Iglocska d433618c71 Also, enabled the filtering on pull 
Merge branch 'master' into 2.4-beta

Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
	app/Model/Server.php
 2015-12-03 00:27:56 +01:00
iglocska 268c7683a0 Rework of the event add/edit 
- allows for saving an event even if an attribute fails
  - logs attributes that fail validation

- same for edit

- add_misp_export updated with the above in mind
 2015-12-01 15:39:12 +01:00
Iglocska 5dbbe84069 Merge branch 'master' into 2.4-beta 
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Controller/ShadowAttributesController.php
	app/Model/Event.php
	app/View/Elements/side_menu.ctp
 2015-11-30 09:37:22 +01:00
iglocska 9eb5680ee8 Reimplementation of the Add XML feature 
- called Add MISP export now
- can be an XML / JSON file
- result browser with explanations of failures

- REST XML/JSON add/edit of events returns errors instead of the partially succeeding event
 2015-11-30 02:28:07 +01:00
iglocska ef1d3949e7 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
	app/Controller/ShadowAttributesController.php
	app/Lib/Tools/JSONConverterTool.php
	app/Lib/Tools/XMLConverterTool.php
	app/Model/User.php
	app/View/Elements/eventattribute.ctp
 2015-10-22 09:59:00 +02:00
Iglocska 7fab2ce2be Added the attribute relations to the XML / JSON output, fixes #687 2015-10-15 17:39:17 +02:00
Iglocska b163164450 Further work on the sharing groups 2015-04-13 17:52:04 +02:00
Iglocska 28069a0a0f Further work and some cleanup 
- decision to be revised: exports don't expose Sharing groups / org uuids to users unless they are admin (for the future: at least sync users have to be added for the new sync)
 2015-04-13 16:20:21 +02:00
iglocska 0dd8318fb3 Further work on the exports 
- Performance improvements for the event search exports
- JSON view code moved to Lib
- Fixed an issue that didn't restrict the dates correctly with the from / to parameters
 2015-02-16 17:31:32 +01:00