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

Fix comments section links rebase workflows #155

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅

You can expedite processing of your PR by using this template to provide context
and additional information. Before actually opening a PR please make sure that it
does NOT fall into any of the following categories

🚫 Spam PRs (accidental or intentional) - these will result in a 7 / 30 / ∞ days ban from
interacting with the project depending on reoccurrence and severity. You can find more
information [here](https://pwning.owasp-juice.shop/companion-guide/latest/part3/contribution.html#_handling_of_spam_prs).

🚫 Lazy typo fixing PRs - if you fix a typo in a file, your PR will only be merged
if all other typos in the same file are also fixed with the same PR

🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->

### Description

<!-- ✍️-->
A clear and concise summary of the change and which issue (if any) it fixes. Should also include relevant motivation and context.

Resolved or fixed issue: <!-- ✍️ Add GitHub issue number in format `#0000` or `none` -->

### Affirmation

- [ ] My code follows the [CONTRIBUTING.md](https://github.com/juice-shop/juice-shop/blob/master/CONTRIBUTING.md) guidelines
2 changes: 1 addition & 1 deletion .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ jobs:
- uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: 'Thanks a lot for opening your first issue with us! 🧡 We''ll get back to you shortly! ⏳ If it was a _Support Request_, please check [our extensive CTF manual](https://pwning.owasp-juice.shop/part1/ctf.html) first. Also, please consider asking on the [community chat](../#troubleshooting-) next time! 💬'
issue-message: 'Thanks a lot for opening your first issue with us! 🧡 We''ll get back to you shortly! ⏳ If it was a _Support Request_, please check [our extensive CTF manual](https://pwning.owasp-juice.shop/companion-guide/latest/part1/ctf.html) first. Also, please consider asking on the [community chat](../#troubleshooting-) next time! 💬'
pr-message: 'Thanks a lot for your contribution! 💖 This seems to be you first PR! 🌠 If it''s getting merged & complies with our [contribution guidelines](../blob/master/CONTRIBUTING.md), you are probably eligible to some free stickers! 🎁'
2 changes: 1 addition & 1 deletion .github/workflows/rebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: cirrus-actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# https://github.community/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250
# https://github.com/orgs/community/discussions/25146#discussioncomment-3246627
always_job:
name: Always run job
runs-on: ubuntu-latest
Expand Down
10 changes: 1 addition & 9 deletions HALL_OF_FAME.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
# Hall of Fame

## Core Team

- [Björn Kimminich](https://github.com/bkimminich) aka `bkimminich`
([Project Leader](https://www.owasp.org/index.php/Projects/Project_Leader_Responsibilities))
[![Keybase PGP](https://img.shields.io/keybase/pgp/bkimminich)](https://keybase.io/bkimminich)
- [Jannik Hollenbach](https://github.com/J12934) aka `J12934`
- [Timo Pagel](https://github.com/wurstbrot) aka `wurstbrot`

## GitHub Contributors

As reported by [`git-stats -a -s '2016'`](https://www.npmjs.com/package/git-stats) analysis
of `master` as of Tue, 5 Oct 2021 after deduplication with `.mailmap`.
of `master` as of Thi, 30 Jan 2025 after deduplication with `.mailmap`.

![Top git contributors](images/git-stats.png)

Expand Down
18 changes: 7 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,16 @@ _On Windows `cmd.exe` you have to use `%cd%` instead of `$(pwd)` to mount your c
---

**For detailed step-by-step instructions and examples please refer to
[the _Hosting a CTF event_ chapter](https://pwning.owasp-juice.shop/part1/ctf.html)
[the _Hosting a CTF event_ chapter](https://pwning.owasp-juice.shop/companion-guide/latest/part1/ctf.html)
in our (free) companion guide ebook.**

## Screenshots

![CTFd challenge overview](https://pwning.owasp-juice.shop/part1/img/ctfd_1.png)
![CTFd challenge overview](https://pwning.owasp-juice.shop/companion-guide/latest/_images/part1/ctfd_1.png)

![FBCTF world map](https://pwning.owasp-juice.shop/part1/img/fbctf_1.png)
![FBCTF world map](https://pwning.owasp-juice.shop/companion-guide/latest/_images/part1/fbctf_1.png)

![RTB challenge boxes](https://pwning.owasp-juice.shop/part1/img/rtb_1.png)
![RTB challenge boxes](https://pwning.owasp-juice.shop/companion-guide/latest/_images/part1/rtb_1.png)

## Troubleshooting [![Gitter](http://img.shields.io/badge/gitter-join%20chat-1dce73.svg)](https://gitter.im/bkimminich/juice-shop)

Expand Down Expand Up @@ -153,18 +153,14 @@ project, please make sure to tick the "Publicly list me as a supporter
of OWASP Juice Shop" checkbox on the donation form. You can find our
more about donations and how they are used here:

<https://pwning.owasp-juice.shop/part3/donations.html>
<https://pwning.owasp-juice.shop/companion-guide/latest/part3/donations.html>

## Contributors

The OWASP Juice Shop core project team are:
The OWASP Juice Shop Project Leaders are:

- [Björn Kimminich](https://github.com/bkimminich) aka `bkimminich`
([Project Leader](https://www.owasp.org/index.php/Projects/Project_Leader_Responsibilities))
[![Keybase PGP](https://img.shields.io/keybase/pgp/bkimminich)](https://keybase.io/bkimminich)
- [Björn Kimminich](https://github.com/bkimminich) aka `bkimminich` [![Keybase PGP](https://img.shields.io/keybase/pgp/bkimminich)](https://keybase.io/bkimminich)
- [Jannik Hollenbach](https://github.com/J12934) aka `J12934`
- [Timo Pagel](https://github.com/wurstbrot) aka `wurstbrot`
- [Shubham Palriwala](https://github.com/ShubhamPalriwala) aka `ShubhamPalriwala`

For a list of all contributors to the OWASP Juice Shop CTF Extension
please visit our [HALL_OF_FAME.md](HALL_OF_FAME.md).
Expand Down
Binary file modified images/git-stats.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.