Skip to content

Commit 33928c0

Browse files
bkimminichbkimminich
committed
Merge branch 'master' into develop
# Conflicts: # package.json
2 parents bd0ca13 + 6d10ed1 commit 33928c0

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ information [here](https://pwning.owasp-juice.shop/companion-guide/latest/part3/
1111
🚫 Lazy typo fixing PRs - if you fix a typo in a file, your PR will only be merged
1212
if all other typos in the same file are also fixed with the same PR
1313
14+
🚫 If you fail to provide any _Description_ below, your PR will be considered spam.
15+
If you do not check the _Affirmation_ box below, your PR will not be merged.
16+
1417
🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
1518

1619
### Description

‎HALL_OF_FAME.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## GitHub Contributors
44

5-
As reported by [`git-stats -a -s '2014'`](https://www.npmjs.com/package/git-stats) analysis of `master` as of Tue, 22 Apr
5+
As reported by [`git-stats -a -s '2014'`](https://www.npmjs.com/package/git-stats) analysis of `master` as of Tue, 02 Sep
66
2025 after deduplication with `.mailmap`.
77

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

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ Feel free to have a look at the latest version of OWASP Juice Shop:
126126

127127
### Node.js version compatibility
128128

129-
![GitHub package.json dynamic](https://img.shields.io/github/package-json/cpu/bkimminich/juice-shop)
130-
![GitHub package.json dynamic](https://img.shields.io/github/package-json/os/bkimminich/juice-shop)
129+
![GitHub package.json dynamic](https://img.shields.io/github/package-json/cpu/juice-shop/juice-shop)
130+
![GitHub package.json dynamic](https://img.shields.io/github/package-json/os/juice-shop/juice-shop)
131131

132132
OWASP Juice Shop officially supports the following versions of
133133
[node.js](http://nodejs.org) in line with the official
@@ -181,11 +181,11 @@ and is available **for free** in PDF, Kindle and ePub format on LeanPub. You can
181181

182182
## Contributing
183183

184-
[![GitHub contributors](https://img.shields.io/github/contributors/bkimminich/juice-shop.svg)](https://github.com/juice-shop/juice-shop/graphs/contributors)
184+
[![GitHub contributors](https://img.shields.io/github/contributors/juice-shop/juice-shop.svg)](https://github.com/juice-shop/juice-shop/graphs/contributors)
185185
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
186186
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/owasp-juice-shop/localized.svg)](https://crowdin.com/project/owasp-juice-shop)
187-
![GitHub issues by-label](https://img.shields.io/github/issues/bkimminich/juice-shop/help%20wanted.svg)
188-
![GitHub issues by-label](https://img.shields.io/github/issues/bkimminich/juice-shop/good%20first%20issue.svg)
187+
![GitHub issues by-label](https://img.shields.io/github/issues/juice-shop/juice-shop/help%20wanted.svg)
188+
![GitHub issues by-label](https://img.shields.io/github/issues/juice-shop/juice-shop/good%20first%20issue.svg)
189189

190190
We are always happy to get new contributors on board! Please check
191191
[CONTRIBUTING.md](CONTRIBUTING.md) to learn how to
@@ -232,10 +232,10 @@ For a list of all contributors to the OWASP Juice Shop please visit our
232232

233233
## Licensing
234234

235-
[![license](https://img.shields.io/github/license/bkimminich/juice-shop.svg)](LICENSE)
235+
[![license](https://img.shields.io/github/license/juice-shop/juice-shop.svg)](LICENSE)
236236

237237
This program is free software: you can redistribute it and/or modify it under the terms of the [MIT license](LICENSE).
238238
OWASP Juice Shop and any contributions are Copyright © by Bjoern Kimminich & the OWASP Juice Shop contributors
239239
2014-2025.
240240

241-
![Juice Shop Logo](https://raw.githubusercontent.com/bkimminich/juice-shop/master/frontend/src/assets/public/images/JuiceShop_Logo_400px.png)
241+
![Juice Shop Logo](https://raw.githubusercontent.com/juice-shop/juice-shop/master/frontend/src/assets/public/images/JuiceShop_Logo_400px.png)

‎REFERENCES.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ mentioned or used!
2121
* [Summits & Open Source Events](#summits--open-source-events)
2222
+ [Google Summer of Code](#googlesummerofcode)
2323
* [Conference and Meetup Appearances](#conference-and-meetup-appearances)
24+
- [2025](#2025)
2425
- [2024](#2024)
2526
- [2023](#2023)
2627
- [2022](#2022)
@@ -316,8 +317,10 @@ mentioned or used!
316317
317318
#### 2025
318319

319-
* :date: [OWASP Juice Shop Demo: Your vitamin shot for security awareness & education](https://owasp2025globalappseceu.sched.com/event/1yOPV/owasp-juice-shop-demo-your-vitamin-shot-for-security-awareness-education) with Björn Kimminich, [OWASP Global AppSec EU 2025, Barcelona](https://owasp.glueup.com/event/owasp-global-appsec-eu-2025-123983), 29.05.2025
320-
* :date: [OWASP Juice Shop Demo: Your vitamin shot for security awareness & education](https://owasp2025globalappseceu.sched.com/event/1yPXh/owasp-juice-shop-demo-your-vitamin-shot-for-security-awareness-education) with Björn Kimminich, [OWASP Global AppSec EU 2025, Barcelona](https://owasp.glueup.com/event/owasp-global-appsec-eu-2025-123983), 30.05.2025
320+
* :date: [OWASP Juice Shop Workshop](https://www.meetup.com/it-security-kassel/events/306942921)
321+
with Björn Kimminich, [93. IT-Security-Meetup Kassel](https://www.meetup.com/it-security-kassel/), 10.09.2025
322+
* [OWASP Juice Shop Demo: Your vitamin shot for security awareness & education](https://owasp2025globalappseceu.sched.com/event/1yOPV/owasp-juice-shop-demo-your-vitamin-shot-for-security-awareness-education) with Björn Kimminich, [OWASP Global AppSec EU 2025, Barcelona](https://owasp.glueup.com/event/owasp-global-appsec-eu-2025-123983), 29.05.2025
323+
* [OWASP Juice Shop Demo: Your vitamin shot for security awareness & education](https://owasp2025globalappseceu.sched.com/event/1yPXh/owasp-juice-shop-demo-your-vitamin-shot-for-security-awareness-education) with Björn Kimminich, [OWASP Global AppSec EU 2025, Barcelona](https://owasp.glueup.com/event/owasp-global-appsec-eu-2025-123983), 30.05.2025
321324

322325
#### 2024
323326

‎ftp/package.json.bak‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@
116116
},
117117
"repository": {
118118
"type": "git",
119-
"url": "https://github.com/bkimminich/juice-shop.git"
119+
"url": "https://github.com/juice-shop/juice-shop.git"
120120
},
121121
"bugs": {
122-
"url": "https://github.com/bkimminich/juice-shop/issues"
122+
"url": "https://github.com/juice-shop/juice-shop/issues"
123123
},
124124
"license": "MIT",
125125
"scripts": {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
"js-yaml": "^3.14.0",
157157
"jsonwebtoken": "0.4.0",
158158
"jssha": "^3.3.1",
159-
"juicy-chat-bot": "~0.9.0",
159+
"juicy-chat-bot": "~0.8.0",
160160
"libxmljs2": "~0.37.0",
161161
"marsdb": "^0.6.11",
162162
"median": "^0.0.2",

‎screenshots/git-stats.png‎

944 Bytes
Loading

0 commit comments

Comments
 (0)