Commit Graph

19228 Commits

Author SHA1 Message Date
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 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 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
Jose Gonzalez 1a080a4e3a WIP: Backup upload 2020-04-07 16:41:33 +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 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
marcos fa522ca896 fixed error 2020-04-06 17:41:56 +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
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-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
marcos f229dada52 fixed minnnor error 2020-04-02 19:02:14 +02:00
Daniel Rodriguez 81e7e9a7d9 Merge branch 'ent-5656-Admin-lista-de-usuarios-cambios-menores-en-la-visualizacion' into 'develop'
minor visual changes

See merge request artica/pandorafms!3132
2020-04-02 15:25:40 +02:00
Daniel Maya 9b1d8a52de Fixed graph height when send email by alert 2020-04-02 14:58:03 +02:00
Luis bcd9aabcd8 Ent 5604 policy modules japanese bug 2020-04-02 14:30:02 +02:00
Jose Gonzalez 172bbed817 Added onKeyDown feature for text inputs 2020-04-02 12:53:21 +02:00
Jose Gonzalez 6a7e9ba400 Added filter for components. Also wiped dirty code 2020-04-02 12:48:25 +02:00
alejandro-campos 60c766ca29 minor visual changes on user notifications editor 2020-04-02 10:37:59 +02:00
Jose Gonzalez 933bdef165 Added solution for multiple template delete 2020-04-02 08:10:37 +02:00
artica e30b9a32d8 Auto-updated build strings. 2020-04-02 01:00:16 +02:00
alejandro-campos 6d6b891650 minor visual changes 2020-04-01 17:32:22 +02:00
Jose Gonzalez 30844bac35 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-01 17:26:09 +02:00
Jose Gonzalez c31a288cfd Minor fix when create a template and add components 2020-04-01 17:26:04 +02:00
fbsanchez e249233205 minor fixes 2020-04-01 16:43:04 +02:00
Jose Gonzalez 1b8fa26193 Minor fixes applied 2020-04-01 16:36:06 +02:00
Jose Gonzalez 6be6e19ad3 WIP: Ready for testing 2020-04-01 16:21:28 +02:00
Jose Gonzalez 4f2ad67f58 WIP: Deleted legacy menu entry 2020-04-01 13:13:31 +02:00
Jose Gonzalez faf7c5462e Applied solution for image size issues in toggle bar 2020-04-01 09:25:18 +02:00
artica f68d84940c Auto-updated build strings. 2020-04-01 01:00:19 +02:00
Luis Calvo e575f65b6a Added agent description to search and agent detail 2020-03-31 20:02:28 +02:00
Jose Gonzalez cba95e4423 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 17:56:46 +02:00
fbsanchez 7f1d4725bd minor fix mr 2020-03-31 17:52:20 +02:00
marcos a2ee59e5b0 duplicated enable/disable message 2020-03-31 17:35:01 +02:00
Jose Gonzalez a715b7d74a WIP 2020-03-31 13:00:07 +02:00
Jose Gonzalez 4c332a3543 WIP: Must do low changes 2020-03-31 10:47:00 +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 3ad3a07d93 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-31 10:02:52 +02:00
daniel 263eaeeebd Fix bundle Ehorus 2020-03-31 09:33:39 +02:00
artica a2106a2056 Auto-updated build strings. 2020-03-31 01:00:18 +02:00
fbsanchez acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00
Jose Gonzalez c2d81238d6 WIP: Near to finish 2020-03-30 19:03:55 +02:00
Jose Gonzalez fa372656f4 Fixed issue with DB 2020-03-30 17:48:09 +02:00
Jose Gonzalez c0b7c7e339 Changed breadcrumb for PEN form 2020-03-30 17:12:49 +02:00
Jose Gonzalez dc55ca5eff WIP: Changes with PEN tables 2020-03-30 17:02:34 +02:00
Jose Gonzalez 85765099ea 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-30 17:01:03 +02:00
Jose Gonzalez d09c5f355b WIP: Fixes and refactor 2020-03-30 17:00:48 +02:00
fbsanchez 6ea901e7ee Limitations 2020-03-30 15:07:05 +02:00
fbsanchez c556bf3ba8 License validation 2020-03-30 15:03:22 +02:00
fbsanchez a7c783242d Remaining stuff 2020-03-30 12:51:52 +02:00
Jose Gonzalez e883312038 Modified menu 2020-03-30 08:22:07 +02:00
artica 7991d6f215 Auto-updated build strings. 2020-03-30 01:00:14 +02:00
artica ea4b3bff04 Auto-updated build strings. 2020-03-29 01:00:15 +01:00
artica 9ca21e8768 Auto-updated build strings. 2020-03-28 01:00:19 +01:00
Jose Gonzalez 4e019fe193 Modified name for Network component to Remote component 2020-03-27 13:47:49 +01:00
Jose Gonzalez a150417ad3 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
Merge to get the new code
2020-03-27 12:18:17 +01:00
Jose Gonzalez 1be120b1dc Solved issue with display style 2020-03-27 12:18:09 +01:00
fbsanchez 6a14ddea73 minor fix 2020-03-27 11:50:41 +01:00
fbsanchez dffaafbf6a 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-27 11:42:09 +01:00
fbsanchez 3a74e25068 PEN management 2020-03-27 11:41:56 +01:00
alejandro-campos 26c16adbf9 fix accessing wrong index after deletion of node 2020-03-27 11:37:10 +01:00
Jose Gonzalez 75de601f57 Forms modified for be able add raw inputs 2020-03-27 08:51:17 +01:00
artica d2eac81d39 Auto-updated build strings. 2020-03-27 01:00:18 +01:00
fbsanchez cf6dddd933 minor fix 2020-03-26 17:05:19 +01:00
fbsanchez 452f5253e2 merge develop 2020-03-26 14:43:57 +01:00
Jose Gonzalez 161c1eb643 WIP: Minor fixes 2020-03-26 14:41:54 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Jose Gonzalez 1d11e9324f 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
Accept input changes
2020-03-26 12:17:39 +01:00
Jose Gonzalez 2b21266a38 WIP: At this point, PEN form is operative and functional 2020-03-26 12:17:28 +01:00
fbsanchez 2fb3d664cf 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-26 09:10:13 +01:00
fbsanchez d40035a716 restoration 2020-03-26 09:10:08 +01:00
fbsanchez 2c8655b1a3 restored install.php 2020-03-26 09:09:54 +01:00
Jose Gonzalez 86cbecc9a0 WIP: PEN form near to clear 2020-03-26 09:04:10 +01:00
artica 63fca15ead Auto-updated build strings. 2020-03-26 01:00:17 +01:00
Daniel Rodriguez 87f2e434a4 Merge branch 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' into 'develop'
changes to show last status change of modules

See merge request artica/pandorafms!3114
2020-03-25 18:10:09 +01:00
fbsanchez fecff8aa93 Discovery review advanced 2020-03-25 18:02:58 +01:00
alejandro-campos 531e729ebe added N/A in case last status change is not set 2020-03-25 18:01:39 +01:00
alejandro-campos a8325653d4 add N/A in case time last_status_change is not set 2020-03-25 17:40:05 +01:00
alejandro-campos ecc6cd8f4e Merge branch 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' of https://brutus.artica.es:8081/artica/pandorafms into ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado 2020-03-25 16:22:14 +01:00
alejandro-campos 4246c15157 add not available in case there is no last status change registered 2020-03-25 16:21:51 +01:00
Jose Gonzalez e1d233453f Update database files 2020-03-25 13:05:56 +01:00