MISP/app/View
iglocska 8cc0996c3c Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/View/Elements/side_menu.ctp
	app/View/Pages/administration.ctp
2015-11-14 17:16:38 +01:00
..
Attributes Clarification of the malware checkbox on add attachment 2015-11-09 12:41:33 +01:00
Elements Merge branch 'master' into 2.4-beta 2015-11-14 17:16:38 +01: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 2.4-beta 2015-11-12 09:26:29 +01: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 Added the first version of the correlation graphing 2015-10-14 03:45:34 +02:00
Logs Merge branch 'master' into 2.4-beta 2015-11-08 23:26:19 +01:00
Organisations Added some fixes for XSS 2015-09-10 15:26:08 +02:00
Pages Merge branch 'master' into 2.4-beta 2015-11-14 17:16:38 +01: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 Updated the server preview to work between 2.4 instances 2015-10-18 21:31:01 +02:00
ShadowAttributes Fixed the proposal attachment upload 2015-11-09 16:44:40 +01:00
SharingGroups Further work on the filter UI 2015-10-18 09:36:55 +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 2.4-beta 2015-11-12 09:26:29 +01:00
Whitelists Few more changes 2013-10-25 10:15:26 +02:00