Merge remote-tracking branch 'upstream/master'

CONTRIBUTING

@@ -1,26 +1 @@
-All contributors to the Earth Engine API libraries must sign a CLA.
-
-What is a CLA?
-----------------------------------------
-
-A CLA (Contributor License Agreement) basically says that you own the
-rights to any code you contribute, and that you give us permission to
-use that code in the Earth Engine API libraries. You maintain the
-copyright on that code.
-
-Where do I sign up?
-----------------------------------------
-
-If you own all the rights to your code, you can fill out an individual CLA.
-http://code.google.com/legal/individual-cla-v1.0.html
-
-If your employer has any rights to your code, then they also need to fill
-out a corporate CLA. If you don't know if your employer has any rights
-to your code, you should ask before signing anything.
-http://code.google.com/legal/corporate-cla-v1.0.html
-
-CLA Signers
-----------------------------------------
-
-By default, anyone with an @google.com email address already has a CLA
-signed for them. Congratulations!
+The Earth Engine API clients are not currently accepting pull requests.

LICENSE

@@ -199,3 +199,15 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+====================================================================================
+The following applies to MochiKit, embedded in Closure in compiled JavaScript files.
+====================================================================================
+
+Copyright (c) 2005 Bob Ippolito.  All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,5 +1,4 @@
-Google Earth Engine API
-=======================
+# Google Earth Engine API
 
 Python and JavaScript client libraries for calling the Google Earth Engine API.
 
@@ -39,3 +38,11 @@ Map.addLayer(
     {min: 0, max: [0.18, 20, -0.18], bands: ['scale', 'offset', 'scale']},
     'stable lights trend');
 ```
+
+## NOTICE
+
+In order to be more responsive to bug reports and feature requests, we are
+currently using the Google Issue Tracker rather than the GitHub Issue tracker.
+Please see the [Get Help](https://developers.google.com/earth-engine/help) page
+of the Earth Engine documentation for details on how to browse and submit issues
+to Issue Tracker.

demos/export-to-drive/appengine_config.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Loads third-party Python libraries.
 
 `appengine_config.py` is automatically loaded when Google App Engine

demos/export-to-drive/config.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Required credentials configuration."""
 
 # See instructions in the README.md file for how to fill these in.

demos/export-to-drive/drive.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Helpers for interfacing with Google Drive."""
 
 import googleapiclient.discovery

demos/export-to-drive/server.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Web server for the export-to-Google-Drive EE demo application.
 
 The code in this file runs on App Engine. It's called when the user loads the

demos/export-to-drive/static/script.js

@@ -49,7 +49,7 @@ exporter.App = class {
 
     // Outstanding URL paths for the current map IDs, keyed by layer name.
     // Used to avoid needlessly changing the layer when the layer requested is
-    // the the same as the current layer.
+    // the same as the current layer.
     this.layerPaths = {};
 
     // The ID of this client for socket communication with App Engine.