Arturo Gonzalez 776aca90d6 Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev ... Conflicts: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/godmode/reporting/visual_console_builder.editor.js pandora_console/include/ajax/visual_console_builder.ajax.php pandora_console/include/functions_visual_map_editor.php pandora_console/pandoradb.sql		2017-11-15 09:43:33 +01:00
..
agentes	Merge branch '1276-Cascade-protection-a-nivel-de-módulo-dev' into 'develop'	2017-11-15 09:31:05 +01:00
alerts	add send mail plain/text	2017-11-07 11:43:46 +01:00
category	Fixed styles metaconsole	2015-07-07 13:57:47 +02:00
db	Fix pandora diag texts and delete old secitons files - #1350	2017-10-09 15:36:28 +02:00
events	Merge branch '832-server-proxy-final-details-dev' into 'develop'	2017-09-04 16:33:11 +02:00
gis_maps	Fixed syntax error.	2016-10-14 12:09:44 +09:00
groups	Added disable agents in policy when js is crazy	2017-09-21 12:22:55 +02:00
massive	Merge branch 'develop' into 1205-Editar-OID-desde-operaciones-masivas-4406-Northern	2017-10-30 15:19:49 +01:00
modules	Fixed password entities in snmp walk	2017-11-03 13:18:00 +01:00
netflow	Change visual of metaconsole	2015-07-01 17:05:53 +02:00
reporting	Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev	2017-11-15 09:43:33 +01:00
servers	Added details to agent wizard and secundary servers	2017-09-01 10:44:26 +02:00
setup	Merge branch '1228-Posicion-fija-para-boton-update-en-setup-visual-styles' into 'develop'	2017-10-26 13:54:03 +02:00
snmpconsole	Changed bad jquery get call in alert actions and alerts snmp.	2017-05-08 15:54:35 +02:00
tag	Reorganizate code for use OS/module groups in metaconsole. Tiquet #3490	2016-06-06 13:05:25 +02:00
update_manager	Add link in minor release update dialog to documentation - #951	2017-06-28 15:47:24 +02:00
users	fixed errors in visual console	2017-10-24 17:03:35 +02:00
admin_access_logs.php	Fixed that exported csv file of audit log contains unnecessary data.	2016-12-08 09:35:34 +09:00
audit_log_csv.php	Revert "Fixed problems with double pandora in servers. Ticket: #3557"	2016-11-18 13:01:13 +01:00
extensions.php	Added version to disabled extensions	2017-03-01 11:52:56 +01:00
menu.php	Change db maintenance sections buttons location - #1350	2017-10-16 13:26:30 +02:00