Commit Graph

12642 Commits

Author SHA1 Message Date
artica b3d7c56de4 Auto-updated build strings. 2020-04-21 01:00:18 +02:00
artica 3992b81900 Auto-updated build strings. 2020-04-20 01:00:19 +02:00
artica 2e44631253 Auto-updated build strings. 2020-04-19 01:00:15 +02:00
artica 04ecb0afa5 Auto-updated build strings. 2020-04-18 01:00:19 +02:00
artica 719762105d Auto-updated build strings. 2020-04-17 01:00:19 +02:00
Alejandro Fraguas fdced83e63 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
Fixes name resolution

See merge request artica/pandorafms!3167
2020-04-16 18:23:31 +02:00
fbsanchez 290abfe2ce fix css issue window shrink 2020-04-16 17:54:41 +02:00
artica 1b028be67f Auto-updated build strings. 2020-04-16 01:00:14 +02:00
Daniel Maya 8ae8ac45f5 Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response 2020-04-15 15:50:08 +02:00
Alejandro Fraguas a4bd4a4c5d Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
minor style fix

See merge request artica/pandorafms!3166
2020-04-15 12:33:41 +02:00
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
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
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 805d96108c Changed position of buttons 2020-04-08 16:52:34 +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 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
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
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
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
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