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

19133 Commits

Author SHA1 Message Date
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