23474 Commits

Author SHA1 Message Date
Daniel Rodriguez
b1b6306c30 Merge branch 'ent-4975-Añadir-todas-las-horas-al-formulario-del-cron-from-y-cron-to' into 'develop'
fixed module cron minute selectors

See merge request artica/pandorafms!2892
2020-01-13 18:20:57 +01:00
Daniel Rodriguez
914f232e69 Merge branch 'ent-3136-No-se-ven-los-eventos-en-el-mapa-de-servicios-cuando-haces-click-en-los-elementos-de-un-servicio-creado-en-la-meta' into 'develop'
Ent 3136 no se ven los eventos en el mapa de servicios cuando haces click en los elementos de un servicio creado en la meta

See merge request artica/pandorafms!2939
2020-01-13 18:19:50 +01:00
Tatiana Llorente
1747806256 Ent 3136 no se ven los eventos en el mapa de servicios cuando haces click en los elementos de un servicio creado en la meta 2020-01-13 18:19:50 +01:00
Daniel Rodriguez
ffce6399b0 Merge branch '5249-Fallo-seguridad-gestor-uploads' into 'develop'
Secured get_file script for unauthorized file download

See merge request artica/pandorafms!2999
2020-01-13 16:46:20 +01:00
Daniel Rodriguez
f32d3ecc0b Merge branch 'ent-5237-Vulnerabilidad-en-una-funcion-de-gestión-de-ficheros-externos' into 'develop'
fixed file vulnerability

See merge request artica/pandorafms!2994
2020-01-13 15:07:16 +01:00
Tatiana Llorente
40a86384c2 Add comment in events when status is changed 2020-01-13 13:00:43 +01:00
Daniel Rodriguez
72fb69a299 Merge branch 'ent-5233-xss-vulnerability-in-agent-description-edition' into 'develop'
Fixed XSS vulnerability

See merge request artica/pandorafms!2995
2020-01-13 11:29:18 +01:00
Daniel Maya
49e03f5e44 Fixed XSS vulnerability 2020-01-13 11:29:18 +01:00
artica
2fa637ee4d Auto-updated build strings. 2020-01-13 00:01:08 +01:00
artica
f7ea19863f Auto-updated build strings. 2020-01-12 00:01:08 +01:00
artica
f4bc172355 Auto-updated build strings. 2020-01-11 00:01:09 +01:00
Daniel Rodriguez
50e533e559 Merge branch 'ent-5231-9298-Bug-al-crear-un-usuario-con-espacios-al-final' into 'develop'
add check to prevent user creation with an id with trailing spaces

See merge request artica/pandorafms!3008
2020-01-10 14:41:33 +01:00
Daniel Rodriguez
79161b3206 Merge branch 'ent-5239-No-aparece-update-fallido-por-OUM-offline-en-audit-log' into 'develop'
Added log when offline update fails

See merge request artica/pandorafms!3003
2020-01-10 14:34:41 +01:00
Daniel Rodriguez
d864b47424 Merge branch 'ent-4677-error-appliying-report-templates' into 'develop'
Fixed ui message icon bug on meta

See merge request artica/pandorafms!3007
2020-01-10 14:26:35 +01:00
alejandro-campos
78df8dcb95 prevent user creation with leading or trailing spaces in user id 2020-01-10 13:50:04 +01:00
alejandro-campos
ec6a763aa2 add check to prevent user creation with an id with trailing spaces 2020-01-10 13:24:00 +01:00
Luis Calvo
6742881009 Fixed ui message icon bug on meta 2020-01-10 13:16:53 +01:00
Daniel Rodriguez
2734b6461e Merge branch 'ent-4895-error-redireccion-plantillas-cron-tasklist' into 'develop'
Fixed template redirection tasklist on cron extension

See merge request artica/pandorafms!3006
2020-01-10 11:12:39 +01:00
Daniel Rodriguez
1ebcfd58e4 Merge branch 'ent-4693-Pete-en-el-contador-de-intervalo-de-agente-con-intervalo-largo' into 'develop'
fixed interval counter

See merge request artica/pandorafms!2938
2020-01-10 11:12:05 +01:00
Daniel Maya
c9a524b128 fixed interval counter 2020-01-10 11:12:05 +01:00
artica
467db373b7 Auto-updated build strings. 2020-01-10 00:01:55 +01:00
Luis Calvo
4ff1c9cb7d Fixed template redirection tasklist on cron extension 2020-01-09 17:56:34 +01:00
manuel
62c915d6df Added log when offline update fails 2020-01-09 17:09:55 +01:00
Daniel Rodriguez
1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop'
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
2020-01-09 16:46:58 +01:00
Daniel Rodriguez
063600fda2 Merge branch 'ent-4597-bug-items-consola-visual-se-superponen-sobre-menu-superior' into 'develop'
Fixed z-index header

