Rafael Ameijeiras 1fa70b3afc Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop' ... Ent 11852 advertencia al usar intervalos largos See merge request artica/pandorafms!6346		2023-08-23 05:56:19 +00:00
..
agentes	Merge branch 'ent-11636-SNMP-v2-hace-que-wizard-no-funcione' into 'develop'	2023-08-18 06:29:45 +00:00
alerts	Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales	2023-08-08 17:35:34 +02:00
category	#11708 fix delete image category metaconsole	2023-07-11 14:10:55 +02:00
consoles	#11476 Fix https url	2023-06-08 13:19:01 +02:00
db	#11476 Fix https url	2023-06-08 13:19:01 +02:00
events	Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop'	2023-06-22 13:24:47 +00:00
gis_maps	Merge branch 'ent-11575-bug-en-edicion-de-layer-gis' into 'develop'	2023-06-27 11:51:38 +00:00
groups	11135-Move js code from ui_print_datatable. Resolve conflict	2023-07-24 10:46:19 +02:00
massive	Merge branch 'ent-11375-user-bulk-operations-al-intentar-anadir-un-perfil-que-el-usuario-ya-tiene-el-aviso-de-error' into 'develop'	2023-08-18 06:37:31 +00:00
module_library	#11476 Fix https url	2023-06-08 13:19:01 +02:00
modules	remove snmp version 2	2023-08-02 11:07:08 +02:00
netflow	Merge branch 'ent-11629-neflow-filter-no-admite-grupo-all' into 'develop'	2023-08-01 12:33:07 +00:00
reporting	Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop'	2023-08-23 05:56:19 +00:00
servers	Merge branch 'ent-10603-personalizacion-weekly-mail-report' into 'develop'	2023-08-21 10:22:10 +00:00
setup	#11051 Fix conflict	2023-08-21 08:25:53 +02:00
snmpconsole	Merge branch 'ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola' into 'develop'	2023-08-04 06:34:35 +00:00
tag	#11476 Fix https url	2023-06-08 13:19:01 +02:00
um_client	Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop'	2023-06-22 13:24:47 +00:00
update_manager	11135-Move js code from ui_print_datatable. Resolve conflict	2023-07-24 10:46:19 +02:00
users	Merge branch develop into ent-11543-pantalla-de-login-en-modo-blanco	2023-08-18 09:49:27 +02:00
wizards	#11871 Fixed SQL query	2023-08-16 13:46:19 +02:00
audit_log.php	#11476 Fix https url	2023-06-08 13:19:01 +02:00
audit_log_csv.php	#11476 Fix pandora url	2023-06-08 13:10:16 +02:00
extensions.php	Merge branch 'ent-11091-iconos-con-la-misma-descripcion-extension-manager' into 'develop'	2023-07-06 09:38:35 +00:00
menu.php	#11843 Added word legacy in the discovery. It is added only for version 1.0 of discovery.	2023-08-09 14:40:56 +02:00