fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios ... Conflicts: pandora_console/include/class/Tree.class.php		2018-04-10 09:29:14 +02:00
..
alert_actions.php	Fixed json in audit log	2018-04-05 16:57:26 +02:00
alert_commands.php	Fixed json in audit log	2018-04-05 16:57:26 +02:00
alert_list.builder.php	Set default module action threshold to 0.	2017-01-18 10:56:08 +09:00
alert_list.list.php	[Secondary groups] Fixed some problems in agent view	2018-03-27 16:38:17 +02:00
alert_list.php	[Secondary groups] Fixed some problems in agent view	2018-03-27 16:38:17 +02:00
alert_special_days.php	Fixed json in audit log	2018-04-05 16:57:26 +02:00
alert_templates.php	Remove temporality links to help. And in future chenge this help	2017-04-20 12:10:52 +02:00
alert_view.php	Changed agent name by alias in alerts details	2017-06-08 17:55:04 +02:00
configure_alert_action.php	[Secondary Groups] Assign secondary groups by AJAX on agent edit view	2018-03-22 13:34:15 +01:00
configure_alert_command.php	Fixed json in audit log	2018-04-05 16:57:26 +02:00
configure_alert_special_days.php	Fixed wrong privileges for special days creation.	2016-07-15 16:16:17 +09:00
configure_alert_template.php	Fixed json in audit log	2018-04-05 16:57:26 +02:00