app
Revert "Various merge resolutions from master <- staging"
2014-08-22 10:17:44 -05:00
config
Revert "Various merge resolutions from master <- staging"
2014-08-22 10:17:44 -05:00
data
Merge branch staging/electro-release into master
2014-08-22 10:50:38 -05:00
db
Revert "Various merge resolutions from master <- staging"
2014-08-22 10:17:44 -05:00
documentation
Merge remote-tracking branch 'metasploit-framework/master' into masked-cred-format-update
2014-03-19 15:47:46 -05:00
external
Fix the makefile to use the right directory
2014-08-03 13:38:15 -05:00
lib
Land 3694, msfconsole.rc wasn't loading, add yard
2014-08-26 01:12:33 -05:00
modules
Update name to mention DC; correct servlet name
2014-08-26 12:39:48 +01:00
plugins
Land #3588 , @tobd-r7's Fix SpaceBeforeModifierKeyword Rubocop warning
2014-08-04 14:25:03 -07:00
script
Revert "Various merge resolutions from master <- staging"
2014-08-22 10:17:44 -05:00
scripts
Fix SpaceBeforeModifierKeyword Rubocop warning
2014-07-29 17:10:54 -05:00
spec
undo be_false case
2014-08-25 23:58:08 -05:00
test
Merge branch staging/electro-release into master
2014-08-22 10:50:38 -05:00
tools
Remove rubocop and msftidy touchpoints
2014-08-12 10:37:58 -05:00
.gitignore
Revert "Various merge resolutions from master <- staging"
2014-08-22 10:17:44 -05:00
.gitmodules
Add RDI submodule, port Kitrap0d
2013-11-27 16:04:41 +10:00
.mailmap
Add @trosen-r7's alias for commits
2014-06-05 10:40:38 -05:00
.rspec
Use Fivemat formatting for rspec
2013-10-08 12:50:28 -05:00
.rubocop.yml
Merge branch staging/electro-release into master
2014-08-22 10:50:38 -05:00
.ruby-gemset
Remove gitignore, change to metasploit-framework
2013-09-13 12:44:19 -05:00
.ruby-version
Bump to p547 to fix a regression in p545
2014-05-30 14:27:54 -05:00
.simplecov
Better Rubymine compatibility for .simplecov
2013-01-18 11:12:16 -06:00
.travis.yml
Travis shouldn't autofail msftidy fails... yet
2014-04-08 14:05:42 -05:00
.yardopts
Revert "Various merge resolutions from master <- staging"
2014-08-22 10:17:44 -05:00
CONTRIBUTING.md
Be more forceful about Rubocop in CONTRIBUTING.md
2014-08-14 11:51:44 -05:00
COPYING
Rapid7 Comma Inc
2014-03-13 09:46:20 -05:00
Gemfile
Revert "Various merge resolutions from master <- staging"
2014-08-22 10:17:44 -05:00
Gemfile.local.example
Revert "Various merge resolutions from master <- staging"
2014-08-22 10:17:44 -05:00
Gemfile.lock
Land #3676 , updated Meterpreter bins!
2014-08-22 14:33:27 -05:00
HACKING
Update link for The Metasploit Development Environment
2014-07-15 10:16:47 -05:00
LICENSE
Add IE11SandboxEscapes source
2014-05-29 11:38:43 -05:00
metasploit-framework.gemspec
Revert "Various merge resolutions from master <- staging"
2014-08-22 10:17:44 -05:00
msfbinscan
Modify msfbinscan help
2013-12-30 12:23:47 -06:00
msfcli
Adds ability to load post modules in msfcli
2013-12-19 11:53:40 -06:00
msfconsole
Merge branch staging/electro-release into master
2014-08-22 10:50:38 -05:00
msfd
Retab all the things (except external/)
2013-09-30 13:47:53 -05:00
msfelfscan
Add disasm option to msfelfscan
2013-12-26 16:26:45 -02:00
msfencode
Remove a couple more instances of "shit"
2014-03-04 15:00:48 -06:00
msfmachscan
Retab all the things (except external/)
2013-09-30 13:47:53 -05:00
msfpayload
That one, too.
2014-03-04 14:38:25 -06:00
msfpescan
Retab all the things (except external/)
2013-09-30 13:47:53 -05:00
msfrop
Retab all the things (except external/)
2013-09-30 13:47:53 -05:00
msfrpc
Retab all the things (except external/)
2013-09-30 13:47:53 -05:00
msfrpcd
Retab all the things (except external/)
2013-09-30 13:47:53 -05:00
msfupdate
Always use maybe_wait_and_exit in msfupdate
2013-11-15 17:26:21 -06:00
msfvenom
fix typo in msfvenom
2014-03-31 14:55:59 -05:00
Rakefile
Revert "Various merge resolutions from master <- staging"
2014-08-22 10:17:44 -05:00
README.md
Encourage use of the installer for users.
2014-04-11 15:55:18 -05:00