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

1055 Commits

Author SHA1 Message Date
daniel b96cade165 new options 24x7 sla,availavility reports 2020-08-31 12:33:41 +02:00
Jose Gonzalez 3c0ea8b08a Solved issues with DB 2020-08-10 15:10:17 +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
Daniel Rodriguez 1f2e0e2d80 Merge branch 'ent-4943-identificar-version-instalada-server-enterprise-e6-o-e7' into 'develop' 
Increase the size of tserver.version.

See merge request artica/pandorafms!3368
 2020-07-27 12:17:27 +02:00
Ramon Novoa 8820d2756f Update the migration script. 2020-07-23 16:31:55 +02:00
Alejandro Campos 0d3d4d7d6f Merge branch 'develop' into 'ent-6100-Comando-de-alerta-Pandora-FMS-event' 
# Conflicts:
#   pandora_console/extras/mr/40.sql
 2020-07-15 09:30:35 +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
fbsanchez 5df418d226 MR changes 2020-07-09 16:56:51 +02:00
fbsanchez 231ba795dd MR update 2020-07-09 16:53:03 +02:00
Jose Gonzalez a1bd93bac7 Add database changes 2020-07-07 11:08:44 +02:00
alejandro-campos 49888fe48f Added change to MR 2020-07-06 09:56:15 +02:00
alejandro-campos 47a7502c6b Added change to MR 2020-07-06 09:55:14 +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 c07daa3199 WIP Services 2020-06-29 19:17:40 +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
vanessa gil 4c3fd21971 Updated version. 2020-06-03 11:00:42 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
daniel 65c733e1dd iot metaconsole 2020-05-27 09:18:21 +02:00
fbsanchez 7be305298a Remove file - old cluster files 2020-05-22 14:15:10 +02:00
alejandro-campos 23c4609981 Merge branch 'develop' into ent-1193-Comprobar-codigo-de-estado-HTTP 2020-05-19 17:13:54 +02:00
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