MISP/app/View
Iglocska 47cc0e4d18 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Model/Attribute.php
	app/Model/Event.php
2015-07-22 18:04:02 +02:00
..
Attributes Merge branch 'master' into feature/sg 2015-06-29 14:27:16 +02:00
Elements Merge branch 'master' into feature/sg 2015-07-22 18:04:02 +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
Events Merge branch 'master' into feature/sg 2015-07-22 18:04:02 +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 Lots of progress 2015-04-20 11:46:55 +02:00
Organisations Futher fixes 2015-04-26 10:15:02 +02:00
Pages Various changes and bug fixes 2015-06-18 14:49:25 +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 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-06-29 14:27:16 +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 Lots of progress 2015-04-20 11:46:55 +02:00
Users Merge branch 'master' into feature/sg 2015-06-29 14:27:16 +02:00
Whitelists Few more changes 2013-10-25 10:15:26 +02:00