1728 Commits

Author SHA1 Message Date
Alejandro Fraguas
aaf64e591c Merge branch 'ent-5708-review-discovery-h-d' into 'develop'
Ent 5708 review discovery h d

See merge request artica/pandorafms!3195
2020-05-14 10:32:43 +02:00
Tatiana Llorente
1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
alejandro-campos
197e309129 added new module type 2020-05-04 12:22:04 +02:00
alejandro-campos
1140a4345a added new module type 2020-05-04 12:20:50 +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
36daf76cc5 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
	pandora_console/extras/mr/37.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2020-04-14 12:00:15 +02:00
Daniel Barbero Martin
3280ad479f Fix dashboards 2020-04-13 15:01:18 +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
Kike
801624b8a2 Deleted [RT] tag for recon templates 2020-04-07 14:04:06 +02:00
Kike
d908a9f7f6 Added default modules templates for recon tasks 2020-04-02 19:12:49 +02:00
fbsanchez
7f1d4725bd minor fix mr 2020-03-31 17:52:20 +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
alejandro-campos
e05c292d7d show last status change of module 2020-03-23 12:47:58 +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
fbsanchez
ce11d89953 Frontent changes 2020-03-13 14:03:50 +01:00
Daniel Barbero
19b571fc78 update version 2020-03-03 10:17:18 +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 Maya
baecac1efb Next mr 2020-01-29 15:51:39 +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
aa3bf33607 Added treport_content_item in migrate 2020-01-24 09:28:16 +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 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
Alejandro Campos
6dbe75169f Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-15 14:37:00 +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
Alejandro Campos
dcd2aae3c5 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-14 10:28:55 +01:00
Daniel Maya
7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
Alejandro Campos
0468c85a4d Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
2020-01-07 12:00:27 +01:00