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

699 Commits

Author SHA1 Message Date
Jose Gonzalez 3c0ea8b08a Solved issues with DB 2020-08-10 15:10:17 +02:00
Jose Gonzalez 35644a367f Added ttag modifies 2020-08-10 14:53:07 +02:00
Jose Gonzalez 7300ccd185 Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' of brutus.artica.es:artica/pandorafms into ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola 2020-08-07 13:29:25 +02:00
Jose Gonzalez c67d8bd005 Fixed little issues 2020-08-07 13:29:09 +02:00
José González 85d8e1f796 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' 
# Conflicts:
#   pandora_console/extras/mr/40.sql
#   pandora_console/godmode/alerts/configure_alert_template.php
 2020-08-07 13:17:41 +02:00
José González f3d1a80252 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' 
# Conflicts:
#   pandora_console/extras/mr/40.sql (solved)
 2020-07-10 08:19:07 +02:00
Ramon Novoa 19a8288f26 Increase the size of tserver.version. 
Ref pandora_enterprise#4943
 2020-07-09 17:47:11 +02:00
Jose Gonzalez a1bd93bac7 Add database changes 2020-07-07 11:08:44 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
fbsanchez 94a7b625fb Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
 2020-06-22 14:06:13 +02:00
Luis efb69c18bc Ent 5809 message delete not working 2020-06-22 13:52:54 +02:00
fbsanchez 9bae4f8a17 MR change - minor 2020-06-19 12:14:09 +02:00
fbsanchez 6c5484baf0 MR change smart services 2020-06-18 12:35:52 +02:00
daniel 65c733e1dd iot metaconsole 2020-05-27 09:18:21 +02:00
fbsanchez 026562e7ee MR changes 2020-04-30 15:00:04 +02:00
fbsanchez 7024863fd7 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 
Conflicts:
	pandora_console/extras/mr/37.sql
 2020-04-14 16:06:17 +02:00
fbsanchez a75964fcba minor fix 2020-04-08 16:06:39 +02:00
fbsanchez 762ad3106d Improvements and fixes H&D with review 2020-04-07 18:50:56 +02:00
Jose Gonzalez 6cad02635e Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-31 10:45:37 +02:00
Jose Gonzalez f28de6f4d0 Fixed db issue 2020-03-31 10:45:30 +02:00
fbsanchez acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00
Jose Gonzalez fa372656f4 Fixed issue with DB 2020-03-30 17:48:09 +02:00
Jose Gonzalez dc55ca5eff WIP: Changes with PEN tables 2020-03-30 17:02:34 +02:00
fbsanchez 3a74e25068 PEN management 2020-03-27 11:41:56 +01:00
fbsanchez 452f5253e2 merge develop 2020-03-26 14:43:57 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
fbsanchez fecff8aa93 Discovery review advanced 2020-03-25 18:02:58 +01:00
Jose Gonzalez e1d233453f Update database files 2020-03-25 13:05:56 +01:00
Alejandro Campos b56076044b Merge branch 'develop' into 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' 
# Conflicts:
#   pandora_console/extras/mr/37.sql
 2020-03-24 13:55:57 +01:00
Daniel Maya c7e6f9fd34 Added disable event in alert template 2020-03-23 11:34:37 +01:00
Kike 037564810b Increase WUX tests field size in database 2020-03-20 14:09:06 +01:00
alejandro-campos 014688468c changes to show last status change of modules 2020-03-19 15:18:20 +01:00
Jose Gonzalez 451cdf2ca1 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-19 12:14:05 +01:00
Jose Gonzalez c9813afc9b DB changes 2020-03-19 12:13:56 +01:00
fbsanchez f58276ddbb Templates 2020-03-18 19:31:58 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
Daniel Maya 4e4c1495eb Fixed merge conflict 2020-02-20 15:07:14 +01:00
Daniel Maya 87dc92ffd9 Ent 5457 suid nodos elastic 2020-02-18 13:24:22 +01:00
Daniel Maya be47ed178b Added force apply in policies 2020-02-05 12:49:52 +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 c68f83f013 availability failover 2020-01-15 17:16:46 +01:00
Alejandro Campos c389769602 Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-15 17:12:32 +01:00
Luis 2926ead13b Fixed group change on networkmap.ACL and source group working separated 2020-01-15 12:14:37 +01:00
alejandro-campos 5eb2953810 Added port option on server configuration to be used when connecting to execution server 2020-01-14 15:43:17 +01:00
Daniel Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
daniel 3dbdfdb6eb Fix Landscape reports 2019-12-11 15:07:38 +01:00
Luis 6ba4a26564 Added timeoout option to command event responses 2019-12-10 11:54:30 +01:00
Luis b0d5b7223e Added report template regex to MR 2019-11-27 13:21:05 +01:00