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

24270 Commits

Author SHA1 Message Date
alejandro-campos 086bc28986 Changed target ip selector in WMI server policy modules 2020-04-27 17:27:54 +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
Daniel Rodriguez 8e6792596e Merge branch 'ent-5314-autodiscovery-2' into 'develop' 
deleted binaries from repo

See merge request artica/pandorafms!3162
 2020-04-14 18:30:04 +02:00
Daniel Rodriguez 260508455e Merge branch 'revert-e1072c51' into 'develop' 
Revert "Merge branch 'revert-24aa5d97' into 'develop'"

See merge request artica/pandorafms!3165
 2020-04-14 18:29:28 +02:00
Daniel Rodriguez 9a087fe6c5 Revert "Merge branch 'revert-24aa5d97' into 'develop'" 
This reverts merge request !3155
 2020-04-14 18:27:56 +02:00
fbsanchez 282b31841d minor style change 2020-04-14 18:24:51 +02:00
Daniel Rodriguez 629d84ee87 Merge branch 'revert-414bb7ef' into 'develop' 
Revert "Merge branch 'revert-a73c9ecb' into 'develop'"

See merge request artica/pandorafms!3163
 2020-04-14 18:23:54 +02:00
Daniel Rodriguez b841fec72e Revert "Merge branch 'revert-a73c9ecb' into 'develop'" 
This reverts merge request !3157
 2020-04-14 18:22:00 +02:00
Kevin 6dc1dc4934 deleted binaries from repo 2020-04-14 18:05:05 +02:00
Daniel Rodriguez 2445820d99 Merge branch 'ent-4176-8084-8169-actualizacion-selenium-firefox-wux' into 'develop' 
Minor fix: avoid errors if no default vales flipflop (Origin:Wux)

See merge request artica/pandorafms!3073
 2020-04-14 16:19: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
Daniel Rodriguez 414bb7ef0d Merge branch 'revert-a73c9ecb' into 'develop' 
Revert "Merge branch 'ent-5314-autodiscovery' into 'develop'"

See merge request artica/pandorafms!3157
 2020-04-14 12:59:04 +02:00
Daniel Rodriguez 5965d2691d Revert "Merge branch 'ent-5314-autodiscovery' into 'develop'" 
This reverts merge request !3144
 2020-04-14 12:52:48 +02:00
Daniel Rodriguez e1072c51e1 Merge branch 'revert-24aa5d97' into 'develop' 
Revert "Merge branch 'ent-5314-autodiscovery-2' into 'develop'"

See merge request artica/pandorafms!3155
 2020-04-14 12:51:54 +02:00
alejandro-campos 268e317ca3 fix cross-site scripting vulnerability 2020-04-14 12:50:19 +02:00
Daniel Rodriguez 847003088e Revert "Merge branch 'ent-5314-autodiscovery-2' into 'develop'" 
This reverts merge request !3148
 2020-04-14 12:50:07 +02:00
Alejandro Fraguas 48633419ea Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop' 
minor style fix

See merge request artica/pandorafms!3154
 2020-04-14 12:35:58 +02:00
fbsanchez edb3059a09 minor style fix 2020-04-14 12:32:54 +02:00
Alejandro Fraguas 9b506a324d Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop' 
Ent 5575 wizard de modulos y recon by steps

See merge request artica/pandorafms!3097
 2020-04-14 12:26:42 +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
fbsanchez 0282dae05a Tools.pm definition retrieved from 5575 2020-04-14 09:57:01 +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
fbsanchez f658ee6ad7 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-13 17:50:22 +02:00
fbsanchez 1057f76e5e undo changes, maintain classic ATF calculation 2020-04-13 17:50:18 +02:00
Jose Gonzalez e73e9654aa 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-13 17:30:29 +02:00
Jose Gonzalez 3fd09c9828 WIP: Reverse develop version for agent_wizard 2020-04-13 17:30:21 +02:00
fbsanchez cf67dda2eb prioritize AFT relationships 2020-04-13 17:26:49 +02:00
slerena d13eac3081 Update .htaccess 2020-04-13 17:20:11 +02:00
fbsanchez 3dbbd91d6d 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-13 17:16:52 +02:00
fbsanchez f6746ba9d8 parent calculation 2020-04-13 17:16:47 +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
fbsanchez 189d85d659 minor fix 2020-04-13 15:30:13 +02:00
fbsanchez 7395410831 fix parent-connection 2020-04-13 15:04:03 +02:00
Daniel Barbero Martin 3280ad479f Fix dashboards 2020-04-13 15:01:18 +02:00
fbsanchez 9c74306e95 minor change 2020-04-13 14:11:43 +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