18126 Commits

Author SHA1 Message Date
Jonathan
fdab2cff8e Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-03-02 08:26:53 +01:00
daniel
a5e6e569e8 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 08:04:00 +01:00
artica
f1bb7b450e Auto-updated build strings. 2023-03-02 01:00:46 +01:00
Daniel Cebrian
ea51399460 #10347 create view tactic for groups with monitoring and alerts 2023-03-01 17:27:32 +01:00
Diego Muñoz-Reja
2057cf8d47 Merge branch 'ent-9666-nuevo-widget-event-cardboard' into 'develop'
Ent 9666 nuevo widget event cardboard

See merge request artica/pandorafms!5533
2023-03-01 15:49:47 +00:00
Jose Gonzalez
a128151d9e Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 14:21:00 +01:00
Jonathan
cc13726718 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 14:17:40 +01:00
Jonathan
c4096f7d25 Reporting wizards 2023-03-01 14:17:03 +01:00
Jose Gonzalez
627d6cc5ec Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 14:10:02 +01:00
daniel
774b32d7a0 fixed styles 2023-03-01 13:54:22 +01:00
Jose Gonzalez
a16b4c11f4 Fix toggle and spinner issues 2023-03-01 13:32:15 +01:00
Daniel Rodriguez
23f91fa0f3 Merge branch 'ent-9962-14776-Mergear-resultados-de-ITEM-SQL-Query-de-informes-en-META' into 'develop'
added all nodes option in sql query report item in meta

See merge request artica/pandorafms!5535
2023-03-01 12:29:54 +00:00
daniel
7b1d8a535a fixed styles 2023-03-01 13:19:12 +01:00
Jose Gonzalez
92c72d2026 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 12:37:27 +01:00
Jose Gonzalez
7958793e1a Service 2023-03-01 12:37:17 +01:00
Pablo Aragon
81e349bfd7 Ipam 2023-03-01 12:23:49 +01:00
Pablo Aragon
a5758a86a9 Ipam 2023-03-01 12:22:46 +01:00
Jonathan
0ebbf9f14f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 12:15:08 +01:00
Jonathan
7e4337e4f3 Reporting templates 2023-03-01 12:14:23 +01:00
Jose Gonzalez
ca6d722495 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 12:07:11 +01:00
Jose Gonzalez
63e05ff304 Update help tip icon 2023-03-01 12:07:03 +01:00
Jonathan
472b655ee6 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 08:18:50 +01:00
daniel
a758528968 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/class/AuditLog.class.php
2023-03-01 07:56:32 +01:00
artica
6b23a0c696 Auto-updated build strings. 2023-03-01 01:00:24 +01:00
daniel
8ac9df14ab fixed styles 2023-02-28 19:01:37 +01:00
Jose Gonzalez
fa354ff8e6 Minor changes 2023-02-28 17:54:22 +01:00
Jose Gonzalez
ad34dfef21 Minor changes 2023-02-28 17:53:10 +01:00
Pablo Aragon
c0ab435f4f Events meta 2023-02-28 17:49:22 +01:00
Pablo Aragon
3dbe668973 Events meta 2023-02-28 17:47:49 +01:00
Jonathan
1dca587455 SNMP Browser modals change visual styles 2023-02-28 17:22:17 +01:00
Alejandro Campos
f94c7e2a04 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas'
# Conflicts:
#   pandora_console/extras/mr/62.sql
2023-02-28 16:11:46 +00:00
alejandro.campos@artica.es
a1f172e713 several fixes 2023-02-28 17:06:31 +01:00
Jonathan
f72ec5eb9d Fix html_print_label_input_block default id 2023-02-28 16:09:13 +01:00
Jonathan
d5cd9a0ab2 SNMP browser action buttons 2023-02-28 15:26:42 +01:00
Matias Didier
9def6eb6d5 Merge branch 'ent-9047-vista-de-auditoria-mejoras-funcionales-y-esteticas' into 'develop'
Ent 9047 vista de auditoria mejoras funcionales y esteticas

See merge request artica/pandorafms!5500
2023-02-28 13:28:45 +00:00
Jonathan
78af41b700 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 14:27:24 +01:00
Jonathan
8d44bb7af1 Reporting view new style 2023-02-28 14:27:18 +01:00
Diego Muñoz-Reja
44cf59bfd3 Merge branch 'ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola' into 'develop'
Ent 10253 enforcement de opciones de configuracion aviso en consola

See merge request artica/pandorafms!5499
2023-02-28 12:27:54 +00:00
Jose Gonzalez
825b937958 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 10:39:42 +01:00
Jose Gonzalez
114e9a366f Networkmap 2023-02-28 10:39:31 +01:00
daniel
b842d09240 fixed styles 2023-02-28 09:58:09 +01:00
Pablo Aragon
1d28762d22 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:50:50 +01:00
Pablo Aragon
38a05d2a79 Events meta 2023-02-28 09:50:42 +01:00
Jose Gonzalez
ce5ccbec5d Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:36:21 +01:00
daniel
6642f2e6d3 fixed styles 2023-02-28 08:06:53 +01:00
daniel
f00f974c60 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/alert_templates.php
	pandora_console/godmode/groups/configure_modu_group.php
	pandora_console/godmode/groups/modu_group_list.php
	pandora_console/godmode/modules/manage_network_components.php
	pandora_console/godmode/users/user_list.php
2023-02-28 07:32:43 +01:00
artica
23e333f58d Auto-updated build strings. 2023-02-28 01:00:26 +01:00
daniel
76b2c8743b Merge remote-tracking branch 'origin/ent-9987-mejoras-de-la-vista-de-inventario' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
2023-02-27 18:25:45 +01:00
daniel
f38adff73a fixed styles 2023-02-27 18:05:51 +01:00
Diego Muñoz-Reja
0f635c8206 Merge branch 'ent-10127-14800-anadir-id_nodo-a-llamada-api-validate_events' into 'develop'
Ent 10127 14800 anadir id nodo a llamada api validate events

See merge request artica/pandorafms!5479
2023-02-27 16:53:01 +00:00