José González 76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' ... # Conflicts: # pandora_console/operation/messages/message_edit.php		2021-05-25 13:50:17 +00:00
..
agentes	Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs'	2021-05-25 13:50:17 +00:00
alerts	Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'	2021-05-13 11:39:24 +00:00
category	fixed visual errors	2021-03-18 17:05:50 +00:00
db	Updated copyrights	2020-11-27 13:52:35 +01:00
events	Event responses buttons visual bug	2021-05-06 16:06:21 +02:00
gis_maps	removed deprecated incident permissions	2021-05-13 13:33:45 +02:00
groups	Added standard headers	2021-04-30 13:50:58 +02:00
massive	Merge branch 'ent-7260-no-esta-funcionando-operaciones-masivas-agentes-edicion' into 'develop'	2021-04-09 09:21:36 +00:00
module_library	Added standard headers	2021-04-30 14:35:54 +02:00
modules	Fixed reomte components search bugs and button go back	2021-04-07 10:51:35 +00:00
netflow	removed deprecated incident permissions	2021-05-13 13:33:45 +02:00
reporting	Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs'	2021-05-25 13:50:17 +00:00
servers	Ent 6852 integrar edicion de sistema de credencial boxes con edicion de coniguracion del satelite en la misma vista	2021-03-18 16:00:14 +00:00
setup	Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs'	2021-05-25 13:50:17 +00:00
snmpconsole	Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs'	2021-05-25 13:50:17 +00:00
tag	Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect	2021-03-26 13:52:01 +01:00
update_manager	Unified downtime name as scheduled downtime	2021-05-10 09:06:43 +00:00
users	Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'	2021-05-13 11:39:24 +00:00
wizards	Merge branch 'ent-7133-texto-ingles-discovery' into 'develop'	2021-05-06 12:10:21 +00:00
admin_access_logs.php	Ent 6781 revision de estilos visuales y eliminacion de sistemas skins	2021-03-11 14:40:23 +00:00
audit_log_csv.php	Updated copyrights	2020-11-27 13:52:35 +01:00
extensions.php	Ent 6781 revision de estilos visuales y eliminacion de sistemas skins	2021-03-11 14:40:23 +00:00
menu.php	Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general'	2021-03-09 14:39:15 +00:00