diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..1339029 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,25 @@ + + +### 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: + +### Affirmation + +- [ ] My code follows the [CONTRIBUTING.md](https://github.com/juice-shop/juice-shop/blob/master/CONTRIBUTING.md) guidelines diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index ef11211..2f313f7 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -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! 🎁' diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index bbe1e21..c0f8217 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -17,7 +17,7 @@ jobs: uses: cirrus-actions/rebase@1.2 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 diff --git a/HALL_OF_FAME.md b/HALL_OF_FAME.md index 569e089..c354466 100644 --- a/HALL_OF_FAME.md +++ b/HALL_OF_FAME.md @@ -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) diff --git a/README.md b/README.md index 13d96e8..b1fd6e0 100644 --- a/README.md +++ b/README.md @@ -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) @@ -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: - + ## 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). diff --git a/images/git-stats.png b/images/git-stats.png index 6188a46..b510c04 100644 Binary files a/images/git-stats.png and b/images/git-stats.png differ