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

24182 Commits

Author SHA1 Message Date
fbsanchez 72d20a6e57 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
 2020-04-07 12:55:27 +02:00
fbsanchez d5faabbff5 minor fix review with limitations 2020-04-07 12:43:44 +02:00
Daniel Rodriguez a73c9ecb22 Merge branch 'ent-5314-autodiscovery' into 'develop' 
Ent 5314 autodiscovery

See merge request artica/pandorafms!3144
 2020-04-07 12:29:23 +02:00
Daniel Rodriguez 18622f4d0a Merge branch 'ent-5517-9676-correlacion-nueva-hace-que-salten-mil-alertas-en-poco-tiempo' into 'develop' 
Minor change

See merge request artica/pandorafms!3125
 2020-04-07 10:58:47 +02:00
Daniel Rodriguez f81e5de8c2 Merge branch 'ent-5662-al-abrir-la-ventana-de-grafica-no-me-cabe' into 'develop' 
fixed minnor error

See merge request artica/pandorafms!3142
 2020-04-07 10:58:03 +02:00
Daniel Rodriguez bcaf37c60c Merge branch 'ent-5659-ventana-modal-de-la-vista-de-mapa-discovery-task-se-va' into 'develop' 
fixed error with dialog task list

See merge request artica/pandorafms!3139
 2020-04-07 10:57:12 +02:00
Daniel Rodriguez 29087f886d Merge branch 'ent-5658-cambiar-icono-satelite' into 'develop' 
change icon satelite

See merge request artica/pandorafms!3141
 2020-04-07 10:56:42 +02:00
Jose Gonzalez 5d5ccf9a6e 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-04-07 09:11:23 +02:00
Jose Gonzalez 253432d4ee Clean unnecesary file 2020-04-07 09:11:13 +02:00
artica 77b267c596 Auto-updated build strings. 2020-04-07 01:00:15 +02:00
fbsanchez 194c6d6a9a Excluded PENed templates from select 2020-04-06 18:26:55 +02:00
marcos 333f3ba9f0 show full graph 2020-04-06 18:18:39 +02:00
fbsanchez 890cfe68aa multiple fixes 2020-04-06 18:04:53 +02:00
Jose Gonzalez 3d01b918c9 Solved issue with pagination 2020-04-06 17:27:50 +02:00
Jose Gonzalez 5db6ba6c5d 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-04-06 16:49:35 +02:00
Jose Gonzalez 3537731ee7 WIP: minor fix with CSV file names 2020-04-06 16:49:22 +02:00
fbsanchez eb64fd8758 minor fixes 2020-04-06 16:10:37 +02:00
marcos 6a9b55ea36 fixed minnor error 2020-04-06 14:48:26 +02:00
fbsanchez c743a2b204 minor fix 2020-04-06 14:32:20 +02:00
fbsanchez 6cb9b06cea minor fix, license limits while reapplying queue 2020-04-06 13:42:39 +02:00
marcos eab1b7a003 change icon satelite 2020-04-06 13:22:00 +02:00
fbsanchez 3f9bdf65df minor fixes and target selection (buttons) 2020-04-06 13:00:09 +02:00
marcos 3a688c6b3d update task list dialog 2020-04-06 12:29:37 +02:00
Jose Gonzalez dacde2d0b2 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-04-06 12:15:05 +02:00
Jose Gonzalez fc2ea5aabf Solved issue with CSV Export 2020-04-06 12:14:57 +02:00
fbsanchez 5205e0e06f minor update 2020-04-06 12:05:03 +02:00
Jose Gonzalez 0aa9976640 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-04-06 11:58:48 +02:00
Jose Gonzalez a93812d1a8 Solved issues in ModuleTemplates class 2020-04-06 11:58:42 +02:00
fbsanchez 2d4b977d26 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-06 11:05:18 +02:00
fbsanchez 1523dca9b2 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-04-06 11:04:57 +02:00
fbsanchez 72f026f152 Minor fixes, group and review while exceeded license 2020-04-06 11:04:53 +02:00
Jose Gonzalez a6ce19db66 WIP: Backup upload 2020-04-06 09:49:59 +02:00
artica a8043e98f9 Auto-updated build strings. 2020-04-06 01:00:14 +02:00
artica e013e26892 Auto-updated build strings. 2020-04-05 01:00:14 +02:00
artica d18dbc10e7 Auto-updated build strings. 2020-04-04 01:00:20 +02:00
Kevin d9d3f7b176 Latest changes 2020-04-03 14:51:24 +02:00
Kevin 69a0aa9bd4 Clarified instructions, fixed error, added services 2020-04-03 14:29:07 +02:00
Daniel Rodriguez 846e6100b8 Merge branch 'ent-5395-Pelayo-Fallo-en-el-eje-de-titulos-de-los-custom-graphs-de-barra' into 'develop' 
fix format function for X axis of custom graphs

See merge request artica/pandorafms!3138
 2020-04-03 13:55:59 +02:00
Jose Gonzalez 5c04c6c03b Minor fixes with data 2020-04-03 12:55:48 +02:00
marcos ad4781eb3c fixed error with dialog task list 2020-04-03 12:48:52 +02:00
Daniel Rodriguez a901e91274 Merge branch 'ent-5652-Grafica-de-modulo-en-los-email-gigante' into 'develop' 
Ent 5652 grafica de modulo en los email gigante

See merge request artica/pandorafms!3135
 2020-04-03 12:28:28 +02:00
Daniel Rodriguez 89e7d1921f Merge branch 'ent-5657-al-añadir-accion-en-la-lista-de-alertas-el-dialogo-modal-no-muestra-en-nombre-de-agente' into 'develop' 
fixed minnnor error

See merge request artica/pandorafms!3137
 2020-04-03 12:06:50 +02:00
Daniel Rodriguez c4bec9c36c Merge branch 'ent-5654-El-sistema-de-modificacion-de-notificaciones-no-funciona' into 'develop' 
minor visual changes on user notifications editor

See merge request artica/pandorafms!3134
 2020-04-03 11:29:53 +02:00
Alejandro Fraguas 23e3f69065 Merge branch 'ent-4827-8899-crear-nuevo-agente-con-binario-y-anadirlo-en-el-repositorio' into 'develop' 
spec version

See merge request artica/pandorafms!3129
 2020-04-03 10:44:41 +02:00
alejandro-campos 80ce89e650 fix format function for X axis of custom graphs 2020-04-03 10:41:24 +02:00
alejandro-campos 0c3a7166e0 fix format function for X axis of custom graphs 2020-04-03 10:34:54 +02:00
Jose Gonzalez 17fbde311e 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-04-03 07:43:47 +02:00
Jose Gonzalez b8c8590e0b Finished module templates 2020-04-03 07:43:38 +02:00
artica 297693a9d3 Auto-updated build strings. 2020-04-03 01:00:18 +02:00
Kike d908a9f7f6 Added default modules templates for recon tasks 2020-04-02 19:12:49 +02:00