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

19188 Commits

Author SHA1 Message Date
fbsanchez 83b53e3eb7 minor style fix 2020-04-15 11:53:10 +02:00
Alejandro Fraguas afa53c3398 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop' 
minor style change

See merge request artica/pandorafms!3164
 2020-04-15 09:17:46 +02:00
artica e695a3f5b5 Auto-updated build strings. 2020-04-15 01:00:17 +02:00
fbsanchez 282b31841d minor style change 2020-04-14 18:24:51 +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
Alejandro Fraguas 254a32be22 Merge branch 'ent-5691-Vulnerabilidad-XSS-en-sistema-de-mensajes' into 'develop' 
fix cross-site scripting vulnerability

See merge request artica/pandorafms!3156
 2020-04-14 15:36:48 +02:00
alejandro-campos 268e317ca3 fix cross-site scripting vulnerability 2020-04-14 12:50:19 +02:00
fbsanchez edb3059a09 minor style fix 2020-04-14 12:32:54 +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
fbsanchez 3b71297d56 escaped single quotes (wmi) + refresh button 2020-04-14 11:57:18 +02:00
Daniel Rodriguez 0e6b1ab713 Merge branch 'ent-5684-Se-ha-roto-la-vista-de-arbol' into 'develop' 
Fix tree

See merge request artica/pandorafms!3153
 2020-04-14 10:48:02 +02:00
Daniel Rodriguez a0881d53e8 Merge branch 'ent-5678-Errores-varios-en-los-nuevos-dashboards' into 'develop' 
Fix dashboards

See merge request artica/pandorafms!3152
 2020-04-14 10:43:48 +02:00
artica 60ee065f8b Auto-updated build strings. 2020-04-14 01:00:15 +02:00
fbsanchez 13a1e44a5e operation icons on small screens 2020-04-13 19:34:36 +02:00
fbsanchez 58eeffd04d clearer maps 2020-04-13 18:28:56 +02:00
Jose Gonzalez 3fd09c9828 WIP: Reverse develop version for agent_wizard 2020-04-13 17:30:21 +02:00
slerena d13eac3081 Update .htaccess 2020-04-13 17:20:11 +02:00
Daniel Barbero Martin 0c53ff58b2 Fix tree 2020-04-13 16:42:46 +02:00
Jose Gonzalez 6f0b1c005f Added invisible class 2020-04-13 15:41:35 +02:00
Jose Gonzalez d19a667ce9 Added form attribute for inputs 2020-04-13 15:41:00 +02:00
Daniel Barbero Martin 3280ad479f Fix dashboards 2020-04-13 15:01:18 +02:00
Jose Gonzalez 3f1e7d2ced Solve minor fix 2020-04-13 10:57:32 +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
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
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
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
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
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
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
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