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 |
|
alejandro-campos
|
b79805c363
|
fix bad owner for pandora_console logrotate config file
|
2020-01-30 13:08:56 +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 |
fbsanchez
|
50a2d74adb
|
Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms
Conflicts:
pandora_server/pandora_server.spec
|
2020-01-27 12:38:19 +01:00 |
|
Daniel Maya
|
1998db3317
|
Fixed date in availability graph
|
2020-01-27 11:52:13 +01:00 |
|
rafael
|
e2bd041ba2
|
adding .htaccess files
|
2020-01-27 11:03:42 +01:00 |
|
Daniel Rodriguez
|
28392b71ef
|
Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop'
availability failover
See merge request artica/pandorafms!3015
|
2020-01-27 10:48:50 +01:00 |
|
Daniel Maya
|
c0d6ae1496
|
Fixed label Failover
|
2020-01-27 09:32:22 +01:00 |
|
Daniel Barbero Martin
|
8ee038667c
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-27 08:22:36 +01:00 |
|
artica
|
e35edd92b3
|
Auto-updated build strings.
|
2020-01-27 00:01:09 +01:00 |
|
artica
|
5dbb80287e
|
Auto-updated build strings.
|
2020-01-26 00:01:10 +01:00 |
|
Daniel Barbero Martin
|
19964c8463
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-25 11:57:19 +01:00 |
|
Daniel Barbero Martin
|
5ff10ac514
|
fixed errors VC
|
2020-01-25 11:57:04 +01:00 |
|
artica
|
b4b1fbb3c1
|
Auto-updated build strings.
|
2020-01-25 00:01:10 +01:00 |
|
Daniel Barbero Martin
|
5ec8c68aed
|
fixed errors VC
|
2020-01-24 15:13:42 +01:00 |
|
alejandro-campos
|
d21068e368
|
fix to display pandora tab subtitle based on condition and display rebranding product name in case database connection failed
|
2020-01-24 13:52:09 +01:00 |
|
Daniel Barbero Martin
|
aea073b4d5
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-24 11:41:35 +01:00 |
|
Daniel Rodriguez
|
6a35ffa01b
|
Merge branch 'ent-5322-SQL-Injection-leads-to-Login-Bypass' into 'develop'
Fixed injection sql in chart_generator
See merge request artica/pandorafms!3024
|
2020-01-24 10:52:02 +01:00 |
|
Daniel Maya
|
aa3bf33607
|
Added treport_content_item in migrate
|
2020-01-24 09:28:16 +01:00 |
|
artica
|
ea3a317a1b
|
Auto-updated build strings.
|
2020-01-24 00:01:33 +01:00 |
|
Daniel Barbero Martin
|
fe697a98ec
|
fixed errors VC
|
2020-01-23 19:54:47 +01:00 |
|
Daniel Barbero Martin
|
cd3691ecc3
|
fixed errors VC
|
2020-01-23 17:52:59 +01:00 |
|
Daniel Barbero Martin
|
481f08bd5f
|
fixed errors VC
|
2020-01-23 16:21:31 +01:00 |
|
Daniel Rodriguez
|
a0ef0e1ee1
|
Merge branch 'ent-5324-Remote-file-inclusion-phar-object-injection-as-lowest-privileged-user' into 'develop'
fixed vulnerability
See merge request artica/pandorafms!3023
|
2020-01-23 11:04:40 +01:00 |
|
Daniel Maya
|
9f9cc9beda
|
Fixed injection sql in chart_generator
|
2020-01-23 10:40:55 +01:00 |
|
Daniel Barbero Martin
|
76dd28fbdc
|
fixed errors VC
|
2020-01-23 10:24:46 +01:00 |
vgilc
|
2447514c41
|
Merge branch 'ent-4259-el-id-del-agente-con-remote-config-se-corta-en-la-vista-de-manage-resolucion-portatil' into 'develop'
Fix visual problems with agent details
See merge request artica/pandorafms!2625
|
2020-01-23 10:11:35 +01:00 |
|
Daniel Barbero Martin
|
3124e09c12
|
fixed errors VC
|
2020-01-23 09:20:40 +01:00 |
|
Daniel Barbero Martin
|
6c6403336f
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-23 08:14:24 +01:00 |
|
Daniel Barbero
|
203a91f065
|
fixed errors
|
2020-01-22 17:47:47 +01:00 |
|
alejandro-campos
|
c44b595c8a
|
fixed vulnerability
|
2020-01-22 17:20:13 +01:00 |
|
Daniel Rodriguez
|
5374a06cbf
|
Merge branch 'ent-5150-errores-y-mejoras-generales-en-correlacion-de-alertas' into 'develop'
add wiki url alerts correlation
See merge request artica/pandorafms!3022
|
2020-01-22 13:41:47 +01:00 |
|
Daniel Barbero
|
f3dbf6391f
|
Add confirm dialog remove item VC
|
2020-01-22 13:00:19 +01:00 |
|
Daniel Barbero
|
69e750da13
|
Fixed error Color cloud VC
|
2020-01-22 12:48:31 +01:00 |
|
marcos
|
18a3a747bd
|
add wiki url alerts correlation
|
2020-01-22 12:24:15 +01:00 |
|
Daniel Rodriguez
|
189ba74f01
|
Merge branch 'ent-5323-Phar-object-injection' into 'develop'
Prepend folder to image to avoid Phar injection
See merge request artica/pandorafms!3021
|
2020-01-22 12:20:35 +01:00 |
|
vgilc
|
69d9051339
|
Merge branch 'ent-5172-metaconcola-informes-ajustes-para-agrupados' into 'develop'
Fixed visual bug in grouped report item
See merge request artica/pandorafms!2992
|
2020-01-22 12:20:05 +01:00 |
|
Daniel Maya
|
5c3b6c7a69
|
Fix total check for failover
|
2020-01-22 12:18:11 +01:00 |
|
Daniel Rodriguez
|
f6cb7eb3d7
|
Merge branch 'ent-5325-CSRF-XSS-realtime-graphs' into 'develop'
Added enconding to POST variables realtime graphs
See merge request artica/pandorafms!3019
|
2020-01-22 12:04:14 +01:00 |
|
Daniel Maya
|
32b28bea0c
|
Added warning in update manager offline
|
2020-01-22 11:10:02 +01:00 |
Luis Calvo
|
ca35bb64cc
|
Prepend folder to image to avoid Phar injection
|
2020-01-22 10:17:35 +01:00 |
|
Daniel Barbero
|
8bcacf546c
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-22 10:13:25 +01:00 |
|
artica
|
475517afd7
|
Auto-updated build strings.
|
2020-01-22 00:01:19 +01:00 |
|
Daniel Barbero Martin
|
4b5a754d2e
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-21 17:44:06 +01:00 |
|
Daniel Barbero Martin
|
ac4c091c9e
|
Fixed errors VC
|
2020-01-21 17:43:41 +01:00 |
|
Daniel Maya
|
428e0ffbd7
|
Fixed password policy
|
2020-01-21 17:31:21 +01:00 |
|
Daniel Maya
|
81fe77d9fd
|
Added failover in templates
|
2020-01-21 16:26:36 +01:00 |
|
Daniel Barbero Martin
|
a557c25c31
|
Fixed errors VC
|
2020-01-21 12:55:54 +01:00 |
|
Daniel Rodriguez
|
2a4e7bcceb
|
Merge branch 'ent-5329-9418-remote_cmd_string-busca-histórico-en-tagente_datos' into 'develop'
remote_cmd_string modules historical data look into tagente_datos_string
See merge request artica/pandorafms!3018
|
2020-01-21 11:15:34 +01:00 |
|
Luis Calvo
|
3d0b71d953
|
Added enconding to POST variables
|
2020-01-21 11:05:49 +01:00 |
|
Daniel Barbero Martin
|
b2f356bd4b
|
Fixed errors VC
|
2020-01-21 10:42:09 +01:00 |
|
Daniel Barbero Martin
|
8672629dd6
|
Fixed errors VC
|
2020-01-21 10:33:07 +01:00 |
|
Daniel Barbero Martin
|
578400aa92
|
change load modal ??????
|
2020-01-21 08:37:30 +01:00 |
|
Daniel Barbero Martin
|
89e83e38e0
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
pandora_console/include/javascript/pandora.js
|
2020-01-21 08:28:00 +01:00 |
|
artica
|
2a17065065
|
Auto-updated build strings.
|
2020-01-21 00:01:11 +01:00 |
|
Daniel Barbero Martin
|
98ddf3c6ee
|
Fixed errors VC
|
2020-01-20 17:46:52 +01:00 |
|
Daniel Barbero Martin
|
3545e28581
|
Fixed errors VC
|
2020-01-20 16:01:53 +01:00 |
ismael.moreno
|
395d45cec9
|
remote_cmd_string modules historical data look into tagente_datos_string
|
2020-01-20 14:12:33 +01:00 |
|
Alejandro Campos
|
e7769b8bf4
|
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
# pandora_console/extras/mr/35.sql
|
2020-01-20 12:00:42 +01:00 |
|
Daniel Rodriguez
|
738361d237
|
Merge branch 'ent-4876-pandora_ui.js' into 'develop'
first changes pandora.js to pandora_ui.js
See merge request artica/pandorafms!2909
|
2020-01-20 09:54:20 +01:00 |
|
Daniel Barbero Martin
|
03c1224563
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-20 08:00:46 +01:00 |
|
artica
|
ba1f0b96b4
|
Auto-updated build strings.
|
2020-01-20 00:01:08 +01:00 |
|
Daniel Barbero Martin
|
861011257d
|
Fixed errors VC
|
2020-01-19 22:57:31 +01:00 |
|
Daniel Barbero Martin
|
536af6f33a
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-19 11:37:18 +01:00 |