Commit Graph

18571 Commits

Author SHA1 Message Date
miguel angel rasteu c3d8aa39bd #11161 Fix conditional to evaluate user_admin. Fix style CSS. Fix process_user_log 2023-05-11 14:48:06 +02:00
Matias Didier e870f45e5c Merge branch 'ent-10947-cuando-un-modulo-esta-en-un-estado-que-no-sea-normal-en-la-vista-de-heatmap-se-descoloca' into 'develop'
Ent 10947 cuando un modulo esta en un estado que no sea normal en la vista de heatmap se descoloca

See merge request artica/pandorafms!5769
2023-05-11 12:36:55 +00:00
Matias Didier 62b4ffb30b Merge branch 'ent-10591-vista-auditoria-gif-cargando-infinito' into 'develop'
Ent 10591 vista auditoria gif cargando infinito

See merge request artica/pandorafms!5757
2023-05-11 11:52:53 +00:00
artica ba5e3a0f08 Auto-updated build strings. 2023-05-11 01:00:26 +02:00
artica 476b38c221 Auto-updated build strings. 2023-05-10 01:00:11 +02:00
daniel 32bc57e767 update files translate and current package pandora_enterprise#11151 2023-05-09 14:05:48 +02:00
artica c794e754e7 Updated version and build strings. 2023-05-09 11:02:11 +02:00
Matias Didier ec2195f32f Merge branch 'ent-11047-15490-no-se-pueden-agregar-mas-campos-a-los-plugins' into 'develop'
Ent 11047 15490 no se pueden agregar mas campos a los plugins

See merge request artica/pandorafms!5780
2023-05-09 08:18:40 +00:00
artica ea5bb351df Auto-updated build strings. 2023-05-09 01:00:23 +02:00
Daniel Rodriguez 2c4e1c0261 Merge branch 'ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs' into 'develop'
Ent 10185 filtros personalizados para el visor de datos de logs

See merge request artica/pandorafms!5754
2023-05-08 08:48:56 +00:00
Rafael Ameijeiras 37d0cff221 Merge branch 'ent-10340-gotty-quickshell-no-funciona' into 'develop'
Fix gotty host missing on ws.php

See merge request artica/pandorafms!5812
2023-05-08 06:05:31 +00:00
artica 4653ebd854 Auto-updated build strings. 2023-05-08 01:00:20 +02:00
artica 6a0d746892 Auto-updated build strings. 2023-05-07 01:00:13 +02:00
artica 0db1ef549a Auto-updated build strings. 2023-05-06 01:00:19 +02:00
Jonathan 410a5efcd5 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-05-05 11:32:23 +02:00
Calvo 4f48fa4450 Fix ws test button 2023-05-05 11:25:33 +02:00
artica d4107cad5d Auto-updated build strings. 2023-05-05 01:00:19 +02:00
Daniel Rodriguez 9b69ec4393 Merge branch 'ent-10179-wizard-deploy-agentes' into 'develop'
Ent 10179 wizard deploy agentes

See merge request artica/pandorafms!5692
2023-05-04 14:37:48 +00:00
Calvo fb7a94ddd4 Fix ws exceptions on socket close event 2023-05-04 14:34:50 +02:00
daniel e77a63a91f fix select2 pandora_enterprise#11110 2023-05-04 12:57:01 +02:00
artica 151358190c Auto-updated build strings. 2023-05-04 01:00:20 +02:00
Alejandro Campos 9e1caceb11 Merge branch 'develop' into 'ent-10908-Fallo-en-el-editor-de-tips'
# Conflicts:
#   pandora_console/extras/mr/63.sql
2023-05-03 07:11:28 +00:00
artica 77ac357745 Auto-updated build strings. 2023-05-03 01:00:14 +02:00
artica b58ece6359 Auto-updated build strings. 2023-05-02 01:00:10 +02:00
artica 2e9c6a339f Auto-updated build strings. 2023-05-01 01:00:13 +02:00
artica 0bef49b5e7 Auto-updated build strings. 2023-04-30 01:00:18 +02:00
artica 459da487b8 Auto-updated build strings. 2023-04-29 01:00:23 +02:00
Matias Didier 56614f8df0 Merge branch 'ent-10474-mejorar-visualmente-mapa-dinamico-sunburst' into 'develop'
Ent 10474 mejorar visualmente mapa dinamico sunburst

