Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring the main branch inline with dev #152

Merged
merged 8 commits into from
Nov 1, 2022
Merged

Bring the main branch inline with dev #152

merged 8 commits into from
Nov 1, 2022

Conversation

5nacks
Copy link
Member

@5nacks 5nacks commented Oct 31, 2022

Minor change to bring the main branch inline with development. Packages for VirtualBox were removed.

lowprivshighhopes and others added 8 commits March 19, 2022 10:20
Co-authored-by: lowprivshighhopes <lowprivshighhopes>
* Vortimo debian package and chrome extenstion bootstrap

* Vortimo debian package and chrome extenstion bootstrap (#128)

Co-authored-by: lowprivshighhopes <lowprivshighhopes>

* Include Vbox dkms

Include Vbox dkms

* Tom dev  (#131)

* added twayback, cleaned up pip3

* added twayback to updater script

* fixed updater to work with other usernames

Co-authored-by: Jason Kregting <23207476+5nacks@users.noreply.github.com>

* New judge guide and contestant guide

New judge guide and contestant guide

* Removed Twint due to not functioning correctly.
Changed Vortimo install to hardcoded link until solution found for variable use

* Update chroot for Vortimo install script fix

Didn't notice this was a heredoc and needed to escape the `$` so that interpolation could properly happen

* Tom dev  (#133)

* added twayback, cleaned up pip3

* added twayback to updater script

* fixed updater to work with other usernames

* removed twint

Co-authored-by: Jason Kregting <23207476+5nacks@users.noreply.github.com>

* fixed dkms (#135)

* +x to update script

* fixed build script for non kali sys

* updated for new branch name

* mod repos to work with non-kali sys

* adding new kali signing key

Co-authored-by: lowprivshighhopes <lowprivshighhopes>
Co-authored-by: lowprivshighhopes <7492877+lowprivshighhopes@users.noreply.github.com>
Co-authored-by: Jason Kregting <23207476+5nacks@users.noreply.github.com>
Co-authored-by: 5nacks <jason.kregting@tracelabs.org>
VirtualBox packages are breaking ISO install.
@humandecoded humandecoded merged commit 912aa9b into dev_ Nov 1, 2022
5nacks added a commit that referenced this pull request Jul 1, 2023
* Bring the main branch inline with dev (#152)

* Vortimo debian package and chrome extenstion bootstrap (#130)

Co-authored-by: lowprivshighhopes <lowprivshighhopes>

* remove incorrect vortimo install

* check requirements after update twayback

* Update kali.list.chroot

VirtualBox packages are breaking ISO install.

Co-authored-by: lowprivshighhopes <7492877+lowprivshighhopes@users.noreply.github.com>
Co-authored-by: Tom <48766856+humandecoded@users.noreply.github.com>
Co-authored-by: Tom <tom@humandecoded.io>

* remove memtest86+ from lb

* fixed updater typo

* changed update twayback

* updated obsidian version

* comment out vbox packages

* added pimeyes bookmark

* updated bookmark export

* updated guides

* remove old guide

---------

Co-authored-by: Jason Kregting <23207476+5nacks@users.noreply.github.com>
Co-authored-by: lowprivshighhopes <7492877+lowprivshighhopes@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants