30567 Commits

Author SHA1 Message Date
Calvo
34333f9f88 Alerts list datatable 2022-07-15 12:15:37 +02:00
Jimmy Olano
fb5dd4d557 Merge branch 'ent-8588-Diferencias-de-filtrado-en-vistas-similares-de-Pandora' into 'develop'
fixed query filter

Ref pandora_enterprise#8588

See merge request artica/pandorafms!4895
2022-06-29 23:54:48 +00:00
artica
87837d7c8f Auto-updated build strings. 2022-06-30 01:00:33 +02:00
Jimmy Olano
efa0640d8c Merge branch 'ent-9121-13735-no-aparece-nombre-modulos-en-leyenda-seccion-graficas-dentro-del-agente-v762' into 'develop'
legend combined graph module view pandora_enterprise#9121

pandora_enterprise#9121

See merge request artica/pandorafms!4986
2022-06-29 22:37:25 +00:00
Jimmy Olano
f07ed9e4e9 Merge branch 'ent-9125-Bug-a-la-hora-de-crear-gráficas-personalizadas-desde-el-agente' into 'develop'
Ent 9125 bug a la hora de crear gráficas personalizadas desde el agente

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9125

See merge request artica/pandorafms!4946
2022-06-29 22:25:00 +00:00
Jimmy Olano
1e832e9e8d Merge branch 'ent-9172-Edición-de-usuario-superadmin' into 'develop'
Ent 9172 edición de usuario superadmin

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9172

See merge request artica/pandorafms!4985
2022-06-29 17:55:51 +00:00
Jimmy Olano
2220125250 Merge branch 'ent-9213-widget-de-reports-en-dashboards' into 'develop'
delete item into widget pandora_enterprise#9213

See merge request artica/pandorafms!4987
2022-06-29 16:32:49 +00:00
Diego Muñoz-Reja
bc6f234029 Merge branch 'ent-9093-Harce-mas-grande-el-selector-acciones-alertas' into 'develop'
Resized alert action list and refactor

See merge request artica/pandorafms!4980
2022-06-29 14:50:37 +00:00
Diego Muñoz-Reja
0d8cfc3986 Merge branch 'ent-9147-13774-Lista-elementos-consola-visual-falla-con-muchos-elementos' into 'develop'
fixed vc elements edition

See merge request artica/pandorafms!4963
2022-06-29 14:36:41 +00:00
Diego Muñoz-Reja
b9b074404c Merge branch 'ent-9158-Reloj-digital-en-consola-visual-se-descuadra-al-cambiar-de-tamaño' into 'develop'
Ent 9158 reloj digital en consola visual se descuadra al cambiar de tamaño

See merge request artica/pandorafms!4965
2022-06-29 14:13:24 +00:00
Diego Muñoz-Reja
a2125580d9 Merge branch 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' into 'develop'
Improved error message

See merge request artica/pandorafms!4939
2022-06-29 14:01:49 +00:00
José González
7edcd3b0a6 Improve code and fix update alerts 2022-06-29 11:05:50 +02:00
José González
ca0763f379 Merge branch 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' of https://brutus.artica.es:8081/artica/pandorafms into ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager 2022-06-29 10:20:31 +02:00
José González
ef3dd0e741 Improved error message 2022-06-29 10:20:17 +02:00
Jimmy Olano
f48d3a9849 Merge branch 'ent-8984-13630-Cuenta-de-plantillas-de-alerta-no-coincide' into 'develop'
Ent 8984 13630 cuenta de plantillas de alerta no coincide

See merge request artica/pandorafms!4902
2022-06-29 02:40:08 +00:00
Jimmy Olano
5f5ca9ac13 Merge branch 'ent-9009-dashboards-widget-Estado-del-Módulo-pone-icono-inexistente' into 'develop'
Ent 9009 dashboards widget estado del módulo pone icono inexistente

See merge request artica/pandorafms!4900
2022-06-29 01:18:35 +00:00
Jimmy Olano
aeb40bacc9 Merge branch 'ent-9101-13724-Fallo-operator-read-en-dashboard' into 'develop'
Ent 9101 13724 fallo operator read en dashboard

See merge request artica/pandorafms!4945
2022-06-29 01:11:44 +00:00
artica
87db3d57b5 Auto-updated build strings. 2022-06-29 01:00:36 +02:00
Diego Muñoz-Reja
9120eb44c5 Merge branch 'ent-9231-grave-problema-seguridad-vista-de-eventos-metaconsola' into 'develop'
fix events pandora_enterprise#9231

See merge request artica/pandorafms!4990
2022-06-28 15:37:46 +00:00
Diego Muñoz-Reja
4d48bdec36 Merge branch 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' into 'develop'
Changed strings and improve code