See merge request artica/pandorafms!5800
2023-04-28 11:01:17 +00:00
Jonathan 305a853281 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-04-28 10:18:31 +02:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes'
# Conflicts:
#   pandora_console/include/styles/pandora.css
2023-04-28 08:07:10 +00:00
Daniel Rodriguez 0bc18b47db Merge branch 'ent-10420-14668-errores-en-usuarios-ldap-ad-con-apostrofes' into 'develop'
Ent 10420 14668 errores en usuarios ldap ad con apostrofes

See merge request artica/pandorafms!5687
2023-04-28 07:03:37 +00:00
Daniel Rodriguez 191c7d3098 Merge branch 'ent-10820-15230-Mantener-el-estado-del-evento-anterior-con-Extra-ID' into 'develop'
Ent 10820 15230 mantener el estado del evento anterior con extra

See merge request artica/pandorafms!5709
2023-04-28 06:07:10 +00:00
Daniel Rodriguez 06b58d3dfc Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop'
Ent 10191 nuevas alertas sonoras son poco usables

See merge request artica/pandorafms!5689
2023-04-28 06:04:18 +00:00
artica 153294a9b0 Auto-updated build strings. 2023-04-28 01:00:28 +02:00
Daniel Maya e4b17428b7 #10474 visual changes 2023-04-27 10:05:20 +02:00
artica 0b5672980d Auto-updated build strings. 2023-04-27 01:00:23 +02:00
Diego Muñoz-Reja 3e0c06b4b7 Merge branch 'ent-10769-Errores-en-Trap-console-y-Trap-editor' into 'develop'
several minor fixes

See merge request artica/pandorafms!5638
2023-04-26 08:57:03 +00:00
artica 8effae4991 Auto-updated build strings. 2023-04-26 01:00:20 +02:00
Matias Didier f0194286d6 Merge branch 'ent-10755-meter-leyendas-de-las-graficas-alineadas-horizontalmente-no-verticalmente-2' into 'develop'
Ent 10755 meter leyendas de las graficas alineadas horizontalmente no verticalmente 2

See merge request artica/pandorafms!5778
2023-04-25 15:39:49 +00:00
Diego Muñoz-Reja ed6364d3c0 Merge branch 'ent-11024-pete-sql-en-remote-components' into 'develop'
Ent 11024 pete sql en remote components

See merge request artica/pandorafms!5755
2023-04-25 13:47:34 +00:00
Rafael Ameijeiras 58af8f8d46 Merge branch 'ent-10899-consola-mete-entities-en-los-custom-fields-del-inventario' into 'develop'
Ent 10899 consola mete entities en los custom fields del inventario

See merge request artica/pandorafms!5699
2023-04-25 13:27:07 +00:00
Rafael Ameijeiras d08d5319dc Merge branch 'ent-10471-When-a-group-is-deleted-SNMP-alerts-that-used-it-disappear' into 'develop'
added limitation to group deletion

See merge request artica/pandorafms!5643
2023-04-25 13:25:03 +00:00
Jonathan d1361e38cb #11047 fix macro in plugin section node+meta 2023-04-25 14:20:44 +02:00
Pablo Aragon 6540a229e1 10755-Horizontal graph legend & interfaz graph 2023-04-25 13:31:59 +02:00
alejandro.campos@artica.es ee5f79bb7a change text 2023-04-25 09:16:48 +02:00
artica db2b2b796b Auto-updated build strings. 2023-04-25 01:00:22 +02:00
Pablo Aragon 20ff1692ae 10947-Change color heatmap notinit modules 2023-04-24 15:58:08 +02:00
Rafael Ameijeiras ca7e1777e5 Merge branch 'ent-11035-graficas-envio-mail-cambio-escalas' into 'develop'
flot axis Y minimum ticks size 0.5 pandora_enterprise#11035

See merge request artica/pandorafms!5766
2023-04-24 12:18:56 +00:00
Rafael Ameijeiras 2dc910005f Merge branch 'ent-9555-revision-visual-ui-de-la-vista-movil' into 'develop'
Ent 9555 revision visual ui de la vista movil

See merge request artica/pandorafms!5684
2023-04-24 11:16:30 +00:00
Matias Didier d7ee0ca2da Merge branch 'ent-10910-a-veces-se-ven-las-bolas-de-los-mapas-de-red-con-fondo-negro' into 'develop'
Ent 10910 a veces se ven las bolas de los mapas de red con fondo negro

See merge request artica/pandorafms!5736
2023-04-24 10:44:21 +00:00