tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,671 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

23671 Commits

Author SHA1 Message Date
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
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
Daniel Barbero Martin 570ebd9a0a fixed errors VC 2020-01-27 13:16:01 +01:00
Daniel Rodriguez ba7936f084 Merge branch 'ent-4697-cicd-pandorafms' into 'develop' 
Resolved deprecated options rpm spec

See merge request artica/pandorafms!2989
 2020-01-27 12:55:12 +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 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 06a3318fb6 fixed errors VC 2020-01-24 15:14:07 +01:00
Daniel Barbero Martin 5ec8c68aed fixed errors VC 2020-01-24 15:13:42 +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 Rodriguez ec03f947fe Merge branch 'ent-5226-Update-Manager-Offline-mostrar-aviso' into 'develop' 
Added warning in update manager offline

See merge request artica/pandorafms!2998
 2020-01-22 11:10:02 +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