infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
38,030 Commits
7 Branches
556 Tags
419 MiB
Commit Graph

406 Commits (3a623862e3c8efad389ed8b9a01562fa46cfe396)

Author SHA1 Message Date
Metasploit 16c599866c
Bump version of framework to 4.11.21 2016-04-08 16:23:33 -07:00
William Vu 22d08fdf39 Revert #6748, premature Gemfile* changes 2016-04-06 14:52:22 -05:00
David Maloney c3452ab982
unlock gemspec deps 
unlock version constraints on deps
defined inside the gemspec

MS-1330
 2016-04-04 15:31:09 -05:00
David Maloney fea142dc6e
unlock gemfile deps first 
unlock the gemfile deps

MS-1330
 2016-04-04 13:55:53 -05:00
David Maloney 8de58e4b80
Merge branch 'master' into staging/rails-upgrade 2016-04-04 09:30:01 -05:00
Brent Cook 627615d47b update to payloads 1.1.6 2016-04-01 21:30:34 -05:00
OJ 6c602dae90 Bump payloads to 1.1.5 2016-03-31 14:03:59 +10:00
wchen-r7 bc48ebd43b Use patch_finder for msu_finder 2016-03-29 23:21:01 -05:00
Brent Cook b8d53dde4a Merge branch 'upstream-master' into staging/rails-upgrade 2016-03-29 15:56:50 -05:00
Metasploit b41ac10fe8
Bump version of framework to 4.11.20 2016-03-29 12:43:20 -07:00
thao doan 587f1ee7b3 Land #6708, module documentation for msfconsole 2016-03-29 11:30:55 -07:00
Metasploit 72bde63397
Bump version of framework to 4.11.19 2016-03-25 13:03:35 -07:00
Brent Cook 1fe40d9f2d update to metasploit-payloads 1.1.4 2016-03-24 22:32:55 -05:00
wchen-r7 c3ce621d04 Fix gemfile 2016-03-24 20:43:51 -05:00
wchen-r7 57984706b8 Resolve merge conflict with Gemfile 2016-03-24 18:13:31 -05:00
Metasploit e7b0c60e5c
Bump version of framework to 4.11.18 2016-03-23 07:55:29 -07:00
Metasploit 6e12e74e02
Bump version of framework to 4.11.17 2016-03-18 14:12:18 -07:00
Brent Cook 87074c0638
Land #6651, add android sqlite_query option, update metasploit-payloads 2016-03-15 18:27:49 -05:00
Brent Cook a06236baa6 update to metasploit-payloads 1.1.3 2016-03-14 10:43:41 -05:00
Metasploit e059f42094
Bump version of framework to 4.11.16 2016-03-11 14:17:28 -08:00
David Maloney b878e762c0
pin rake version to 1.x line 
rake 11 remvoes the last_comment method which
causes a error when trying to run rake jobs
current guidance is to pin the version back to
before the change

MS-1230
 2016-03-10 15:39:06 -06:00
David Maloney 1911d0cd17
missed credential 2016-03-09 15:39:06 -06:00
David Maloney ca18996272
setup rails staging branch 
rails 4.1 baby!
 2016-03-09 15:35:00 -06:00
David Maloney 88697a5d3f
Merge branch 'master' into staging/rails-upgrade 2016-03-08 15:22:04 -06:00
Metasploit a5cdd7e17f
Bump version of framework to 4.11.15 2016-03-04 16:56:02 -08:00
Metasploit ce675330c0
Bump version of framework to 4.11.14 2016-03-04 14:49:55 -08:00
Brent Cook 851e8b610e
Land metasploit-payloads#80, update to fix #6593 2016-03-02 13:44:02 -06:00
wchen-r7 9f147a54a1 Update Gemfile for Sawyer (because Octokit needs it) 2016-03-02 10:53:13 -06:00
wchen-r7 5f510df2ab Resolve merge conflict with upstream's Gemfile.lock 2016-03-01 22:06:17 -06:00
David Maloney 368af93cfe
Merge branch 'master' of github.com:rapid7/metasploit-framework 2016-03-01 10:52:00 -06:00
Fernando Arias cbcd431772
Updated Gemfile.lock 2016-02-26 15:41:39 -06:00
Fernando Arias c4c5944b25
Merge branch 'staging/rails-upgrade' into staging/MS-888/engines-is-deprecated 
Conflicts:
	Gemfile.lock
	metasploit-framework.gemspec
 2016-02-26 15:35:34 -06:00
David Maloney b7ba38a4c6
update mdm version 2016-02-26 14:32:03 -06:00
Brent Cook 7acba69e37
Land #6577, add controls for Android ringer 2016-02-26 07:02:49 -06:00
Brent Cook 1427887efe update payloads 2016-02-26 06:10:02 -06:00
Gregory Mikeska 2277a97065
Modify gemfile to point to topic branch on metasploit-concern 2016-02-25 11:12:49 -06:00
Gregory Mikeska cbc5b296e4
implement engines method locally instead of adding refinement 2016-02-25 11:05:17 -06:00
Metasploit b32f474e99
Bump version of framework to 4.11.13 2016-02-24 11:37:42 -08:00
David Maloney c0c6dc7a18
point to other staging brnaches for gems 
the gem dependencies that have been modified
so far are being pulled in from their staging branches
on github instead of rubygems for this branch
 2016-02-22 11:31:58 -06:00
Metasploit b868f7cc89
Bump version of framework to 4.11.12 2016-02-19 20:19:43 -08:00
wchen-r7 b0cfb4aacf Add info -d to show module documentation in .md 2016-02-16 22:44:03 -06:00
Metasploit 93cc7d58ba
Bump version of framework to 4.11.11 2016-02-12 15:38:50 -08:00
Brent Cook ed5cf821b2 bump payloads to 1.1.0 2016-02-10 23:21:20 -06:00
Brent Cook 27ec6a861c update gemfile.lock 2016-02-10 22:41:41 -06:00
wchen-r7 d5c3fcae04
Land #6511, Bump Jsobfu version to support preserved_identifiers 2016-02-05 15:57:53 -06:00
Metasploit 3c1ada46dd
Bump version of framework to 4.11.10 2016-02-05 13:40:02 -08:00
Adam Cammack 37490a7b6b
Bump metasploit-payloads version 
Fix how Android meterpreter handles the timeout config generated by
android/shell/reverse_tcp.

Change Java meterpreters to return MAC address in `ifconfig` if the
platform supports it.
 2016-02-03 18:16:20 -06:00
Metasploit 7079110964
Bump version of framework to 4.11.9 2016-01-29 10:51:46 -08:00
Gregory Mikeska 3b829e5173
update redcarpet gem to latest version 2016-01-28 14:30:12 -06:00
wchen-r7 2fe40a0e04 Bump jsobfu version to 0.4.1 2016-01-28 11:27:56 -06:00