MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
MISP/app/Controller
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
..
Component Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
AppController.php Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
AttributesController.php Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
EventBlacklistsController.php Fix to an issue that blocked event blacklist entries from being added manually, fixes #676 2015-09-24 11:26:23 +02:00
EventsController.php Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
JobsController.php Further progress 2015-04-18 07:53:18 +02:00
LogsController.php Further work on the new version 2015-04-14 17:51:38 +02:00
OrganisationsController.php Work on the sync 2015-04-26 13:21:51 +02:00
PagesController.php Fix to an issue with the calendar and added view to help with gitbook page generation 2015-10-08 10:00:42 +02:00
PostsController.php Merge branch 'master' into feature/sg 2015-06-10 22:54:20 +02:00
RegexpController.php Added the same functionality to the regex edit 2015-07-27 08:26:01 +02:00
RolesController.php Further progress 2015-08-31 02:32:37 +02:00
ServersController.php Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
ShadowAttributesController.php Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
SharingGroupsController.php Progress on the sync 2015-04-27 00:44:28 +02:00
TagsController.php Merge branch 'master' into feature/sg 2015-06-10 22:54:20 +02:00
TasksController.php Fix to the new sync issues since 2.3.39, fixing #365 2015-01-15 13:46:11 +01:00
TemplateElementsController.php Fixed broken AJAX queries in MISP as a result to changes in cakephp 2.4.8+ 2014-08-06 10:02:52 +02:00
TemplatesController.php Fixes to the RPZ export based on the testing of elhoim 2015-07-07 14:42:28 +02:00
ThreadsController.php Progress on several features 2015-09-29 02:54:25 +02:00
UsersController.php Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
WhitelistsController.php First rework of the siteadmin role 2013-10-03 11:45:27 +02:00