Commit Graph

3908 Commits

Author SHA1 Message Date
jcrew99
8ee08bdbda Merge pull request #2042 from beefproject/copyright_update
updated all of the copyright information
2021-01-11 04:56:00 +10:00
J
4ec6ecee27 updated all of the copyright information 2021-01-11 04:48:56 +10:00
jcrew99
49478370d8 Merge pull request #1973 from beefproject/excluded_hooking_subnet
Excluded hooking subnet
2020-10-25 20:20:30 +10:00
bcoles
f1f5198ba1 Merge pull request #1993 from beefproject/dependabot/bundler/rubocop-tw-0.92.0
Update rubocop requirement from ~> 0.88.0 to ~> 0.92.0
2020-09-29 08:10:00 +10:00
dependabot-preview[bot]
dd0c8aa850 Update rubocop requirement from ~> 0.88.0 to ~> 0.92.0
Updates the requirements on [rubocop](https://github.com/rubocop-hq/rubocop) to permit the latest version.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.88.0...v0.92.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-28 06:09:46 +00:00
jcrew99
9ddd694842 Merge pull request #1986 from beefproject/rubocop_mergev0.0.1
Rubocop mergev0.0.1
2020-09-14 18:54:26 +10:00
jcrew99
a7c4b3215a Merge pull request #1984 from beefproject/internal_error_when_creating_XSSrays
First fix for the XSSRays
2020-09-14 18:54:05 +10:00
Josh
360d6bb345 Merge branch 'internal_error_when_creating_XSSrays' of https://github.com/beefproject/beef into internal_error_when_creating_XSSrays
lets update
2020-09-14 00:55:26 -07:00
Jish
dd6c8283cd updated rubocop changes 2020-08-03 08:23:05 -04:00
Jish
a5603eafde added to gemfile 2020-08-03 07:24:30 -04:00
Jish
38b0e44115 added a .first section 2020-08-03 00:41:19 -04:00
jcrew99
8876f69ba6 Merge pull request #1975 from klezVirus/master
Fix country_code is null
2020-08-03 13:33:32 +10:00
bcoles
36bd907f99 Merge pull request #1982 from sopsmattw/patch-1
iFrame Sniffer module: Update config.yaml reference URL
2020-08-01 03:40:19 +10:00
Matt Wagenknecht
72870deea6 Update config.yaml
updated URL from contextis.co.uk to contextis.com.
2020-07-31 11:31:50 -06:00
jcrew99
fc9b11e658 Merge pull request #1977 from beefproject/updated_contributing
Updated contributing
2020-07-27 23:06:58 +10:00
Josh
fbafdae50a fixed and responded to comments 2020-07-26 22:16:00 -07:00
Josh
b9c5ee73fb Merge branch 'updated_contributing' of https://github.com/beefproject/beef 2020-07-26 21:13:11 -07:00
jcrew99
1aa8a6aec6 Merge branch 'master' into updated_contributing 2020-07-25 23:29:30 +10:00
Joshua
381cbec8a9 updated contributing to further match how to merge 2020-07-25 23:19:45 +10:00
josh
9a8108e0f5 updated contribution 2020-07-25 22:21:38 +10:00
d3adc0de
3a0178bedc Fix country_code is null 2020-07-23 22:13:20 +01:00
josh
064fb5fdb2 Merge branch 'updated_contributing' of https://github.com/beefproject/beef into updated_contributing
matching
2020-07-24 01:57:18 +10:00
Jack Walker
09bcb5b704 Updated variable naming for clarity of functional use 2020-07-21 12:03:36 +10:00
Jack Walker
dbd20a742e Added icamys changes, inverting the logic for the found variable. 2020-07-21 11:22:47 +10:00
Jack Walker
0c07a5f853 Merge pull request #1962 from beefproject/fix_broken_network_extension
Fix #1852 - Re-patch of reverted Network Map/Hosts/Services fix
2020-07-21 11:02:53 +10:00
Jack Walker
967bcf4069 Merge pull request #1961 from beefproject/bcoles-patch-1
Update dependencies
2020-07-21 11:01:24 +10:00
Josh
9a7a36a3ce Merge branch 'updated_contributing' of https://github.com/beefproject/beef 2020-07-15 21:32:36 -07:00
bcoles
f3313fde8a core/main/client/browser.js: Fix array unique function (#1966) 2020-07-10 14:29:13 +10:00
jcrew99
7fa269ff81 Merge pull request #1957 from beefproject/are_new_execution_error
ARE New Zombie Execution Error
2020-07-09 10:26:59 +10:00
jcrew99
b0c0e6e2ba Merge pull request #1956 from beefproject/pretty_theft_empty_credentials_error
Pretty Theft Missing Credentials JS Error
2020-07-09 10:24:48 +10:00
bcoles
b8528e5df5 Update dependencies 2020-07-08 20:35:06 +10:00
Jack Walker
7169d84b88 Merge pull request #1934 from beefproject/update_issue_template
Update Issue/PR templates
2020-07-08 16:17:50 +10:00
jcrew99
36263fa3a5 Merge pull request #1958 from beefproject/replace_array_prototype_unique
Replaced Array.prototype.unique with a cleaner jQuery equivalent
2020-07-07 22:13:24 +10:00
Jack Walker
dd3b635a48 Re-commiting h4sh5's reverted changes. 2020-07-07 14:47:05 +10:00
Jack Walker
edda0188d5 Removed typo (trailing a) missed in last commit 2020-07-06 16:46:58 +10:00
Jack Walker
4fc300ff87 Replaced Array.prototype.unique with a cleaner jQuery equivalent 2020-07-06 16:24:09 +10:00
Jack Walker
8e0a1b6b87 Removed rule left in ARE enabled directory 2020-07-06 14:40:01 +10:00
Jack Walker
9696b05aba Fixed error causing some ARE rules to not run. 2020-07-06 14:39:04 +10:00
Jack Walker
a8606697e0 Reset creds 2020-07-06 12:44:43 +10:00
Jack Walker
a92d4d910c Fixed getElementById method being called on incorrect object causing looping failure. 2020-07-06 12:44:19 +10:00
Jack Walker
c8dc77bea8 Removed some redundant text at the bottom of the issue template discussing debugging. 2020-07-06 12:02:28 +10:00
Jack Walker
09cc1ee50d Forgot to save -.- Re-commit of last commit. 2020-07-06 11:53:35 +10:00
Jack Walker
46ef842bcf Added additional steps to retrieve debugging output as per BColes advice 2020-07-06 11:51:46 +10:00
jcrew99
9458bd8fc6 Merge pull request #1940 from beefproject/issue-1911_ruby_version_check
sudo for gem install, ruby package manager check
2020-07-05 18:19:53 +10:00
Joshua
3b82ba16dd updated contributing to further match how to merge 2020-07-02 13:33:18 +10:00
isaac powell
bf1be0fc16 sudo for gem install, ruby package manager check 2020-06-08 21:58:49 -04:00
Jack Walker
9d3206b226 Merge pull request #1933 from beefproject/dependabot/npm_and_yarn/jsdoc-to-markdown-6.0.1
Bump jsdoc-to-markdown from 5.0.3 to 6.0.1
2020-06-04 08:57:01 +10:00
Jack Walker
c86bde43d6 Updated PR template 2020-06-01 21:23:52 +10:00
Jack Walker
58e690d304 Updated issue template 2020-06-01 21:04:35 +10:00
Jack Walker
bc77749236 Removed leftover local.log file from last PR. Shouldn't appear again (in .gitignore). 2020-06-01 20:43:43 +10:00