Alejandro Gallardo Escobar 137acdb232 Merge remote-tracking branch 'origin/develop' into features/oracle ... Conflicts resolved: pandora_console/include/functions_reporting.php		2015-05-19 19:16:35 +02:00
..
alert_actions.php	Changed visual of metaconsole	2015-03-06 12:28:05 +01:00
alert_commands.php	Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs).	2015-04-10 00:58:24 +02:00
alert_list.builder.php	Changed visual of any views	2015-04-23 17:52:16 +02:00
alert_list.list.php	Error fixes related with the improved oracle compatibility	2015-05-04 18:27:23 +02:00
alert_list.php	2013-06-19 Mario Pulido <mario.pulido@artica.es>	2013-06-19 16:28:30 +00:00
alert_special_days.php	2013-04-10 Sergio Martin <sergio.martin@artica.es>	2013-04-10 07:57:54 +00:00
alert_templates.php	Changed visual of metaconsole	2015-03-11 15:57:05 +01:00
alert_view.php	Changed style of Nodo	2015-04-10 09:43:44 +02:00
configure_alert_action.php	Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES	2015-05-06 17:02:40 +02:00
configure_alert_command.php	Changed visual of metaconsole	2015-03-09 16:33:27 +01:00
configure_alert_special_days.php	2013-04-10 Sergio Martin <sergio.martin@artica.es>	2013-04-10 07:57:54 +00:00
configure_alert_template.php	Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs).	2015-04-10 00:58:24 +02:00