24643 Commits

Author SHA1 Message Date
marcos
d5a7d75169 update function get id_event from meta api 2020-04-13 11:00:11 +02:00
Jose Gonzalez
3f1e7d2ced Solve minor fix 2020-04-13 10:57:32 +02:00
marcos
045f115d95 documented api function 2020-04-13 10:54:37 +02:00
fbsanchez
32538e659a Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-13 10:36:47 +02:00
marcos
db7eaaaf20 created function to get id_event from tmetaconsole_even api 2020-04-13 10:36:23 +02:00
artica
8d27ff9350 Auto-updated build strings. 2020-04-13 01:00:08 +02:00
artica
8b609e2d26 Auto-updated build strings. 2020-04-11 01:00:15 +02:00
artica
017fdea2c7 Auto-updated build strings. 2020-04-10 01:00:14 +02:00
artica
6425d4d86d Auto-updated build strings. 2020-04-09 01:00:18 +02:00
marcos
9931b16793 add nombre in api_get_i_name_by_alias API method 2020-04-08 17:01:18 +02:00
Jose Gonzalez
d1f565bb1d 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-08 16:52:41 +02:00
Jose Gonzalez
805d96108c Changed position of buttons 2020-04-08 16:52:34 +02:00
fbsanchez
a75964fcba minor fix 2020-04-08 16:06:39 +02:00
fbsanchez
8a0215dcc9 minor fixes 2020-04-08 14:14:03 +02:00
fbsanchez
bb11403c4b Fixes - default module 2020-04-08 13:01:11 +02:00
fbsanchez
748582509a avoid process csv while updating task with no csv changes 2020-04-08 12:29:44 +02:00
fbsanchez
4cf121b45a 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-08 12:26:05 +02:00
fbsanchez
95d7a5d267 minor fix 2020-04-08 12:26:01 +02:00
Jose Gonzalez
725e7d9c16 Solved issue with wrong position in filter 2020-04-08 12:17:22 +02:00
fbsanchez
47857de79f some css adjustments 2020-04-08 11:48:31 +02:00
marcos
e86f72958d update AllowOverride notify 2020-04-08 10:36:40 +02:00
fbsanchez
5c405b1d32 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-08 10:18:13 +02:00
fbsanchez
ce5868bbc4 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-08 10:03:51 +02:00
marcos
ff3b285f08 add url on notify 2020-04-08 09:45:18 +02:00
artica
987d8f4c75 Auto-updated build strings. 2020-04-08 01:00:21 +02:00
fbsanchez
56e9275b1a minor fix 2020-04-07 19:10:37 +02:00
fbsanchez
f88dceb4ec Some missing functions 2020-04-07 19:03:10 +02:00
fbsanchez
762ad3106d Improvements and fixes H&D with review 2020-04-07 18:50:56 +02:00
fbsanchez
1a2fd7ac09 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-07 18:50:18 +02:00
marcos
c44cb889e0 updates 2020-04-07 18:49:01 +02:00
marcos
f8f2da4d40 notify for allowoverride 2020-04-07 18:40:47 +02:00
Jose Gonzalez
396c93c8b8 WIP: Refactor and solve visual issues 2020-04-07 17:46:12 +02:00
Daniel Rodriguez
24aa5d972c Merge branch 'ent-5314-autodiscovery-2' into 'develop'
Ent 5314 autodiscovery-2

See merge request artica/pandorafms!3148
2020-04-07 17:43:54 +02:00
Kevin
46ce593b96 deleted binaries from plugins folder (still in agents) 2020-04-07 17:37:09 +02:00
Daniel Rodriguez
d6274e0aa3 Merge branch 'ent-5671-Errores-en-el-sistema-de-notificaciones' into 'develop'
removed not implemented options

See merge request artica/pandorafms!3146
2020-04-07 16:47:04 +02:00
Jose Gonzalez
1a080a4e3a WIP: Backup upload 2020-04-07 16:41:33 +02:00
marcos
0f28a9c5b4 add message if mysqldump is not instaled 2020-04-07 16:37:20 +02:00
Jose Gonzalez
42d50b4424 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 15:20:37 +02:00
Jose Gonzalez
39d19b2016 Added new features to ModuleTemplates 2020-04-07 15:20:30 +02:00
Kike
801624b8a2 Deleted [RT] tag for recon templates 2020-04-07 14:04:06 +02:00
alejandro-campos
9060fdf964 removed not implemented options 2020-04-07 14:01:58 +02:00
Luis Calvo
561150bc09 Metaconsole const replaced by function on visual map 2020-04-07 13:42:44 +02:00
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