diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
index 1170b41b5c4a..8a1d8abef7b7 100644
--- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
@@ -12,24 +12,18 @@ body:
- attributes:
label: "Preflight checklist"
options:
- - label:
- "I could not find a solution in the existing issues, docs, nor
+ - label: "I could not find a solution in the existing issues, docs, nor
discussions."
required: true
- - label:
- "I agree to follow this project's [Code of
+ - label: "I agree to follow this project's [Code of
Conduct](https://github.com/ory/kratos/blob/master/CODE_OF_CONDUCT.md)."
required: true
- - label:
- "I have read and am following this repository's [Contribution
+ - label: "I have read and am following this repository's [Contribution
Guidelines](https://github.com/ory/kratos/blob/master/CONTRIBUTING.md)."
required: true
- - label:
- "This issue affects my [Ory Network](https://www.ory.sh/) project."
- - label:
- "I have joined the [Ory Community Slack](https://slack.ory.sh)."
- - label:
- "I am signed up to the [Ory Security Patch
+ - label: "This issue affects my [Ory Network](https://www.ory.sh/) project."
+ - label: "I have joined the [Ory Community Slack](https://slack.ory.sh)."
+ - label: "I am signed up to the [Ory Security Patch
Newsletter](https://ory.us10.list-manage.com/subscribe?u=ffb1a878e4ec6c0ed312a3480&id=f605a41b53)."
id: checklist
type: checkboxes
@@ -56,8 +50,7 @@ body:
validations:
required: true
- attributes:
- description:
- "Please copy and paste any relevant log output. This will be
+ description: "Please copy and paste any relevant log output. This will be
automatically formatted into code, so no need for backticks. Please
redact any sensitive information"
label: "Relevant log output"
diff --git a/.github/ISSUE_TEMPLATE/DESIGN-DOC.yml b/.github/ISSUE_TEMPLATE/DESIGN-DOC.yml
index f817f4164efe..1bfbdbacdae4 100644
--- a/.github/ISSUE_TEMPLATE/DESIGN-DOC.yml
+++ b/.github/ISSUE_TEMPLATE/DESIGN-DOC.yml
@@ -1,8 +1,7 @@
# AUTO-GENERATED, DO NOT EDIT!
# Please edit the original at https://github.com/ory/meta/blob/master/templates/repository/common/.github/ISSUE_TEMPLATE/DESIGN-DOC.yml
-description:
- "A design document is needed for non-trivial changes to the code base."
+description: "A design document is needed for non-trivial changes to the code base."
labels:
- rfc
name: "Design Document"
@@ -23,24 +22,18 @@ body:
- attributes:
label: "Preflight checklist"
options:
- - label:
- "I could not find a solution in the existing issues, docs, nor
+ - label: "I could not find a solution in the existing issues, docs, nor
discussions."
required: true
- - label:
- "I agree to follow this project's [Code of
+ - label: "I agree to follow this project's [Code of
Conduct](https://github.com/ory/kratos/blob/master/CODE_OF_CONDUCT.md)."
required: true
- - label:
- "I have read and am following this repository's [Contribution
+ - label: "I have read and am following this repository's [Contribution
Guidelines](https://github.com/ory/kratos/blob/master/CONTRIBUTING.md)."
required: true
- - label:
- "This issue affects my [Ory Network](https://www.ory.sh/) project."
- - label:
- "I have joined the [Ory Community Slack](https://slack.ory.sh)."
- - label:
- "I am signed up to the [Ory Security Patch
+ - label: "This issue affects my [Ory Network](https://www.ory.sh/) project."
+ - label: "I have joined the [Ory Community Slack](https://slack.ory.sh)."
+ - label: "I am signed up to the [Ory Security Patch
Newsletter](https://ory.us10.list-manage.com/subscribe?u=ffb1a878e4ec6c0ed312a3480&id=f605a41b53)."
id: checklist
type: checkboxes
diff --git a/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
index 0c3112cfc7d6..4f2349ab8a58 100644
--- a/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
+++ b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
@@ -1,8 +1,7 @@
# AUTO-GENERATED, DO NOT EDIT!
# Please edit the original at https://github.com/ory/meta/blob/master/templates/repository/common/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
-description:
- "Suggest an idea for this project without a plan for implementation"
+description: "Suggest an idea for this project without a plan for implementation"
labels:
- feat
name: "Feature Request"
@@ -16,30 +15,23 @@ body:
- attributes:
label: "Preflight checklist"
options:
- - label:
- "I could not find a solution in the existing issues, docs, nor
+ - label: "I could not find a solution in the existing issues, docs, nor
discussions."
required: true
- - label:
- "I agree to follow this project's [Code of
+ - label: "I agree to follow this project's [Code of
Conduct](https://github.com/ory/kratos/blob/master/CODE_OF_CONDUCT.md)."
required: true
- - label:
- "I have read and am following this repository's [Contribution
+ - label: "I have read and am following this repository's [Contribution
Guidelines](https://github.com/ory/kratos/blob/master/CONTRIBUTING.md)."
required: true
- - label:
- "This issue affects my [Ory Network](https://www.ory.sh/) project."
- - label:
- "I have joined the [Ory Community Slack](https://slack.ory.sh)."
- - label:
- "I am signed up to the [Ory Security Patch
+ - label: "This issue affects my [Ory Network](https://www.ory.sh/) project."
+ - label: "I have joined the [Ory Community Slack](https://slack.ory.sh)."
+ - label: "I am signed up to the [Ory Security Patch
Newsletter](https://ory.us10.list-manage.com/subscribe?u=ffb1a878e4ec6c0ed312a3480&id=f605a41b53)."
id: checklist
type: checkboxes
- attributes:
- description:
- "Is your feature request related to a problem? Please describe."
+ description: "Is your feature request related to a problem? Please describe."
label: "Describe your problem"
placeholder:
"A clear and concise description of what the problem is. Ex. I'm always
@@ -73,8 +65,7 @@ body:
validations:
required: true
- attributes:
- description:
- "Add any other context or screenshots about the feature request here."
+ description: "Add any other context or screenshots about the feature request here."
label: Additional Context
id: additional
type: textarea
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index abb0b696c9d9..ef4c482ae405 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -5,10 +5,8 @@ blank_issues_enabled: false
contact_links:
- name: Ory Kratos Forum
url: https://github.com/ory/kratos/discussions
- about:
- Please ask and answer questions here, show your implementations and
+ about: Please ask and answer questions here, show your implementations and
discuss ideas.
- name: Ory Chat
url: https://www.ory.sh/chat
- about:
- Hang out with other Ory community members to ask and answer questions.
+ about: Hang out with other Ory community members to ask and answer questions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 4861c9d1844a..9cebaf358e33 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -39,6 +39,16 @@ Examples of unacceptable behavior include:
- Other conduct which could reasonably be considered inappropriate in a
professional setting
+## Open Source Community Support
+
+Ory Open source software is collaborative and based on contributions by
+developers in the Ory community. There is no obligation from Ory to help with
+individual problems. If Ory open source software is used in production in a
+for-profit company or enterprise environment, we mandate a paid support contract
+where Ory is obligated under their service level agreements (SLAs) to offer a
+defined level of availability and responsibility. For more information about
+paid support please contact us at sales@ory.sh.
+
## Enforcement Responsibilities
Community leaders are responsible for clarifying and enforcing our standards of
diff --git a/README.md b/README.md
index 0382c90f7ff2..5245196408d2 100644
--- a/README.md
+++ b/README.md
@@ -58,9 +58,13 @@ today!
## Ory Network Hybrid Support Plan
-Ory offers a support plan for Ory Network Hybrid, including Ory on private cloud deployments. If you have a self-hosted solution and would like help, consider a support plan!
-The team at Ory has years of experience in cloud computing. Ory's offering is the only official program for qualified support from the maintainers.
-For more information see the **[website](https://www.ory.sh/support/)** or **[book a meeting](https://www.ory.sh/contact/)**!
+Ory offers a support plan for Ory Network Hybrid, including Ory on private cloud
+deployments. If you have a self-hosted solution and would like help, consider a
+support plan!
+The team at Ory has years of experience in cloud computing. Ory's offering is
+the only official program for qualified support from the maintainers.
+For more information see the **[website](https://www.ory.sh/support/)** or
+**[book a meeting](https://www.ory.sh/contact/)**!
### Quickstart
@@ -152,16 +156,17 @@ products.
The Ory community stands on the shoulders of individuals, companies, and
-maintainers. We thank everyone involved - from submitting bug reports and
-feature requests, to contributing patches, to sponsoring our work. Our community
-is 1000+ strong and growing rapidly. The Ory stack protects 16.000.000.000+ API
-requests every month with over 250.000+ active service nodes. We would have
-never been able to achieve this without each and everyone of you!
+maintainers. The Ory team thanks everyone involved - from submitting bug reports
+and feature requests, to contributing patches and documentation. The Ory
+community counts more than 33.000 members and is growing rapidly. The Ory stack
+protects 60.000.000.000+ API requests every month with over 400.000+ active
+service nodes. None of this would have been possible without each and everyone
+of you!
The following list represents companies that have accompanied us along the way
and that have made outstanding contributions to our ecosystem. _If you think
that your company deserves a spot here, reach out to
-office-muc@ory.sh now_!
+office@ory.sh now_!
@@ -174,7 +179,7 @@ that your company deserves a spot here, reach out to
-
Sponsor
+
Adopter *
Raspberry PI Foundation
@@ -185,7 +190,7 @@ that your company deserves a spot here, reach out to
-We also want to thank all individual contributors
+Many thanks to all individual contributors
-as well as all of our backers
-
-
-
-and past & current supporters (in alphabetical order) on
-[Patreon](https://www.patreon.com/_ory): Alexander Alimovs, Billy, Chancy
-Kennedy, Drozzy, Edwin Trejos, Howard Edidin, Ken Adler Oz Haven, Stefan Hans,
-TheCrealm.
-
\* Uses one of Ory's major projects in production.
+ 
+ 
-as well as all of our backers
-
-
-
-and past & current supporters (in alphabetical order) on
-[Patreon](https://www.patreon.com/_ory): Alexander Alimovs, Billy, Chancy
-Kennedy, Drozzy, Edwin Trejos, Howard Edidin, Ken Adler Oz Haven, Stefan Hans,
-TheCrealm.
-
\* Uses one of Ory's major projects in production.