Commit Graph

3890 Commits

Author SHA1 Message Date
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
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
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
Jack Walker
0857a95a7e Updated README to align with jsdoc version bump compatibility requirements. 2020-06-01 20:40:06 +10:00
dependabot-preview[bot]
a2c354bb3d Bump jsdoc-to-markdown from 5.0.3 to 6.0.1
Bumps [jsdoc-to-markdown](https://github.com/jsdoc2md/jsdoc-to-markdown) from 5.0.3 to 6.0.1.
- [Release notes](https://github.com/jsdoc2md/jsdoc-to-markdown/releases)
- [Commits](https://github.com/jsdoc2md/jsdoc-to-markdown/compare/v5.0.3...v6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-01 07:35:47 +00:00
Jack Walker
0c768ec54b Merge pull request #1920 from beefproject/browserstack
BrowserStack Integration
2020-06-01 09:25:31 +10:00
Jack Walker
753bc36218 Added BrowserStacks log to .gitignore, and re-enabled Wade's email notifications. 2020-05-29 20:31:42 +10:00
Jack Walker
a5e865f75f Removed conditional preventing valid test failures. 2020-05-29 12:09:50 +10:00
Jack Walker
ef5ecf3a5b Parsing browser details blob. 2020-05-28 04:05:45 +10:00
Jack Walker
796b3ada20 debugging 2020-05-28 03:56:34 +10:00
Jack Walker
7c7c56152d Small adjustment to hopefully fix the incorrect data being pulled from the hooked browser info. 2020-05-28 03:41:19 +10:00
Jack Walker
a8115f1635 Debugging 2020-05-28 03:31:25 +10:00
Jack Walker
00f20fd0f0 Potential fix for erroring browser details handler. 2020-05-28 03:24:05 +10:00
Jack Walker
3c97f0302e debugging 2020-05-28 03:15:10 +10:00
Jack Walker
7ae51d2593 Additional debugging 2020-05-28 03:01:03 +10:00
Jack Walker
5d82ddbe74 Added debugging to browser details handler testing. 2020-05-28 02:50:02 +10:00
Jack Walker
dc838ae77c Changed method of retrieving browser details. Hopeful fix. 2020-05-28 02:33:17 +10:00
Jack Walker
4a3deb5b4b Checking if another auth method helps solve browser details issue. 2020-05-28 02:04:23 +10:00
Jack Walker
f33dc7aec0 Forced session identification to be performed client side. Server-side response too flakey atm. Cleaned up code. 2020-05-27 20:07:07 +10:00
Jack Walker
f7e46c5994 Forced session identification to be performed client side. Server-side response too flakey atm. Cleaned up code. 2020-05-27 20:02:05 +10:00
Jack Walker
053c98cc60 Added the stack trace to exception handling for easier debugging. 2020-05-27 19:58:43 +10:00