diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md index 8359c58e3..9c8e0898b 100644 --- a/.github/CODE_OF_CONDUCT.md +++ b/.github/CODE_OF_CONDUCT.md @@ -1,46 +1,3 @@ # Contributor Covenant Code of Conduct -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. - -Project maintainers 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, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at mahmoud@zalt.me. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ +Apiato follows the [Contributor Covenant](https://www.contributor-covenant.org/version/1/4/code-of-conduct) Code of Conduct. diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3eeaf93a3..1c536e269 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,3 +1,3 @@ -### First off all, thank you for taking the time to contribute back :) +# Thank you for your consideration -The full contribution guide is in the project [site](http://docs.apiato.io/miscellaneous/contribution/). +Checkout out our [contribution guide](http://docs.apiato.io/miscellaneous/contribution/). diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000000000..677d0b13a --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,5 @@ +# DO NOT CHANGE THIS FILE PLEASE. + +github: Mahmoudz +open_collective: apiato +custom: ['paypal.me/mzmmzz'] diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 684b483e4..000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,20 +0,0 @@ -## Expected Behavior - - -## Actual Behavior - - -## Steps to Reproduce the Problem - - - 1. - 2. - 3. - -## Specifications - - - - Apiato Version: - -## Additional Details - diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..45a76545e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,21 @@ +--- +name: "Bug report" +about: "Report a general issue. Please ensure your Apiato version is still supported." +--- + +### Description: + + +### Expected Behavior: + + +### Additional Context: + + +### Versions: +- Apiato Version: #.#.# +- PHP Version: #.#.# + +### Steps To Reproduce: +1. Go to '...' +2. Click on '....' diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..5fed7abcd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,8 @@ +blank_issues_enabled: false +contact_links: + - name: Support question + url: http://docs.apiato.io/ + about: 'This repository is only for reporting bugs. If you need help, get in touch with us via Slack.' + - name: Documentation issue + url: https://github.com/apiato/documentation + about: 'For documentation issues, open a pull request at the apiato/documentation repository.' diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..27afd8d96 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,16 @@ +--- +name: "Feature request" +about: "Suggest an idea for this project." +--- + +**Is your feature request related to a problem? Please describe.** + + +**Describe the solution you'd like** + + +**Describe alternatives you've considered** + + +**Additional context** + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 5dd8e1e79..8329f60fd 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,23 +1,19 @@ - + ## Description - -## Motivation and Context - -## How Has This Been Tested? - +## Motivation and Context + -## Types of changes +## Types of Changes -- [] Bug fix (non-breaking change which fixes an issue) -- [] New feature (non-breaking change which adds functionality) -- [] Breaking change (fix or feature that would cause existing functionality to not work as expected) +- [] Bug fix (non-breaking change which fixes an issue). +- [] New feature (non-breaking change which adds functionality). +- [] Breaking change (fix or feature that would cause existing functionality to not work as expected). -## Checklist: +## Definition of Done Checklist: - - [] My code follows the code style and structure of this project. - [] I have updated the documentation accordingly. diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md new file mode 100644 index 000000000..f0bf23702 --- /dev/null +++ b/.github/SUPPORT.md @@ -0,0 +1,5 @@ +# Support Questions + +For free community support visit our slack channel, you can find the link in the docs under [Get in touch with us](http://docs.apiato.io/). + +For paid professional support, you can pick one of our [support packages](http://apiato.io/support.html). diff --git a/README.md b/README.md index 6365c60dd..1a26c0fef 100644 --- a/README.md +++ b/README.md @@ -203,7 +203,7 @@ Apiato exists thanks to all the people who contribute. @shalawani - +
< Join Us >
@@ -223,19 +223,11 @@ Apiato exists thanks to all the people who contribute. Help us sustain the project. -Option 1: Donate directly to [Paypal](https://paypal.me/mzmmzz). - -[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/mzmmzz) - -Option 2: Support us via [Beerpay](https://beerpay.io/apiato/apiato). - -[![Beerpay](https://beerpay.io/apiato/apiato/badge.svg?style=flat)](https://beerpay.io/apiato/apiato) - -Option 3: Become a backer on [Open Collective](https://opencollective.com/apiato#backer). - - - - +Option 1: Donate via [Paypal](https://paypal.me/mzmmzz). +
+Option 2: Become a Sponsor via [Github Sponsors](https://github.com/sponsors/Mahmoudz). +
+Option 3: Become a Sponsor/Backer via [Open Collective](https://opencollective.com/apiato/contribute). ## Sponsors @@ -297,6 +289,59 @@ Your logo will show up on the [github repository](https://github.com/apiato/apia
For more info contact support@apiato.io. + +## Backers + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +