Skip to content

Commit

Permalink
Reformat all Markdown files
Browse files Browse the repository at this point in the history 
(using default IntelliJ Markdown plugin)
  • Loading branch information
@bkimminich
bkimminich committed Oct 18, 2021
1 parent 209d45b commit 7f73a42
Show file tree
Hide file tree
Showing 6 changed files with 398 additions and 481 deletions.
127 changes: 50 additions & 77 deletions CODE_OF_CONDUCT.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,138 +2,111 @@

## Our Pledge

We as members, contributors, and leaders pledge to make participation in
our community a harassment-free experience for everyone, regardless of
age, body size, visible or invisible disability, ethnicity, sex
characteristics, gender identity and expression, level of experience,
education, socio-economic status, nationality, personal appearance,
race, caste, color, religion, or sexual identity and orientation.
We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for
everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity
and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste,
color, religion, or sexual identity and orientation.

We pledge to act and interact in ways that contribute to an open,
welcoming, diverse, inclusive, and healthy community.
We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:
Examples of behavior that contributes to a positive environment for our community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our
mistakes, and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community
* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
* Focusing on what is best not just for us as individuals, but for the overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political
attacks
* The use of sexualized language or imagery, and sexual attention or advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
* Publishing others' private information, such as a physical or email address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our
standards of acceptable behavior and will take appropriate and fair
corrective action in response to any behavior that they deem
inappropriate, threatening, offensive, or harmful.
Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take
appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other
contributions that are not aligned to this Code of Conduct, and will
communicate reasons for moderation decisions when appropriate.
Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits,
issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for
moderation decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also
applies when an individual is officially representing the community in
public spaces. Examples of representing our community include using an
official e-mail address, posting via an official social media account,
or acting as an appointed representative at an online or offline event.
This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing
the community in public spaces. Examples of representing our community include using an official e-mail address, posting
via an official social media account, or acting as an appointed representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may
be reported to the community leaders responsible for enforcement at
[bjoern.kimminich@owasp.org](mailto:bjoern.kimminich@owasp.org). All
complaints will be reviewed and investigated promptly and fairly.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible
for enforcement at
[bjoern.kimminich@owasp.org](mailto:bjoern.kimminich@owasp.org). All complaints will be reviewed and investigated
promptly and fairly.

All community leaders are obligated to respect the privacy and security
of the reporter of any incident.
All community leaders are obligated to respect the privacy and security of the reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in
determining the consequences for any action they deem in violation of
this Code of Conduct:
Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem
in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior
deemed unprofessional or unwelcome in the community.
**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the
community.

**Consequence**: A private, written warning from community leaders,
providing clarity around the nature of the violation and an explanation
of why the behavior was inappropriate. A public apology may be
requested.
**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation
and an explanation of why the behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series of
actions.
**Community Impact**: A violation through a single incident or series of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, for a specified period of
time. This includes avoiding interactions in community spaces as well as
external channels like social media. Violating these terms may lead to a
**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including
unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding
interactions in community spaces as well as external channels like social media. Violating these terms may lead to a
temporary or permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards,
including sustained inappropriate behavior.
**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No
public or private interaction with the people involved, including
unsolicited interaction with those enforcing the Code of Conduct, is
allowed during this period. Violating these terms may lead to a
permanent ban.
**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified
period of time. No public or private interaction with the people involved, including unsolicited interaction with those
enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of
individuals.
**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate
behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction
within the community.
**Consequence**: A permanent ban from any sort of public interaction within the community.

## Attribution

This Code of Conduct is adapted from the [Contributor
Covenant][homepage], version 2.0, available at
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0, available at
[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder][Mozilla CoC].
Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder][Mozilla CoC].

