Skip to content

Commit

Permalink
Merge pull request #7971 from AnalyticalGraphicsInc/new-cla
Browse files Browse the repository at this point in the history
Update CLA instructions
  • Loading branch information
Omar Shehata authored Jul 3, 2019
2 parents 32fc04d + 867f0a7 commit fbc4a02
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 279 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ We love pull requests. We strive to promptly review them, provide feedback, and
## Contributor License Agreement (CLA)

Before we can merge a pull request, we require a signed Contributor License Agreement. There is a CLA for:
Before we can review a pull request, we require a signed Contributor License Agreement. There is a CLA for:

* [individuals](Documentation/Contributors/CLAs/individual-cla-agi-v1.0.txt) and
* [corporations](Documentation/Contributors/CLAs/corporate-cla-agi-v1.0.txt).
* [individuals](https://docs.google.com/forms/d/e/1FAIpQLScU-yvQdcdjCFHkNXwdNeEXx5Qhu45QXuWX_uF5qiLGFSEwlA/viewform) and
* [corporations](https://docs.google.com/forms/d/e/1FAIpQLSeYEaWlBl1tQEiegfHMuqnH9VxyfgXGyIw13C2sN7Fj3J3GVA/viewform).

This only needs to be completed once, and enables contributions to all of the projects under the [Analytical Graphics Inc](https://github.com/AnalyticalGraphicsInc) organization, including CesiumJS. The CLA ensures you retain copyright to your contributions, and provides us the right to use, modify, and redistribute your contributions using the [Apache 2.0 License](LICENSE.md).

Please email a completed CLA with all fields filled in to [cla@agi.com](mailto:[email protected]). Related questions are also welcome.
If you have any questions, feel free to reach out to [hello@cesium.com](mailto:hello@cesium)!

## Pull Request Guidelines

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to CesiumJS. The following people have contributed to CesiumJS, under the following agreements:

## [Corporate CLA](Documentation/Contributors/CLAs/corporate-cla-agi-v1.0.txt)
## [Corporate CLA](Documentation/Contributors/CLAs/corporate-contributor-license-agreement-v1.0.pdf)

* [Analytical Graphics, Inc.](http://www.agi.com/)
* [Patrick Cozzi](https://github.com/pjcozzi)
Expand Down Expand Up @@ -128,7 +128,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
* [Cesium GS, Inc.](https://cesium.com/)
* [Tom Fili](https://github.com/tfili)

## [Individual CLA](Documentation/Contributors/CLAs/individual-cla-agi-v1.0.txt)
## [Individual CLA](Documentation/Contributors/CLAs/individual-contributor-license-agreement-v1.0.pdf)
* [Victor Berchet](https://github.com/vicb)
* [Caleb Morse](https://github.com/cmorse)
* [Ravi Agrawal](https://github.com/macoda)
Expand Down
146 changes: 0 additions & 146 deletions Documentation/Contributors/CLAs/corporate-cla-agi-v1.0.txt

This file was deleted.

Binary file not shown.
127 changes: 0 additions & 127 deletions Documentation/Contributors/CLAs/individual-cla-agi-v1.0.txt

This file was deleted.

Binary file not shown.

0 comments on commit fbc4a02

Please sign in to comment.