MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
MISP/app/View
History
Iglocska 328c666e3a Merge branch 'master' into feature/sg 
Merging all the new changes from master

Conflicts:
	VERSION.json
	app/Console/Command/AdminShell.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Elements/side_menu.ctp
	app/View/Pages/administration.ctp
	app/View/Users/admin_index.ctp
 		2015-10-12 09:41:20 +02:00
..
Attributes Merge branch 'master' into feature/sg 2015-09-10 15:02:44 +02:00
Elements Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
Emails Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00
Errors Blackhole message due to csrf replaced with something more obvious, fixes #504 2015-05-27 18:22:51 +02:00
EventBlacklists Event blacklist context completed 2015-09-16 14:19:22 +02:00
Events Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
Helper Only truncate string if adding ... will make it shorter 2015-04-08 14:08:38 +02:00
Jobs Some fixes to the background workers 2015-04-20 13:32:34 +02:00
Layouts New way to download a single event 2014-12-19 13:32:16 +01:00
Logs Progress on the sync 2015-09-21 14:55:40 +02:00
Organisations Added some fixes for XSS 2015-09-10 15:26:08 +02:00
Pages Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
Posts Version bump 2015-07-01 08:45:01 +02:00
Regexp Merge branch 'feature/roleChanges' into feature/XML_and_UI 2013-10-25 10:39:18 +02:00
Roles Further progress 2015-08-31 02:32:37 +02:00
Scaffolds Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00
Servers Set of changes to the sync 2015-10-06 01:16:48 +02:00
ShadowAttributes Merge branch 'master' into feature/sg 2015-06-10 22:54:20 +02:00
SharingGroups Futher fixes 2015-04-26 10:15:02 +02:00
Tags Merge branch 'master' into feature/sg 2015-06-10 22:54:20 +02:00
Tasks Small change to the tasks index 2014-01-03 15:39:54 +01:00
TemplateElements/ajax UI redesign of the template and worker health 2014-09-24 15:35:25 +02:00
Templates Fix to XSS in the template creation process 2015-07-01 08:42:21 +02:00
Threads Further progress 2015-08-31 02:32:37 +02:00
Users Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
Whitelists Few more changes 2013-10-25 10:15:26 +02:00