See merge request artica/pandorafms!4935
2022-06-28 15:22:08 +00:00
Diego Muñoz-Reja
b73389fff0 Merge branch 'ent-9033-Vista-de-eventos-Validar-eventos-repetidos' into 'develop'
Ent 9033 vista de eventos validar eventos repetidos

See merge request artica/pandorafms!4953
2022-06-28 15:17:13 +00:00
Daniel Barbero Martin
0957dd338f fix events pandora_enterprise#9231 2022-06-28 16:56:25 +02:00
José González
2d69ea4be5 Merge branch 'develop' into 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager'
# Conflicts:
#   pandora_console/index.php
2022-06-28 14:39:37 +00:00
Diego Muñoz-Reja
3fe66d9a9b Merge branch 'ent-9085-13692-Fallo-permisos-en-creacion-edicion-de-List-of-Special-Days' into 'develop'
fixed permissions

See merge request artica/pandorafms!4934
2022-06-28 14:32:31 +00:00
José González
b03356cc3c Merge branch 'develop' into 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos'
# Conflicts:
#   pandora_console/godmode/menu.php
2022-06-28 14:08:13 +00:00
daniel
4ca27cd5a9 Merge branch 'ent-7960-filtros-de-alertas-sonoras-sound-events-2' into 'develop'
events sound pandora_enterprise#7960

See merge request artica/pandorafms!4923
2022-06-28 13:47:05 +00:00
daniel
867e659118 Merge branch 'ent-1419-umbrales-en-graficas-pdf-4649-com1' into 'develop'
add treshold pdf pandora_enterprise#1419

See merge request artica/pandorafms!4894
2022-06-28 13:45:53 +00:00
daniel
a1cae74fa8 Merge branch 'ent-8827-cambios-visuales-en-widget-agents-modules' into 'develop'
fixed modal size configuration widgets pandora_enterprise#8827

See merge request artica/pandorafms!4893
2022-06-28 13:44:43 +00:00
Daniel Barbero Martin
6d1121602a delete item into widget pandora_enterprise#9213 2022-06-28 11:09:47 +02:00
Daniel Barbero Martin
7a93861a2b fixed size modal pandora_enterprise#8827 2022-06-28 09:14:11 +02:00
Daniel Barbero Martin
6edc6e1014 Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-28 08:51:22 +02:00
artica
6765cc136f Auto-updated build strings. 2022-06-28 01:01:20 +02:00
Daniel Barbero Martin
941d477403 fixed size modal pandora_enterprise#8827 2022-06-27 18:07:01 +02:00
Daniel Maya
2049805de7 #9033 conflict resolved 2022-06-27 17:13:23 +02:00
Daniel Barbero Martin
d969ac42bf legend combined graph module view pandora_enterprise#8621 2022-06-27 17:09:27 +02:00
Daniel Maya
693c5d5044 #9172 Changed configure user 2022-06-27 16:48:00 +02:00
Daniel Barbero Martin
1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2
Conflicts:
	pandora_console/include/functions_events.php
2022-06-27 16:07:19 +02:00
Daniel Barbero Martin
3cdde5054a size form widgets dashboards pandora_enterprise#8827 2022-06-27 15:43:42 +02:00
Daniel Barbero Martin
ebe5f0de7c Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-27 09:48:18 +02:00
artica
beefbff267 Auto-updated build strings. 2022-06-27 01:00:34 +02:00
artica
cab6fdbf12 Auto-updated build strings. 2022-06-26 01:00:39 +02:00
artica
036aa788fa Auto-updated build strings. 2022-06-25 01:00:46 +02:00
vgilc
af2a6da47a Merge branch 'ent-update-japanese-translations' into 'develop'
Updated Japanese console translations.

See merge request artica/pandorafms!4984
2022-06-24 06:37:48 +00:00
Junichi Satoh
8123392c50 Updated Japanese console translations. 2022-06-24 13:53:57 +09:00
artica
a7051ea40d Auto-updated build strings. 2022-06-24 01:00:53 +02:00
vanessa gil
653226d45b Clean version. 2022-06-23 19:54:26 +02:00
Daniel Rodriguez
85b1af94a4 Merge branch 'ent-9211-cambio-como-se-muestra-la-vista-de-stadisticas-de-nodos-en-los-eventos-de-meta' into 'develop'
minor fixed events

See merge request artica/pandorafms!4983
2022-06-23 16:21:04 +00:00
Daniel Barbero Martin
f89aaabc21 minor fixed events 2022-06-23 18:06:25 +02:00
Daniel Rodriguez
051e16e535 Merge branch 'ent-9206-subir-version-paquete-y-mr' into 'develop'
mr

See merge request artica/pandorafms!4981
2022-06-23 12:44:49 +00:00
Daniel Barbero Martin
bf28b44339 mr 2022-06-23 14:35:38 +02:00