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.

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

Code of conduct #6129

Merged
merged 17 commits into from
Jan 18, 2018
Merged

Code of conduct #6129

merged 17 commits into from
Jan 18, 2018

Conversation

hanbollar
Copy link

Fixes #5897 for cesium repo

@cesium-concierge
Copy link

Signed CLA is on file.

@hanbollar, thanks for the pull request! Maintainers, we have a signed CLA from @hanbollar, so you can review this at any time.


I am a bot who helps you make Cesium awesome! Contributions to my configuration are welcome.

🌍 🌎 🌏

@ggetz
Copy link
Contributor

ggetz commented Jan 18, 2018

The GitHub instructions call for the file to be named CODE_OF_CONDUCT.md, is there a reason we went with no underscores?

@hanbollar
Copy link
Author

@ggetz Woops didn't see the additional link down below. Thanks for the catch! Updated to match this.

@ggetz
Copy link
Contributor

ggetz commented Jan 18, 2018

Thanks @hanbollar! In the CONTRIBUTING.md file, update the links to be relative urls. Also merge in master.

@ggetz
Copy link
Contributor

ggetz commented Jan 18, 2018

@hanbollar Make sure you have merged in the latest upstream Cesium changes as well, there are still conflicts.

CONTRIBUTING.md Outdated
One of Cesium's strengths is our community. Our contributors and users are pushing the 3D geospatial field to amazing new levels. We rely on an open, friendly, inclusive environment to facilitate this. As such, we follow the [Contributor Covenant](http://contributor-covenant.org/)'s [Code of Conduct](http://contributor-covenant.org/version/1/4/code_of_conduct.md) to ensure a harassment-free experience in the Cesium community. Any unacceptable behavior can be confidentially sent to the core team at [email protected].

This applies to the main Cesium repo, forum, twitter, and all channels, including all repos in the [AnalyticalGraphicsInc](https://github.com/AnalyticalGraphicsInc) GitHub organization.
Cesium's Code of Conduct is [here](./CODE_OF_CONDUCT.md).
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we make this a duplicate of the To ensure an inclusive community, contributors and users in the Cesium community should follow the [code of conduct] line? It just reads better.

Copy link
Author

Choose a reason for hiding this comment

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

@ggetz I'll work on doing that.

@hanbollar
Copy link
Author

@ggetz updated to include cesium's changes merged with my changes

@ggetz
Copy link
Contributor

ggetz commented Jan 18, 2018

Thanks @hanbollar!

@ggetz ggetz merged commit 84c2a8b into CesiumGS:master Jan 18, 2018
@pjcozzi
Copy link
Contributor

pjcozzi commented Jan 18, 2018

Amazing:

image

https://github.com/AnalyticalGraphicsInc/cesium/community

@hanbollar hanbollar deleted the code-of-conduct branch February 2, 2018 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants