diff --git a/Dockerfile b/Dockerfile index 7ff3be5400a..f1d3a8e27c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ LABEL maintainer="Bjoern Kimminich " \ org.opencontainers.image.vendor="Open Worldwide Application Security Project" \ org.opencontainers.image.documentation="https://help.owasp-juice.shop" \ org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.version="17.1.0" \ + org.opencontainers.image.version="17.1.1" \ org.opencontainers.image.url="https://owasp-juice.shop" \ org.opencontainers.image.source="https://github.com/juice-shop/juice-shop" \ org.opencontainers.image.revision=$VCS_REF \ diff --git a/config/default.yml b/config/default.yml index 5e08e311d93..e71eb138b07 100644 --- a/config/default.yml +++ b/config/default.yml @@ -401,6 +401,17 @@ products: image: lego_case.jpg reviews: - { text: 'Check out the /#/photo-wall for some impressions of the assembly process!', author: bjoernOwasp } + - + name: 'DSOMM & Juice Shop User Day Ticket' + description: 'You are going to the OWASP Global AppSec San Francisco 2024? Get a ticket* for this amazing side event as well! Check the juice-packed agenda here for all the details!

*=scroll down to Elevate: DSOMM and Juice Shop User Day (Sept. 25) after clicking Get Tickets on Eventbrite. Ticket price set to only covers fees for room, AV, and catering throughout the day.' + price: 55.20 + quantity: 47 + limitPerUser: 1 + image: user_day_ticket.png + reviews: + - { text: 'This is *THE* chance to "meet the makers" of both Juice Shop and DSOMM in the United States!', author: bjoernOwasp } + - { text: 'The DSOMM Live Assessment session will even use Juice Shop as its "real-world" example!', author: timo } + - { text: 'We will showcase the amazing MultiJuicer Lego Tower at this event!', author: jannik } memories: - image: 'magn(et)ificent!-1571814229653.jpg' diff --git a/frontend/package.json b/frontend/package.json index 96c933b5ba3..4dc54a16804 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "17.1.0", + "version": "17.1.1", "scripts": { "ng": "ng", "start": "ng serve", diff --git a/frontend/src/assets/public/images/products/user_day_ticket.png b/frontend/src/assets/public/images/products/user_day_ticket.png new file mode 100644 index 00000000000..78d3df3e8ba Binary files /dev/null and b/frontend/src/assets/public/images/products/user_day_ticket.png differ diff --git a/package.json b/package.json index 1ca52e25d8b..c72537a6c33 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "juice-shop", - "version": "17.1.0", + "version": "17.1.1", "private": true, "description": "Probably the most modern and sophisticated insecure web application", "keywords": [