For answers to common questions about this code of conduct, see the FAQ
at [https://www.contributor-covenant.org/faq][FAQ]. Translations are
available at
at [https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
[https://www.contributor-covenant.org/translations][translations].

[homepage]: https://www.contributor-covenant.org

[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html

[Mozilla CoC]: https://github.com/mozilla/diversity

[FAQ]: https://www.contributor-covenant.org/faq

[translations]: https://www.contributor-covenant.org/translations

49 changes: 40 additions & 9 deletions HALL_OF_FAME.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@

## GitHub Contributors

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

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

## Translators

As exported from
[CrowdIn Top Members Report](https://crowdin.com/project/owasp-juice-shop/reports/top-members)
(by # of translated words) for all languages as of Thu, 16 Sep 2021
after
(by # of translated words) for all languages as of Thu, 16 Sep 2021 after
[conversion into Markdown](https://thisdavej.com/copy-table-in-excel-and-paste-as-a-markdown-table/).

| Name | Languages | Translated |
Expand Down Expand Up @@ -48,19 +47,51 @@ after

**Additional translations by:**

Alexander Nissen (Nissen96),fabrizio1979,OrNol (TRNSRL),Jorge Estigarribia (jorgestiga),Pablo Barrera (pablo.barrera),Coink (CoinkWang),Phakphum Visetnut (phakphum_visetnut),Kamil Vavra (vavkamil),Abdo Farwan (abdofarwan),AviD (avidouglen),Stella Dineva (stella.dineva),Stavros M. (msstavros),Fredrik Bore (Boren),GiorgiSharia,Songrit Kitisriworapan (songritk),Oussama Bouthouri (Boussama),sergio.kubota,Ender Çulha (ecu),Claudio Snidero (cla7997),Marc Rüttler (MarcRler),r0n1am,Davis Freimanis (davisfreimanis),fieldhill13,thinbashane,rToxic,stejkenzie,adeyosemanputra,Kylian Runembert (FunnHydra),Andrew Pio (siranen),Henry Hu (ninedter),zvargun,timexlord,ztzxt,Daniel Paniagua (danielgpm),Mehyar Shammas (mashkuov),asifnm,Estevam Arantes (Es7evam),REMOVED_USER,FoteiniAthina,orjen,vientspam,Allan Kimmer Jensen (Saturate),Idomin Ninja (Idomin),BostonLow,Abdullah alshowaiey (Abdullah201),にのせき (ninoseki),Egert Aia (aiaegert),Nico Ådahl (nigotiator),Lars Grini (lars.grini),Pär Svedberg (grebdevs),rakzcs,Tomas Rosenqvist (Muamaidbengt),Karl (spruur),MrNinhoJr a (mrninhojr),Albert Camps (campsupc),Zenmaster212,jasinski_tomasz,Daan Sprenkels (dsprenkels),Aleksandra Niemyska (niemyskaa),atteism,Diego Andreé Porras Rivas (andree.rivas),mateomartinez,Rasmus Bidstrup (rasmusbidstrup),Koji O (marlboro20light),Bruno Rodrigues (bmvr),Riotaro OKADA (riotaro),talisainen,OliverkeHU,Kitisak Jirawannakool (jkitisak),Bart Decker (Decker),Mohammad Febri Ramadlan (mohammadfebrir),Manu B (Rosina),coavacoffee,bill (Hawxdu),Klas Fahlberg (FahlbergKlas),CarlCampbell,Natalia (notNao),Lenka Dubois (lenkadubois),Syahrol,Mattias Persson (mattiasbpersson),rachidbm,André Santos Duarte Fonseca (Andre_Duarte),cello-anders,Store (HelaBasa),Oussama Bouthouri (oussama.bouthouri),bmoritz,GK (lollipas),landinl,mrudul,Héctor Lecuanda (hlecuanda),Michiya Tominaga (nuwaa),Ilkka Savela (ile2021),Mircea Ulmeanu (boltzmann.gt),Martin Hartl (hartlmartin),Roy Quiceno (rquiceno),Carlos Allendes (OwaspChile),redr0n19,ManuelFranz,Anthony3000,Yang Lucas (Lucas.y),REMOVED_USER,Richardson Lima (contatorichardsonlima),nilfigo,soledad aro (cristinagarciaaro),Katharina Wittkowsky (kwittkowsky),Frederik Bøgeskov Johnsen (cpfbj),kahfiehudson,motofy,Origami,dav1ds,Stefan Daugaard Poulsen (cyberzed),Ezequiel Andino (acidobinario),Isis Harris (latinadeveloper),4ourth (fourth-4),REMOVED_USER,h3nrychoi,Omer Levi Hevroni (omerlh),Sen UENO (uenosen),Mohammad Febri Ramadlan (vebryidiot),alopezhu,Abas Abas (abas70127),Umpawan Halap (umpawanhalap),xsi,Björn Palmqvist (bjornpalmqvist),Fabio Tavano (tavano.fabio),Anders Lindberg (anderslimpan),bahrunghozali,sutanci,PorPor Hai (eung.porhai),pena69,Kevin Eliezer García Peña (kevinel.gp),vikram.tp07
Alexander Nissen (Nissen96), fabrizio1979, OrNol (TRNSRL), Jorge Estigarribia (jorgestiga), Pablo Barrera (
pablo.barrera)
, Coink (CoinkWang), Phakphum Visetnut (phakphum_visetnut), Kamil Vavra (vavkamil), Abdo Farwan (abdofarwan), AviD (
avidouglen), Stella Dineva (stella.dineva), Stavros M. (msstavros), Fredrik Bore (Boren), GiorgiSharia, Songrit
Kitisriworapan (songritk), Oussama Bouthouri (Boussama), sergio.kubota, Ender Çulha (ecu), Claudio Snidero (cla7997),
Marc Rüttler (MarcRler), r0n1am, Davis Freimanis (davisfreimanis)
, fieldhill13, thinbashane, rToxic, stejkenzie, adeyosemanputra, Kylian Runembert (FunnHydra), Andrew Pio (siranen),
Henry Hu (
ninedter), zvargun, timexlord, ztzxt, Daniel Paniagua (danielgpm), Mehyar Shammas (mashkuov), asifnm, Estevam Arantes (
Es7evam)
, REMOVED_USER, FoteiniAthina, orjen, vientspam, Allan Kimmer Jensen (Saturate), Idomin Ninja (Idomin), BostonLow,
Abdullah alshowaiey (Abdullah201), にのせき (ninoseki), Egert Aia (aiaegert), Nico Ådahl (nigotiator), Lars Grini (
lars.grini), Pär Svedberg (grebdevs), rakzcs, Tomas Rosenqvist (Muamaidbengt), Karl (spruur), MrNinhoJr a (mrninhojr),
Albert Camps (campsupc)
, Zenmaster212, jasinski_tomasz, Daan Sprenkels (dsprenkels), Aleksandra Niemyska (niemyskaa), atteism, Diego Andreé
Porras Rivas (andree.rivas), mateomartinez, Rasmus Bidstrup (rasmusbidstrup), Koji O (marlboro20light), Bruno
Rodrigues (bmvr)
, Riotaro OKADA (riotaro), talisainen, OliverkeHU, Kitisak Jirawannakool (jkitisak), Bart Decker (Decker), Mohammad
Febri Ramadlan (mohammadfebrir), Manu B (Rosina), coavacoffee, bill (Hawxdu), Klas Fahlberg (FahlbergKlas),
CarlCampbell, Natalia (
notNao), Lenka Dubois (lenkadubois), Syahrol, Mattias Persson (mattiasbpersson), rachidbm, André Santos Duarte Fonseca (
Andre_Duarte), cello-anders, Store (HelaBasa), Oussama Bouthouri (oussama.bouthouri), bmoritz, GK (lollipas)
, landinl, mrudul, Héctor Lecuanda (hlecuanda), Michiya Tominaga (nuwaa), Ilkka Savela (ile2021), Mircea Ulmeanu (
boltzmann.gt), Martin Hartl (hartlmartin), Roy Quiceno (rquiceno), Carlos Allendes (OwaspChile)
, redr0n19, ManuelFranz, Anthony3000, Yang Lucas (Lucas.y), REMOVED_USER, Richardson Lima (contatorichardsonlima)
, nilfigo, soledad aro (cristinagarciaaro), Katharina Wittkowsky (kwittkowsky), Frederik Bøgeskov Johnsen (cpfbj)
, kahfiehudson, motofy, Origami, dav1ds, Stefan Daugaard Poulsen (cyberzed), Ezequiel Andino (acidobinario), Isis
Harris (
latinadeveloper), 4ourth (fourth-4), REMOVED_USER, h3nrychoi, Omer Levi Hevroni (omerlh), Sen UENO (uenosen), Mohammad
Febri Ramadlan (vebryidiot), alopezhu, Abas Abas (abas70127), Umpawan Halap (umpawanhalap), xsi, Björn Palmqvist (
bjornpalmqvist)
, Fabio Tavano (tavano.fabio), Anders Lindberg (anderslimpan), bahrunghozali, sutanci, PorPor Hai (eung.porhai), pena69,
Kevin Eliezer García Peña (kevinel.gp), vikram.tp07

## Special Thanks

* Inspired by the "classic"
[BodgeIt Store](https://github.com/psiinon/bodgeit) by
[@psiinon](https://github.com/psiinon)
* Revised OWASP Juice Shop and Juice Shop CTF logo artworks by Emily
Gundry (courtesy of [@SecureState](https://github.com/SecureState))
* Revised OWASP Juice Shop and Juice Shop CTF logo artworks by Emily Gundry (courtesy
of [@SecureState](https://github.com/SecureState))
* Wallpaper artworks by Mike Branscum (courtesy of
[@daylightstudio](https://github.com/daylightstudio))
* [Pwning OWASP Juice Shop](https://leanpub.com/juice-shop) cover
artwork by [Patch Kroll](https://99designs.de/profiles/3099878)
* [Pwning OWASP Juice Shop](https://leanpub.com/juice-shop) cover artwork
by [Patch Kroll](https://99designs.de/profiles/3099878)
* [Banner](https://github.com/OWASP/owasp-swag/tree/master/projects/juice-shop/banners)
and
[flyer](https://github.com/OWASP/owasp-swag/tree/master/projects/juice-shop/flyers)
Expand Down
Loading

0 comments on commit 7f73a42

Please sign in to comment.