30538 Commits

Author SHA1 Message Date
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
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
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
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
Daniel Rodriguez
7af375567d Merge branch 'ent-9197-Problema-cabecera-menu' into 'develop'
Change collapsed filename

See merge request artica/pandorafms!4977
2022-06-23 12:29:26 +00:00
Daniel Rodriguez
1c52a2552c Merge branch 'ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado' into 'develop'
Ent 9086 eliminacion de la replicacion de eventos duplicado

See merge request artica/pandorafms!4932
2022-06-23 11:17:47 +00:00
Daniel Barbero Martin
5328cf21c6 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 12:51:35 +02:00
Daniel Barbero Martin
58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
Daniel Rodriguez
4dd65c20a8 Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop'
Not orientation CV view mobile pandora_enterprise#8888

See merge request artica/pandorafms!4886
2022-06-23 10:07:24 +00:00
Daniel Barbero Martin
6a614847a2 refactor events meta pandora_enterprise#9086 2022-06-23 11:49:04 +02:00
Daniel Rodriguez
13ed563b42 Merge branch 'ent-8896-discovery-y-satelite-cuando-detectamos-equipos-de-red-faltan-datos-basicos' into 'develop'
Ent 8896 discovery y satelite cuando detectamos equipos de red faltan datos basicos

See merge request artica/pandorafms!4887
2022-06-23 09:33:30 +00:00
Ramon Novoa
2e7c3e8969 Fix permissions for pandora_snmp_bandwidth.pl.
pandora_snmp_bandwidth.pl was missing execute permissions.
2022-06-23 11:20:03 +02:00
Daniel Rodriguez
c0509a798c Merge branch 'ent-8812-Adaptar-WMI-Wizard-nuevo-binario-pandorawmic' into 'develop'
Added control for WMI binary

See merge request artica/pandorafms!4884
2022-06-23 08:27:11 +00:00
Daniel Rodriguez
d6ab78ba68 Merge branch 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' into 'develop'
Ent 8912 problemas en recuperación alertas de evento   necesaria refactorizacion

See merge request artica/pandorafms!4959
2022-06-23 07:53:11 +00:00
artica
7854206ede Updated version and build strings. 2022-06-23 08:27:31 +02:00
Daniel Barbero Martin
b63da2066e Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 08:22:31 +02:00
artica
a254c7d3c5 Auto-updated build strings. 2022-06-23 01:01:15 +02:00
José González
82480fa503 Updated logo 2022-06-22 16:46:24 +02:00
Daniel Rodriguez
428de71b85 Merge branch 'ent-9192-cambio-imagen-warp-update-online' into 'develop'
new images update manager online pandora_enterprise#9192

See merge request artica/pandorafms!4976
2022-06-22 14:44:20 +00:00
Daniel Rodriguez
664042f6bf Merge branch 'jose.gonzalez-develop-patch-50637' into 'develop'
Update delete_files.txt

See merge request artica/pandorafms!4978
2022-06-22 14:36:01 +00:00
José González
f241202168 Update delete_files.txt 2022-06-22 14:34:23 +00:00
José González
5e09b99504 Change collapsed filename 2022-06-22 16:00:04 +02:00
Daniel Barbero Martin
e77ae67fb2 new images update manager online pandora_enterprise#9192 2022-06-22 14:48:54 +02:00