From 8df9fff8efd0fce7c0f811bc92aabaa1a8935d53 Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 10:30:42 -0500
Subject: [PATCH 01/15] first conduct file added, need to check link config
---
CHANGES.md | 1 +
CODEOFCONDUCT.md | 5 +++++
2 files changed, 6 insertions(+)
create mode 100644 CODEOFCONDUCT.md
diff --git a/CHANGES.md b/CHANGES.md
index aac3d79a4d13..8d2569fe6ade 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,7 @@ Change Log
* Fixed a bug when creating billboard and model entities without a globe. [#6109](https://github.com/AnalyticalGraphicsInc/cesium/pull/6109)
* Updated documentation links to reflect new locations on cesiumjs.org and cesium.com.
* Added support for vertex shader uniforms when `tileset.colorBlendMode` is `MIX` or `REPLACE`. [#5874](https://github.com/AnalyticalGraphicsInc/cesium/pull/5874)
+* Added file for [Code of Conduct](cesium/CODEOFCONDUCT.md)
### 1.41 - 2018-01-02
diff --git a/CODEOFCONDUCT.md b/CODEOFCONDUCT.md
new file mode 100644
index 000000000000..eb06093743af
--- /dev/null
+++ b/CODEOFCONDUCT.md
@@ -0,0 +1,5 @@
+# Code of Conduct
+
+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 pcozzi@agi.com.
+
+This applies to the main Cesium repo, forum, twitter, and all channels, including all repos in the [AnalyticalGraphicsInc](https://github.com/AnalyticalGraphicsInc) GitHub organization.
From 898cfa2fdbd63eae16102469bc5e784f0c4d945a Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 10:35:43 -0500
Subject: [PATCH 02/15] link check
---
CHANGES.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 8d2569fe6ade..fb940bb20682 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,7 +29,7 @@ Change Log
* Fixed a bug when creating billboard and model entities without a globe. [#6109](https://github.com/AnalyticalGraphicsInc/cesium/pull/6109)
* Updated documentation links to reflect new locations on cesiumjs.org and cesium.com.
* Added support for vertex shader uniforms when `tileset.colorBlendMode` is `MIX` or `REPLACE`. [#5874](https://github.com/AnalyticalGraphicsInc/cesium/pull/5874)
-* Added file for [Code of Conduct](cesium/CODEOFCONDUCT.md)
+* Added file for [Code of Conduct](CODEOFCONDUCT.md)
### 1.41 - 2018-01-02
From 6306b9a008a0b22482df0dd2be92bc4326d00737 Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 10:50:32 -0500
Subject: [PATCH 03/15] link to file in contributing vs having content in
codeofconduct
---
CODEOFCONDUCT.md | 2 +-
CONTRIBUTING.md | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/CODEOFCONDUCT.md b/CODEOFCONDUCT.md
index eb06093743af..d4e3e4bb4f71 100644
--- a/CODEOFCONDUCT.md
+++ b/CODEOFCONDUCT.md
@@ -1,5 +1,5 @@
# Code of Conduct
-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 pcozzi@agi.com.
+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 pcozzi@agi.com.
This applies to the main Cesium repo, forum, twitter, and all channels, including all repos in the [AnalyticalGraphicsInc](https://github.com/AnalyticalGraphicsInc) GitHub organization.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c3a5645c98b1..64fa46a0eca3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -82,6 +82,4 @@ Our code is our lifeblood so maintaining Cesium's high code quality is important
# Code of Conduct
-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 pcozzi@agi.com.
-
-This applies to the main Cesium repo, forum, twitter, and all channels, including all repos in the [AnalyticalGraphicsInc](https://github.com/AnalyticalGraphicsInc) GitHub organization.
+View our current code of conduct [here](CODEOFCONDUCT.md)
From b890faeaf3b1bc9050a365c5418e63778e1d6777 Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 10:51:28 -0500
Subject: [PATCH 04/15] added period
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 64fa46a0eca3..029e814499c4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -82,4 +82,4 @@ Our code is our lifeblood so maintaining Cesium's high code quality is important
# Code of Conduct
-View our current code of conduct [here](CODEOFCONDUCT.md)
+View our current code of conduct [here](CODEOFCONDUCT.md).
From 06280e8d423ae46e70239c6e96b9f13450575cf1 Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 11:00:56 -0500
Subject: [PATCH 05/15] updated upwards link for codeofconduct and removed
lower section
---
CONTRIBUTING.md | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 029e814499c4..582de71177e6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ Thanks for contributing to Cesium. You rock! Are you
* [getting started contributing](#getting-started-contributing), or
* [opening a pull request](#opening-a-pull-request)?
-To ensure an inclusive community, contributors and users in the Cesium community should follow the [code of conduct](#code-of-conduct).
+To ensure an inclusive community, contributors and users in the Cesium community should follow the [code of conduct](CODEOFCONDUCT.md).
# Submitting an Issue
@@ -79,7 +79,3 @@ Our code is our lifeblood so maintaining Cesium's high code quality is important
* Include reference documentation with code examples. Follow the [Documentation Guide](Documentation/Contributors/DocumentationGuide/README.md).
* If the change is significant, add a new [Sandcastle](http://cesiumjs.org/Cesium/Apps/Sandcastle/index.html) example or extend and existing one.
* If you added third-party libraries, including new version of existing libraries, update [LICENSE.md](LICENSE.md). Mention it in [CHANGES.md](CHANGES.md). If you plan to add a third-party library, start a new thread on the [Cesium forum](http://cesiumjs.org/forum.html) first.
-
-# Code of Conduct
-
-View our current code of conduct [here](CODEOFCONDUCT.md).
From 0c98a4b79d658f54beb3dd946baa27d6f369ebc9 Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 11:05:22 -0500
Subject: [PATCH 06/15] updated for codeofconduct to code_of_conduct filename
change
---
CHANGES.md | 2 +-
CODEOFCONDUCT.md => CODE_OF_CONDUCT.md | 0
CONTRIBUTING.md | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename CODEOFCONDUCT.md => CODE_OF_CONDUCT.md (100%)
diff --git a/CHANGES.md b/CHANGES.md
index fb940bb20682..64b0aecca708 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,7 +29,7 @@ Change Log
* Fixed a bug when creating billboard and model entities without a globe. [#6109](https://github.com/AnalyticalGraphicsInc/cesium/pull/6109)
* Updated documentation links to reflect new locations on cesiumjs.org and cesium.com.
* Added support for vertex shader uniforms when `tileset.colorBlendMode` is `MIX` or `REPLACE`. [#5874](https://github.com/AnalyticalGraphicsInc/cesium/pull/5874)
-* Added file for [Code of Conduct](CODEOFCONDUCT.md)
+* Added file for [Code of Conduct](CODE_OF_CONDUCT.md)
### 1.41 - 2018-01-02
diff --git a/CODEOFCONDUCT.md b/CODE_OF_CONDUCT.md
similarity index 100%
rename from CODEOFCONDUCT.md
rename to CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 582de71177e6..343f3313cd1b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ Thanks for contributing to Cesium. You rock! Are you
* [getting started contributing](#getting-started-contributing), or
* [opening a pull request](#opening-a-pull-request)?
-To ensure an inclusive community, contributors and users in the Cesium community should follow the [code of conduct](CODEOFCONDUCT.md).
+To ensure an inclusive community, contributors and users in the Cesium community should follow the [code of conduct](CODE_OF_CONDUCT.md).
# Submitting an Issue
From c30f898d2fbc2be0aaf10efa98595ec5925f799a Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 11:10:19 -0500
Subject: [PATCH 07/15] updated to reinclude conduct section at bottom of cla
---
CONTRIBUTING.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 343f3313cd1b..78afb3a2a279 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -79,3 +79,7 @@ Our code is our lifeblood so maintaining Cesium's high code quality is important
* Include reference documentation with code examples. Follow the [Documentation Guide](Documentation/Contributors/DocumentationGuide/README.md).
* If the change is significant, add a new [Sandcastle](http://cesiumjs.org/Cesium/Apps/Sandcastle/index.html) example or extend and existing one.
* If you added third-party libraries, including new version of existing libraries, update [LICENSE.md](LICENSE.md). Mention it in [CHANGES.md](CHANGES.md). If you plan to add a third-party library, start a new thread on the [Cesium forum](http://cesiumjs.org/forum.html) first.
+
+# Code of Conduct
+
+Cesium's code of conduct is [here](CODE_OF_CONDUCT.md).
From 6b132aa7e06915932dad725683a3a845baa16164 Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 11:16:41 -0500
Subject: [PATCH 08/15] uppercase code of conduct in file
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 78afb3a2a279..83fa2f2ce7b0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -82,4 +82,4 @@ Our code is our lifeblood so maintaining Cesium's high code quality is important
# Code of Conduct
-Cesium's code of conduct is [here](CODE_OF_CONDUCT.md).
+Cesium's Code of Conduct is [here](CODE_OF_CONDUCT.md).
From c0e54daad0ffc0d9680d67b8f063b020552701a0 Mon Sep 17 00:00:00 2001
From: Gabby Getz <ggetz881@gmail.com>
Date: Thu, 18 Jan 2018 11:16:58 -0500
Subject: [PATCH 09/15] Update CHANGES.md
---
CHANGES.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 64b0aecca708..d6fc32eba0b0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,7 +29,7 @@ Change Log
* Fixed a bug when creating billboard and model entities without a globe. [#6109](https://github.com/AnalyticalGraphicsInc/cesium/pull/6109)
* Updated documentation links to reflect new locations on cesiumjs.org and cesium.com.
* Added support for vertex shader uniforms when `tileset.colorBlendMode` is `MIX` or `REPLACE`. [#5874](https://github.com/AnalyticalGraphicsInc/cesium/pull/5874)
-* Added file for [Code of Conduct](CODE_OF_CONDUCT.md)
+* Added seperate file for the Cesium [Code of Conduct](CODE_OF_CONDUCT.md). [#6129](https://github.com/AnalyticalGraphicsInc/cesium/pull/6129)
### 1.41 - 2018-01-02
From f5c24f45f6b8edd852447f1b3c7210f7ed1e5c9d Mon Sep 17 00:00:00 2001
From: Gabby Getz <ggetz881@gmail.com>
Date: Thu, 18 Jan 2018 11:18:10 -0500
Subject: [PATCH 10/15] Fixed link in CHANGES.md
---
CHANGES.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index d6fc32eba0b0..c7a4e0f16c7f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,7 +29,7 @@ Change Log
* Fixed a bug when creating billboard and model entities without a globe. [#6109](https://github.com/AnalyticalGraphicsInc/cesium/pull/6109)
* Updated documentation links to reflect new locations on cesiumjs.org and cesium.com.
* Added support for vertex shader uniforms when `tileset.colorBlendMode` is `MIX` or `REPLACE`. [#5874](https://github.com/AnalyticalGraphicsInc/cesium/pull/5874)
-* Added seperate file for the Cesium [Code of Conduct](CODE_OF_CONDUCT.md). [#6129](https://github.com/AnalyticalGraphicsInc/cesium/pull/6129)
+* Added seperate file for the Cesium [Code of Conduct](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CODE_OF_CONDUCT.md). [#6129](https://github.com/AnalyticalGraphicsInc/cesium/pull/6129)
### 1.41 - 2018-01-02
From e9a530b6ca79134f4664fd9d5b00cad6a7c74f06 Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 11:27:18 -0500
Subject: [PATCH 11/15] made links relative
---
CONTRIBUTING.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 83fa2f2ce7b0..f1544127b424 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ Thanks for contributing to Cesium. You rock! Are you
* [getting started contributing](#getting-started-contributing), or
* [opening a pull request](#opening-a-pull-request)?
-To ensure an inclusive community, contributors and users in the Cesium community should follow the [code of conduct](CODE_OF_CONDUCT.md).
+To ensure an inclusive community, contributors and users in the Cesium community should follow the [code of conduct](./CODE_OF_CONDUCT.md).
# Submitting an Issue
@@ -82,4 +82,4 @@ Our code is our lifeblood so maintaining Cesium's high code quality is important
# Code of Conduct
-Cesium's Code of Conduct is [here](CODE_OF_CONDUCT.md).
+Cesium's Code of Conduct is [here](./CODE_OF_CONDUCT.md).
From 3b50cf453733e8fa93cc03cd7b1157cbf1838a04 Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 12:28:05 -0500
Subject: [PATCH 12/15] test for login
---
CODE_OF_CONDUCT.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index d4e3e4bb4f71..2892144624e2 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,4 +1,4 @@
-# Code of Conduct
+# Code of Conduct
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 pcozzi@agi.com.
From c7e4097178d3585e8521d8574e1a3d984783b0b0 Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 13:15:50 -0500
Subject: [PATCH 13/15] updated wording
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f1544127b424..60aaf165e228 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -82,4 +82,4 @@ Our code is our lifeblood so maintaining Cesium's high code quality is important
# Code of Conduct
-Cesium's Code of Conduct is [here](./CODE_OF_CONDUCT.md).
+To ensure an inclusive community, contributors and users in the Cesium community should follow the [code of conduct](./CODE_OF_CONDUCT.md).
From 817e805499b962e49921b85cde5da3d6b04608aa Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 13:33:39 -0500
Subject: [PATCH 14/15] formatting ##
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 60aaf165e228..389152a7b2cb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -80,6 +80,6 @@ Our code is our lifeblood so maintaining Cesium's high code quality is important
* If the change is significant, add a new [Sandcastle](http://cesiumjs.org/Cesium/Apps/Sandcastle/index.html) example or extend and existing one.
* If you added third-party libraries, including new version of existing libraries, update [LICENSE.md](LICENSE.md). Mention it in [CHANGES.md](CHANGES.md). If you plan to add a third-party library, start a new thread on the [Cesium forum](http://cesiumjs.org/forum.html) first.
-# Code of Conduct
+## Code of Conduct
To ensure an inclusive community, contributors and users in the Cesium community should follow the [code of conduct](./CODE_OF_CONDUCT.md).
From 3b5aa896a9cce9b81a9aae46d5a4e8aadb832183 Mon Sep 17 00:00:00 2001
From: hanbollar <hbollar@seas.upenn.edu>
Date: Thu, 18 Jan 2018 13:43:15 -0500
Subject: [PATCH 15/15] fixed spelling
---
CHANGES.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index f420235abc4b..4ff73546ad3f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -30,7 +30,7 @@ Change Log
* Fixed a glTF animation bug that caused certain animations to jitter. [#5740](https://github.com/AnalyticalGraphicsInc/cesium/pull/5740)
* Fixed a bug when creating billboard and model entities without a globe. [#6109](https://github.com/AnalyticalGraphicsInc/cesium/pull/6109)
* Added support for vertex shader uniforms when `tileset.colorBlendMode` is `MIX` or `REPLACE`. [#5874](https://github.com/AnalyticalGraphicsInc/cesium/pull/5874)
-* Added seperate file for the Cesium [Code of Conduct](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CODE_OF_CONDUCT.md). [#6129](https://github.com/AnalyticalGraphicsInc/cesium/pull/6129)
+* Added separate file for the Cesium [Code of Conduct](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CODE_OF_CONDUCT.md). [#6129](https://github.com/AnalyticalGraphicsInc/cesium/pull/6129)
* Fixed applying a translucent style to a point cloud tileset. [#6113](https://github.com/AnalyticalGraphicsInc/cesium/pull/6113)
### 1.41 - 2018-01-02