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

3129 Commits (52f429e3c7023725139e43a9c9b37fcefc329072)

Author SHA1 Message Date
iglocska 9c00d56ed4 View all proposals via the API 
- Proposals that can be accepted / discarded via the API
- Can restrict the index to the proposals of a single event
 2015-10-31 00:18:05 +01:00
iglocska e12d70c5c3 Merge branch 'hotfix-2.3.149' into develop 2015-10-30 16:30:34 +01:00
iglocska 70eb812060 Merge branch 'hotfix-2.3.149' 2015-10-30 16:29:32 +01:00
iglocska 345e898f5f Tagging added to the API 
- Create / Edit / Remove / index / view tags via the API
 2015-10-30 16:28:51 +01:00
Iglocska 7a686a2718 Merge branch 'master' into 2.4-beta 
Also, reworked a lot of remaining distribution checks not handled by the main fetch methods

Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/ShadowAttributesController.php
	app/View/ShadowAttributes/add.ctp
	app/View/ShadowAttributes/edit.ctp
 2015-10-30 13:39:12 +01:00
Iglocska fdd75f4ae4 Merge branch 'hotfix-2.3.148' into develop 2015-10-28 23:34:58 +01:00
Iglocska 70e776eff1 Merge branch 'hotfix-2.3.148' 2015-10-28 23:34:13 +01:00
Iglocska 059a8aa43a Added API for proposals 
- APIs for the following actions:
  - Add new proposed attribute to an event
  - Add proposed change to an attribute
  - View a proposal
  - Accept a proposal
  - Discard a proposal

- new APIs described on the automation page
 2015-10-28 23:32:30 +01:00
Iglocska f3e1654310 Merge branch 'hotfix-2.3.147' 2015-10-27 15:18:31 +01:00
Iglocska 80f29c1f33 More details on the PGP validation tool 2015-10-27 15:18:04 +01:00
Iglocska e759803334 Merge branch 'hotfix-2.3.147' into develop 2015-10-27 14:02:01 +01:00
Iglocska a9df8e4c91 Merge branch 'hotfix-2.3.147' 2015-10-27 14:01:11 +01:00
Iglocska f9da3f2d2c Small fix to the pgp key validation tool 
- doesn't break on completely invalid keys anymore
 2015-10-27 14:00:31 +01:00
iglocska f7f3142a91 Merge branch 'hotfix-2.3.146' into develop 2015-10-27 08:36:14 +01:00
iglocska ddd51c3a0f Merge branch 'hotfix-2.3.146' 2015-10-27 08:35:10 +01:00
iglocska aede05bdc6 Version bump 2015-10-27 08:34:59 +01:00
iglocska 7d651f094b Fix to a vulnerability found in attributescontroller 
- vulnerability reported by Airbus Group CERT

- Deprecated ajax attribute view had inverse access control logic
- removed ajax path
- added XML/JSON view
 2015-10-27 08:31:48 +01:00
iglocska 4dc9b911e7 Merge branch 'feature/sg' into 2.4-beta 2015-10-22 10:03:31 +02:00
iglocska 1d3ec3afa3 Merge branch 'feature/sg' of https://github.com/MISP/MISP into feature/sg 2015-10-22 10:01:25 +02:00
iglocska 0ae9c963a5 Small fix to the syslog 2015-10-22 10:00:59 +02: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 679bef35f0 Merge branch 'hotfix-2.3.145' into develop 2015-10-22 09:57:18 +02:00
iglocska 07f411c71f Merge branch 'hotfix-2.3.145' 2015-10-22 09:52:04 +02:00
iglocska 6fa27d659a Reverted change in proposal file storage path that wasn't needed 2015-10-22 09:51:31 +02:00
iglocska 35661f24f8 Merge branch 'hotfix-2.3.144' into develop 2015-10-21 23:52:46 +02:00
iglocska fa55f7fa9d Merge branch 'hotfix-2.3.144' 2015-10-21 23:51:50 +02:00
iglocska f4f4f0f069 Version bump 2015-10-21 23:51:36 +02:00
iglocska 26a4705bb3 Removed junk 2015-10-21 23:50:55 +02:00
iglocska 61e865956b Fixes to several issues, fixes #693 
- Fixed a critical bug in the XML export
  - As of recently XML exports include relations as they were missing before
  - the sanitisation of the event info field in related attributes was incorrectly sanitized of unicode characters
  - this can lead to the XML export breaking and also for affected events to be blocked from synchronisation

- Proposal fixes
  - fixed an invalid uuid generation that lead to an exception
  - fixed the attachments for proposals still using the old attachment system that disallows most filenames
  - added the automatic creation of hashes for attachment proposals
 2015-10-21 23:44:07 +02:00
iglocska 04a4738c1c Fix to loading the correct logos in the graph view 2015-10-19 07:27:20 +02:00
iglocska a59a68366a Damn d3.js... Finally it doesn't bug out. 2015-10-19 02:00:39 +02:00
iglocska 593f166386 Fixed an issue where orgs without a logo would not have the placeholder logo shown on graphs 2015-10-19 00:23:29 +02:00
iglocska e63d10f0d4 Various bugfixes 2015-10-18 23:10:25 +02:00
iglocska ae4d0af532 Fix to the cc validator 2015-10-18 22:51:40 +02:00
iglocska 38f5c443d3 Debug removed 2015-10-18 22:25:54 +02:00
iglocska 9ea162aece Fix to the financial tool (incorrect CC validation) 2015-10-18 22:24:05 +02:00
iglocska e191a25317 Updated the server preview to work between 2.4 instances 2015-10-18 21:31:01 +02:00
iglocska 96c6ac8487 Fixed the index view to include the new objects in json view 2015-10-18 21:11:34 +02:00
iglocska 479a3bfde4 Check if a tag is pushed with an event before trying to loop through the tags... 2015-10-18 20:57:20 +02:00
iglocska da8b2604ba Fixes to some validations issues using cakephp 2.7 2015-10-18 20:51:37 +02:00
iglocska ff4ea7fa1f Fix to the pubsub tool 2015-10-18 20:21:26 +02:00
iglocska 867dbbc7a3 Small fix thta resolves the inability to delete orgs 2015-10-18 19:51:11 +02:00
iglocska 37faddff62 Further progress 
- rework of the push mechanism
- rework of the object capture on add
- rework of the sync filter UI
 2015-10-18 18:03:48 +02:00
iglocska fdcac8b72c Further work on the filter UI 2015-10-18 09:36:55 +02:00
Iglocska 94963852e2 Fixed an issue with ajax forms 2015-10-17 01:06:58 +02:00
Iglocska 044996bdb5 New feature: Proposal to delete attribute, fixes #315 
- Users can now propose a deletion to an attribute
  - also tied into the mass accept mechanism
  - new UI elements to go along with this

- Code refactoring for category list retrievals
  - Until now, several methods got the list of categories from the validation code
  - Was awkward with a fake empty element that had to be removed
  - altered the validation code to read the categoryDefinitions array instead
 2015-10-16 23:49:04 +02:00
Iglocska 6fc3dbbc1f Fixed a faulty replace that causes an infinite loop during the uuid generation 2015-10-16 17:03:07 +02:00
Iglocska 8abe186661 Merge branch 'hotfix-2.3.143' into develop 2015-10-15 17:45:17 +02:00
Iglocska 1aedfebf33 Merge branch 'hotfix-2.3.143' 2015-10-15 17:45:03 +02:00
Iglocska 4a358c9fee Removed junk 2015-10-15 17:44:33 +02:00