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 Barbero Martin
602ce39907
Fixed clock item VC
2020-01-13 17:13:52 +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
Daniel Barbero Martin
e54740ec19
fixed parent input
2020-01-13 14:19:56 +01:00
Daniel Barbero Martin
60bd600392
module graph convert to image base 64
2020-01-13 13:31:23 +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
Daniel Barbero Martin
4f6ed7c39f
Fix tinyMCE background grey
2020-01-13 10:14:51 +01:00
Daniel Barbero Martin
09f1e2b733
fixed errors in resize and move item percentile and value
2020-01-13 09:53:00 +01:00
Daniel Barbero Martin
fe46a2a74e
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-13 08:07:20 +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
fbsanchez
e486c6a16e
missed curl-ca-bundle in agent nsis reference
2020-01-10 21:25:54 +01:00
fbsanchez
bec40aa5f3
Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms
2020-01-10 21:22:35 +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
Daniel Barbero Martin
d4b92a6913
Fixed errors in VC
2020-01-10 13:48:07 +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
Daniel Barbero Martin
f34387b24e
Fixed modal send more forms
2020-01-10 08:41:07 +01:00
Daniel Barbero Martin
14e4e37c2a
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-10 08:09:13 +01:00
artica
467db373b7
Auto-updated build strings.
2020-01-10 00:01:55 +01:00
Daniel Barbero
7e4cb02ceb
fixed styles and more
2020-01-09 18:05:21 +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 Barbero
a933a091ea
styles fixed
2020-01-09 12:07:19 +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
Daniel Barbero
b40f5b17c1
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-09 09:43:57 +01:00
fbsanchez
320ca5d021
Merge branch 'develop' into 'ent-4697-cicd-pandorafms'
...
Conflicts:
pandora_server/pandora_server.spec
2020-01-09 09:28:33 +01:00
artica
d8b97885a9
Auto-updated build strings.
2020-01-09 00:01:13 +01:00
fbsanchez
2084a233c3
test
2020-01-08 20:01:46 +01:00
fbsanchez
93380430ef
alternative dpkg-deb
2020-01-08 19:45:50 +01:00
fbsanchez
2e1ab56ae3
minor updates
2020-01-08 19:38:12 +01:00
fbsanchez
8563ff52fb
minor updates in make_deb_pacakge.sh
2020-01-08 19:36:15 +01:00
Daniel Barbero Martin
909dc4bf7c
fixed css
2020-01-08 18:08:20 +01:00
Daniel Barbero Martin
c25a64e737
fix styles main.css
2020-01-08 18:00:32 +01:00
Daniel Barbero Martin
a8e9c69e9a
save min.js and min.js.map
2020-01-08 17:33:00 +01:00
