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.

Sign up for GitHub

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

Jump to bottom

Defib challenge badge #1217

Merged
merged 5 commits into from
Apr 20, 2018
Merged

Defib challenge badge #1217

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6cdfb5
Make styfle only appear once
Apr 13, 2018
a3ff538
Add defib badge and description
Apr 13, 2018
3049bde
Merge branch 'master' into defib-challenge
Apr 20, 2018
74ee8c1
Updated users, try to get Snyk to kick over
Apr 20, 2018
80cdd6b
Typo
Apr 20, 2018
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
9 changes: 5 additions & 4 deletions docs/AUTHORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Marked takes an encompassing approach to its community. As such, you can think o

Users are anyone using Marked in some fashion, without them, there's no reason for us to exist.

|Individual or Organization |Website |Project |Submitted by |
|:-------------------------------------------|:--------------------------|:------------------------------------------------|:-----------------------------------------------------------|
|[OpenUserJS](https://github.com/OpenUserJS) |https://openuserjs.org |[OpenUserJS.org](https://github.com/OpenUserJS/OpenUserJS.org) | Marti Martz (@Martii) Co-Owner / Active Maintainer |
|Individual or Organization |Website |GitHub project |Submitted by |
|:--------------------------|:----------------------|:--------------------------------------------------------------|:---------------------------------------------------|
|OpenUserJS |https://openuserjs.org |[OpenUserJS.org](https://github.com/OpenUserJS/OpenUserJS.org) | Marti Martz (@Martii) Co-Owner / Active Maintainer |

To be listed: please let us know or submit a PR.

Expand Down Expand Up @@ -41,7 +41,6 @@ A note on "decision making authority". This is related to submitting PRs and the
|Name |GiHub handle |Decision making |Badges of honor (tag for questions) |
|:--------------|:--------------|:----------------------------------------|------------------------------------|
|Jamie Davis |@davisjam |Seeker of Security | |
|Steven |@styfle |Open source, of course and GitHub Guru | |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove me? Am I not allowed to review PRs?

Copy link
Member Author

@joshbruce joshbruce Apr 13, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course. You were in there twice. Once in the admin section and once in the committer section. They're concentric circles. Publishers == admins == committers == contributors == users. That's why I'm not in the committers table either. :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jamie and Tony aren't admins though. Make sense?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trust me, if it were that big of a shift...it would have been a separate PR. ;)

|Tony Brix |@UziTech |Titan of the test harness and Dr. DevOps | |

**Should not exceed 5:** For larger PRs affecting more of the codebase and, most likely, review by more people, we try to keep this pool small and responsive and let those with decision making authority have final say without negative repercussions from the other committers.
Expand Down Expand Up @@ -148,6 +147,8 @@ Badges? If you *want* 'em, we got 'em, and here's how you get 'em (and…dr
### Special badges that come with the job:

<dl>
<dt>Defibrillator</dt>
<dd>A contributor who stepped up to help bring Marked back to life by contriuting solutions to help Marked pass when compared against the CommonMark and GitHub Flavored Markdown specifications.</dd>
<dt>Maker of the Marked mark</dt>
<dd>This badge is given to the person or oganization credited with creating the logo (or logotype) used in Marked communications for a given period of time. **Maker of the Marked mark from 2017 to present**, for example.</dd>
<dt>Release Wrangler</dt>
Expand Down