See merge request artica/pandorafms!2888
2020-01-09 11:52:27 +01:00
Manuel Montes
5e058df052 Fixed z-index header 2020-01-09 11:52:27 +01:00
Luis Calvo
2d303635ae Merge remote-tracking branch 'origin/develop' into ent-5165-error-pdf-report-names-generated-by-template 2020-01-09 10:42:46 +01:00
artica
d8b97885a9 Auto-updated build strings. 2020-01-09 00:01:13 +01:00
Tatiana Llorente
b6d5d1a15a Fixed bug with clock item in the visual consoles in meta 2020-01-08 15:23:39 +01:00
Daniel Rodriguez
1f15fd5dae Merge branch 'ent-5181-Pete-SQL-y-mal-funcionamineto-de-Auto-combined-graph' into 'develop'
Ent 5181 pete sql y mal funcionamineto de auto combined graph

See merge request artica/pandorafms!3000
2020-01-08 14:46:29 +01:00
Tatiana Llorente
2c019f04ee Fixed bug in auto combined graph 2020-01-08 11:37:44 +01:00
Daniel Rodriguez
c30e9eb1fe Merge branch 'ent-4980-No-cambia-el-Shape-de-los-fictional-nodes-de-Circle-a-Square-Rhombus-en-un-mapa-de-red' into 'develop'
Ent 4980 no cambia el shape de los fictional nodes de circle a square rhombus en un mapa de red

See merge request artica/pandorafms!2896
2020-01-08 11:33:27 +01:00
artica
64e63dad63 Auto-updated build strings. 2020-01-08 00:01:15 +01:00
Jose Gonzalez
f6163f4f80 Secured get_file script for unauthorized file download 2020-01-07 17:31:14 +01:00
Alejandro Campos
0468c85a4d Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
2020-01-07 12:00:27 +01:00
Daniel Rodriguez
d16ecc54b6 Merge branch '5148-Tabs-vista-eventos' into 'develop'
Changed to 2px active tab

Closes pandora_enterprise#5148

See merge request artica/pandorafms!2959
2020-01-07 11:46:18 +01:00
Daniel Rodriguez
eea9b0337c Merge branch 'ent-5081-Fallo-estético-en-el-Update-manager-Offline' into 'develop'
Ent 5081 fallo estético en el update manager offline

See merge request artica/pandorafms!2977
2020-01-07 11:12:59 +01:00
vgilc
8ecefd686f Merge branch 'ent-3967-imagen-en-consulta-a-db-interface' into 'develop'
Fix bug on reports db interface query

See merge request artica/pandorafms!2906
2020-01-07 10:58:37 +01:00
vgilc
3f2c93ea2b Merge branch 'ent-3977-Conteo-módulos-de-agente-con-grupos-secundarios' into 'develop'
Ent 3977 conteo módulos de agente con grupos secundarios

See merge request artica/pandorafms!2926
2020-01-07 10:57:44 +01:00
Daniel Maya
8572540f9a Ent 3977 conteo módulos de agente con grupos secundarios 2020-01-07 10:57:44 +01:00
alejandro-campos
7c952eaaa8 changes visual setup 2020-01-07 10:56:37 +01:00
vgilc
828203ed06 Merge branch 'ent-4437-ayuda-no-hierarchy' into 'develop'
Deleted help icon

See merge request artica/pandorafms!2616
2020-01-07 10:55:36 +01:00
vgilc
5f3889b5f6 Merge branch 'ent-4573-Cambio-en-el-switch-de-deshabilitar-agentes' into 'develop'
Change label for disabled status - #4573

See merge request artica/pandorafms!2693
2020-01-07 10:48:11 +01:00
vgilc
22e0a4c818 Merge branch 'ent-4620-Campo-module-inservible-en-open' into 'develop'
Ent 4620 campo module inservible en open

See merge request artica/pandorafms!2721
2020-01-07 10:46:13 +01:00
vgilc
44ec25bf0a Merge branch 'ent-4636-Eliminar-hint-de-la-vista-Monitors-View' into 'develop'
Remove hint in metaconsole monitoring view

See merge request artica/pandorafms!2723
2020-01-07 10:44:53 +01:00
Daniel Rodriguez
4464bf71d8 Merge branch 'ent-4880-error-borrar-historico-datos-cli' into 'develop'
Fixed CLI delete data

See merge request artica/pandorafms!2857
2020-01-07 10:25:38 +01:00
Daniel Rodriguez
8a6fa4f988 Merge branch 'ent-4881-entities-audit-OUM' into 'develop'
Fixed audit log OUM entities bug

See merge request artica/pandorafms!2902
2020-01-07 10:23:39 +01:00
vgilc
06e6fa261f Merge branch 'ent-4676-pequeño-bug-visual-en-ventana-modal-de-suscripcion-a-newsletter' into 'develop'
fixed visual error

See merge request artica/pandorafms!2756
2020-01-07 10:22:04 +01:00
vgilc
c14a462e63 Merge branch '5027-pandora-db-error-history-db-step' into 'develop'
Added control for int values

See merge request artica/pandorafms!2927
2020-01-07 10:20:26 +01:00
vgilc
996d322d5d Merge branch 'ent-5176-metaconsola-informes-tipo-texto' into 'develop'
Fixed visual bug in text report item

See merge request artica/pandorafms!2991
2020-01-07 10:17:10 +01:00