Daniel Rodriguez
|
97adbca5cd
|
Merge branch 'ent-4768-error-macro-agent-address-event-responses' into 'develop'
Fixed macro agent address empty ip
See merge request artica/pandorafms!2823
|
2020-02-05 12:56:13 +01:00 |
|
Daniel Rodriguez
|
1cca736953
|
Merge branch 'ent-4788-Icono-GIS-en-Setup-desaparecido' into 'develop'
Ent 4788 icono gis en setup desaparecido
See merge request artica/pandorafms!2843
|
2020-02-05 12:35:50 +01:00 |
Alejandro Fraguas
|
ec98d861b2
|
Merge branch 'ent-4622-Fallo-filtrado-en-listado-acceso-API' into 'develop'
Fixed bug with API access list - #4622
See merge request artica/pandorafms!2724
|
2020-02-05 10:44:42 +01:00 |
artica
|
70e5486ce6
|
Auto-updated build strings.
|
2020-02-05 00:01:11 +01:00 |
|
Daniel Rodriguez
|
3342b7dd53
|
Merge branch 'ent-5403-XSS-vistas-por-Nokia-USA' into 'develop'
Fixed XSS vulnerability
See merge request artica/pandorafms!3041
|
2020-02-04 17:30:21 +01:00 |
|
Daniel Rodriguez
|
22649e016f
|
Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop'
fix html special characters breaking html in modules search
See merge request artica/pandorafms!3046
|
2020-02-04 16:56:26 +01:00 |
alejandro-campos
|
a51c17b512
|
fix html special characters breaking html in modules search
|
2020-02-04 16:39:54 +01:00 |
|
Daniel Rodriguez
|
0e9e59efbb
|
Merge branch 'ent-5289-9247-Group-Alert-Report-bug' into 'develop'
fix bug in group alert report data visualization
See merge request artica/pandorafms!3031
|
2020-02-04 13:25:29 +01:00 |
|
Daniel Rodriguez
|
e6a5d7986f
|
Merge branch 'ent-5376-Inyecciones-SQL-vistas-por-Nokia-USA' into 'develop'
Fixed % with sprintf
See merge request artica/pandorafms!3039
|
2020-02-04 13:14:55 +01:00 |
|
Daniel Rodriguez
|
8b60daa9ba
|
Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop'
fix module string data with html special chars breaking html in page
See merge request artica/pandorafms!3042
|
2020-02-04 10:10:07 +01:00 |
|
artica
|
3415838700
|
Auto-updated build strings.
|
2020-02-04 00:01:10 +01:00 |
|
alejandro-campos
|
674f2a2873
|
minor fix: data string not being displayed correctly when module unknown
|
2020-02-03 18:04:52 +01:00 |
|
alejandro-campos
|
3b233eeb90
|
changed functionality to not show trigger times that are not within the interval
|
2020-02-03 18:01:28 +01:00 |
|
Alejandro Fraguas
|
00ab0b9952
|
Merge branch 'ent-5295-Constantes-de-1año-2-años-y-3-años-no-son-correctas' into 'develop'
Ent 5295 constantes de 1año 2 años y 3 años no son correctas
See merge request artica/pandorafms!3014
|
2020-02-03 16:21:22 +01:00 |
|
alejandro-campos
|
d05551f85a
|
fix characters breaking html
|
2020-02-03 16:17:46 +01:00 |
|
Daniel Rodriguez
|
32cb47fb71
|
Merge branch 'ent-5251-9432-No-se-pueden-crear-usuarios-con-password-policy-activado' into 'develop'
Fixed password policy
See merge request artica/pandorafms!3020
|
2020-02-03 16:06:43 +01:00 |
|
Daniel Rodriguez
|
bdb8d309ad
|
Merge branch 'ent-5359-8945-Logo-y-nombre-de-Pandora-FMS-al-fallar-la-base-de-datos' into 'develop'
fix to display pandora tab subtitle based on condition and display rebranding...
See merge request artica/pandorafms!3025
|
2020-02-03 14:06:38 +01:00 |
|
Alejandro Fraguas
|
6aae378b37
|
Merge branch 'ent-4533-descuadre-visual-usuarios-metaconsola' into 'develop'
ajuste visual en tabla user management
See merge request artica/pandorafms!2682
|
2020-02-03 13:55:42 +01:00 |
|
Alejandro Fraguas
|
6c93fcfe02
|
Merge branch 'ent-5361-vulnerabilidad-subir-ficheros' into 'develop'
adding .htaccess files
See merge request artica/pandorafms!3026
|
2020-02-03 12:36:01 +01:00 |
|
Alejandro Fraguas
|
12d8dca70e
|
Merge branch 'ent-5149-9065-Pandora-manage-create-event-poner-saltos-de-linea' into 'develop'
Added possibility to display comments with line breaks in event detail
See merge request artica/pandorafms!3029
|
2020-02-03 10:34:56 +01:00 |
|
artica
|
af7d1ea5f9
|
Auto-updated build strings.
|
2020-02-03 00:01:08 +01:00 |
|
artica
|
690f6e715d
|
Auto-updated build strings.
|
2020-02-02 00:01:08 +01:00 |
|
artica
|
3136563bba
|
Auto-updated build strings.
|
2020-02-01 00:01:09 +01:00 |
rafael
|
c200f57856
|
adding .txt restreriction for webchat
|
2020-01-31 18:45:53 +01:00 |
|
alejandro-campos
|
73f3dfac85
|
fix module string data with html special chars breaking html in page
|
2020-01-31 11:53:42 +01:00 |
|
artica
|
7aa9a630d0
|
Auto-updated build strings.
|
2020-01-31 00:01:10 +01:00 |
Daniel Maya
|
bf53eb5a6b
|
Fixed XSS vulnerability
|
2020-01-30 17:29:07 +01:00 |
|
Daniel Maya
|
891c517611
|
Fixed % with sprintf
|
2020-01-30 13:02:33 +01:00 |
|
artica
|
1134c041f2
|
Auto-updated build strings.
|
2020-01-30 00:01:08 +01:00 |
|
Daniel Maya
|
baecac1efb
|
Next mr
|
2020-01-29 15:51:39 +01:00 |
marcos
|
0ed4937368
|
add traductions
|
2020-01-29 13:48:48 +01:00 |
|
Alejandro Fraguas
|
0cf42f2d74
|
Merge branch 'new-vc-line-element' into 'develop'
New vc line element
See merge request artica/pandorafms!2795
|
2020-01-29 11:04:23 +01:00 |
Daniel Barbero Martin
|
dc6f1e3049
|
fixed errors VC
|
2020-01-29 10:56:29 +01:00 |
|
Daniel Barbero Martin
|
2bbc5d18b5
|
fixed errors VC
|
2020-01-29 10:15:31 +01:00 |
artica
|
2f6fed368d
|
Updated version and build strings.
|
2020-01-29 10:13:37 +01:00 |
|
Daniel Barbero Martin
|
3bd3ca00bf
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-29 08:20:11 +01:00 |
|
artica
|
395920f8eb
|
Auto-updated build strings.
|
2020-01-29 00:01:09 +01:00 |
|
Daniel Barbero Martin
|
e49ed85d03
|
fixed errors VC
|
2020-01-28 18:29:32 +01:00 |
|
Daniel Barbero Martin
|
5906273271
|
fixed errors VC
|
2020-01-28 17:52:40 +01:00 |
|
Daniel Barbero Martin
|
3f5e418d98
|
fixed errors VC
|
2020-01-28 16:42:51 +01:00 |
|
Daniel Barbero Martin
|
73dcabc48d
|
fixed errors VC
|
2020-01-28 12:44:37 +01:00 |
|
Daniel Barbero Martin
|
0ad6e7842f
|
fixed errors VC
|
2020-01-28 12:12:07 +01:00 |
|
Daniel Barbero Martin
|
f459c6fb79
|
fixed errors VC
|
2020-01-28 11:05:15 +01:00 |
|
alejandro-campos
|
d79137148c
|
fix bug in group alert report data visualization
|
2020-01-28 10:06:46 +01:00 |
|
Daniel Barbero Martin
|
e2d610f22c
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-28 09:13:29 +01:00 |
|
artica
|
71cc1f4951
|
Auto-updated build strings.
|
2020-01-28 00:01:07 +01:00 |
|
Daniel Barbero Martin
|
0dabab11cf
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
pandora_console/install.php
|
2020-01-27 16:19:32 +01:00 |
|
Daniel Barbero Martin
|
6ddb501b08
|
fixed errors VC
|
2020-01-27 16:15:54 +01:00 |
|
alejandro-campos
|
5913f815d1
|
Added possibility to display comments with line breaks in event detail
|
2020-01-27 13:37:34 +01:00 |
|
Daniel Barbero Martin
|
570ebd9a0a
|
fixed errors VC
|
2020-01-27 13:16:01 +01:00 |