From 42631933baed00666640d616de69bf67f26d064c Mon Sep 17 00:00:00 2001 From: Jim Cummins Date: Fri, 23 Oct 2015 10:31:19 -0500 Subject: [PATCH 1/2] docs(readme): Remove references to Angular --- README.md | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 454e2bb..1c12ebc 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,8 @@ -# Angular Contributor Code of Conduct +# Commitizen Contributor Code of Conduct -See [CODE_OF_CONDUCT.md](https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md). +See [CODE_OF_CONDUCT.md](https://github.com/commitizen/code-of-conduct/blob/master/CODE_OF_CONDUCT.md). -This code of conduct applies to all of the projects under the [Angular organization on GitHub](https://github.com/orgs/angular/) and the Angular community at large (IRC, mailing lists, Google+, Twitter, etc.). - -See the [contributing guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md) and the [tutorial on building angular](http://docs.angularjs.org/misc/contribute) for technical details of contributing to AngularJS or its satellite projects. - - -## Events - -If you are running an Angular meetup, conference, user group, or other type of event, we encourage you to adopt and provide an appropriate code of conduct. -The [confcodeofconduct.com](http://confcodeofconduct.com/) template is a good starting point. -You should also provide contact information for atttendees to get help or report a violation. +This code of conduct applies to all of the projects under the [Commitizen organization on GitHub](https://github.com/orgs/commitizen/) and the Commitizen community at large (IRC, mailing lists, Google+, Twitter, etc.). For more on adopting a code of conduct, see [Ashe Dryden's FAQ](http://ashedryden.com/blog/codes-of-conduct-101-faq). From 9c1f0bde18f9904d9be8befca8c4619894c7f5eb Mon Sep 17 00:00:00 2001 From: Jim Cummins Date: Fri, 23 Oct 2015 10:33:17 -0500 Subject: [PATCH 2/2] docs(code-of-conduct): Remove references to Angular --- CODE_OF_CONDUCT.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index b35d21e..b9b0ba0 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,12 +1,11 @@ # Contributor Code of Conduct -## Version 0.3a-angular -As contributors and maintainers of the Angular project, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities. +As contributors and maintainers of the Commitizen project, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities. -Communication through any of Angular's channels (GitHub, IRC, mailing lists, Google+, Twitter, etc.) must be constructive and never resort to personal attacks, trolling, public or private harrassment, insults, or other unprofessional conduct. +Communication through any of Commitizen's channels (GitHub, IRC, mailing lists, Google+, Twitter, etc.) must be constructive and never resort to personal attacks, trolling, public or private harrassment, insults, or other unprofessional conduct. -We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the Angular project to do the same. +We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the Commitizen project to do the same. -If any member of the community violates this code of conduct, the maintainers of the Angular project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate. +If any member of the community violates this code of conduct, the maintainers of the Commitizen project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate. -If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at [conduct@angularjs.org](mailto:coc@angularjs.org). +If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at [jimthedev@gmail.com](mailto:jimthedev@gmail.com).