adam/metasploit-gs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,768 Commits 27 Branches 1,043 Tags
4293500a5ede6f230960e2effa2ef358e7908067
Commit Graph

1879 Commits

Author SHA1 Message Date
Brandon Turner 05f0d09828 Merge branch staging/electro-release into master 
On August 15, shuckins-r7 merged the Metasploit 4.10.0 branch
(staging/electro-release) into master.  Rather than merging with
history, he squashed all history into two commits (see
149c3ecc63 and
82760bf5b3).

We want to preserve history (for things like git blame, git log, etc.).
So on August 22, we reverted the commits above (see
19ba7772f3).

This merge commit merges the staging/electro-release branch
(62b81d6814) into master
(48f0743d1b).  It ensures that any changes
committed to master since the original squashed merge are retained.

As a side effect, you may see this merge commit in history/blame for the
time period between August 15 and August 22.
 2014-08-22 10:50:38 -05:00
Brandon Turner 19ba7772f3 Revert "Various merge resolutions from master <- staging" 
This reverts commit 149c3ecc63.

Conflicts:
	lib/metasploit/framework/command/base.rb
	lib/metasploit/framework/common_engine.rb
	lib/metasploit/framework/require.rb
	lib/msf/core/modules/namespace.rb
	modules/auxiliary/analyze/jtr_postgres_fast.rb
	modules/auxiliary/scanner/smb/smb_login.rb
	msfconsole
 2014-08-22 10:17:44 -05:00
William Vu b748cee760 Land #3664, enum_osx dump_hash removal 2014-08-19 11:29:23 -05:00
Tod Beardsley cad281494f Minor caps, grammar, desc fixes 2014-08-18 13:35:34 -05:00
joev 5654370316 Remove hashdump functionality from enum_osx. 
There is a specific hashdump module that is more up-to-date, no need to duplicate
functionality (and code).
 2014-08-18 11:40:11 -05:00
Samuel Huckins 149c3ecc63 Various merge resolutions from master <- staging 
* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing
 2014-08-15 11:33:31 -05:00
Brandon Turner 91bb0b6e10 Merge tag '2014072301' into staging/electro-release 
Conflicts:
	Gemfile.lock
	modules/post/windows/gather/credentials/gpp.rb

This removes the active flag in the gpp.rb module.  According to Lance,
the active flag is no longer used.
 2014-08-06 15:58:12 -05:00
Tod Beardsley 4de59ad7d1 Add reasonable description for gnome-commander 2014-08-04 12:35:34 -05:00
James Lee 62240537db Refactor sso to use Credential::Creation 2014-07-31 16:06:23 -05:00
William Vu 0208420a67 Land #3565, GNOME Commander post module 2014-07-28 17:28:36 -05:00
William Vu f4bd44d9c6 Fix outstanding issues 2014-07-28 17:28:15 -05:00
David Bloom a904ed8507 Update gnome_commander_creds.rb 2014-07-28 22:49:13 +02:00
David Bloom b121bf6d6c Update gnome_commander_creds.rb 2014-07-28 22:46:50 +02:00
David Bloom e35ee1f037 Update gnome_commander_creds.rb 2014-07-24 23:36:32 +02:00
David Bloom f4440680b6 Update gnome_commander_creds.rb 2014-07-24 23:30:26 +02:00
David Bloom 9dc37c3cc7 Update gnome_commander_creds.rb 2014-07-24 23:18:26 +02:00
David Bloom 48982b3b89 Update gnome_commander_creds.rb 2014-07-24 23:16:45 +02:00
David Bloom 2e5c2a514b Update gnome_commander_creds.rb 2014-07-24 23:16:10 +02:00
David Bloom 9aa1b86d8f Update gnome_commander_creds.rb 2014-07-24 23:10:00 +02:00
David Bloom 718c401472 Update gnome_commander_creds.rb 2014-07-24 23:01:30 +02:00
David Bloom 8a6fa178d6 Update gnome_commander_creds.rb 2014-07-24 08:10:28 +02:00
David Bloom 41e5e24b19 Update gnome_commander_creds.rb 2014-07-23 20:26:43 +02:00
David Bloom 30c00f4fd6 gnome-commander credentials add 2014-07-23 20:20:29 +02:00
sinn3r 6048f21875 Land #3552 - Correct DbVisualizer title name 2014-07-21 13:07:33 -05:00
sinn3r 73e665b863 Land #3542 - Multi Manage DbVisualizer Query 2014-07-21 13:02:19 -05:00
sinn3r fbbaaf2e2a Fix spaces and module description 2014-07-21 13:01:18 -05:00
Tod Beardsley a41768fd7d Correct DbVisualizer title name 
I think "DbVis Software" is the name of the company and the product
itself is called DbVisualizer.

Also fixed the description on the WPTouch module.
 2014-07-21 12:35:01 -05:00
scriptjunkie 8fe508207c Merge Meatballs' gpp_again pull into new branch 2014-07-19 11:10:14 -05:00
sinn3r c59d72b0c6 Land #3530 - dbvis database administrator 2014-07-17 14:36:34 -05:00
sinn3r 6d35867f7f Update module description 2014-07-17 14:24:57 -05:00
sinn3r 8e7361d952 Fix indent again 2014-07-17 14:12:04 -05:00
sinn3r aed8af3abc Retabbed 2014-07-17 14:03:27 -05:00
sinn3r d6ab418d6f Fix spaces 2014-07-17 13:52:00 -05:00
David Bloom b4e68a7c25 Update dbvis_query.rb 2014-07-17 19:21:35 +02:00
David Bloom 0f92b73f1a Update dbvis_add_db_admin.rb 2014-07-17 10:14:28 +02:00
David Bloom 561ef427cc Update dbvis_query.rb 2014-07-17 10:13:58 +02:00
David Bloom 60c71b2681 Update dbvis_add_db_admin.rb 2014-07-17 10:11:13 +02:00
David Bloom 8f9a1e485c Delete dbvis_query.rb 2014-07-17 08:05:18 +02:00
David Bloom 1c8cac359c Added video link 2014-07-17 08:02:27 +02:00
David Bloom 7bee4db1d7 dbvis_query.rb add 2014-07-17 07:48:17 +02:00
Trevor Rosen bebf11c969 Resolves some Login::Status migration issues 
MSP-10730
 2014-07-16 21:52:08 -05:00
David Bloom 4a25bb4247 Update dbvis_add_db_admin.rb 2014-07-17 02:01:50 +02:00
William Vu 25f74b79b8 Land #3484, bad pack/unpack specifier fix 2014-07-16 14:52:23 -05:00
David Bloom 52bdc5364c Update dbvis_query.rb 2014-07-16 18:52:27 +02:00
David Bloom 200c122ecd Update dbvis_query.rb 2014-07-16 18:48:15 +02:00
David Bloom 31e38cee23 Update dbvis_add_db_admin.rb 2014-07-16 18:45:38 +02:00
David Bloom 5f38ad5e10 Update dbvis_add_db_admin.rb 2014-07-16 18:30:23 +02:00
David Bloom c3b87e2e6c Update rigth on dbviscmd check 2014-07-16 18:27:19 +02:00
David Maloney 52a29856b3 Merge branch 'master' into staging/electro-release 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-07-16 09:38:44 -05:00
David Bloom 90932116f8 Update dbvis_query.rb 
Minor changes
 2014-07-16 15:44:48 +02:00