MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
MISP/app/View
History
Iglocska e0ef372392 Merge branch 'master' into feature/sg 
Conflicts:
	app/Controller/EventsController.php
	app/Controller/UsersController.php
	app/Model/Event.php
 		2015-04-12 10:40:31 +02:00
..
Attributes Only truncate string if adding ... will make it shorter 2015-04-08 14:08:38 +02:00
Elements Merge branch 'master' into feature/sg 2015-04-12 10:40:31 +02:00
Emails Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00
Errors generateAllFor<FieldName> 2012-12-19 10:30:10 +00:00
Events Merge branch 'master' into feature/sg 2015-04-12 10:40:31 +02:00
Helper Only truncate string if adding ... will make it shorter 2015-04-08 14:08:38 +02:00
Jobs Some small fixes 2014-01-07 11:08:21 +01:00
Layouts New way to download a single event 2014-12-19 13:32:16 +01:00
Logs Added the confirmation box div to all the pages that can have the publish popup 2014-08-21 13:52:36 +02:00
Organisations Further work on the sharing groups 2015-04-07 00:24:44 +02:00
Pages Add proxy section to server diagnostics 2015-03-19 12:15:28 +01:00
Posts Update to the discussions 2013-11-04 11:31:15 +01:00
Regexp Merge branch 'feature/roleChanges' into feature/XML_and_UI 2013-10-25 10:39:18 +02:00
Roles Update to the roles and user filtering 2015-04-07 14:47:14 +02:00
Scaffolds Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00
Servers Merge branch 'master' into feature/sg 2015-04-12 10:40:31 +02:00
ShadowAttributes Long filename overlapping with malware button on attachment upload, fixes #357 2014-12-05 10:41:56 +01:00
SharingGroups Further work on the sharing groups 2015-04-07 00:24:44 +02:00
Tags Show the number of events for each tag in the tag index 2014-08-20 14:55:10 +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 New way to download a single event 2014-12-19 13:32:16 +01:00
Threads Made thread title clickable in event discussions fixes #270 2014-08-06 14:37:19 +02:00
Users User edit fixed 2015-04-08 13:10:52 +02:00
Whitelists Few more changes 2013-10-25 10:15:26 +02:00