You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by om...@apache.org on 2016/01/31 20:25:18 UTC

[1/2] climate git commit: CLIMATE-738 - Update Google jsapi call to use https rather than http.

Repository: climate
Updated Branches:
  refs/heads/master adf9ccd35 -> 638676184


CLIMATE-738 - Update  Google jsapi call to use https rather than http.


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/0b5d3d8c
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/0b5d3d8c
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/0b5d3d8c

Branch: refs/heads/master
Commit: 0b5d3d8ce3f2d5def44d020c3a7e411b7486a457
Parents: adf9ccd
Author: MichaelArthurAnderson <mi...@gmail.com>
Authored: Sun Jan 31 12:37:01 2016 -0500
Committer: MichaelArthurAnderson <mi...@gmail.com>
Committed: Sun Jan 31 12:37:01 2016 -0500

----------------------------------------------------------------------
 ocw-ui/frontend/app/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/0b5d3d8c/ocw-ui/frontend/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/index.html b/ocw-ui/frontend/app/index.html
index 9ab9982..3946571 100644
--- a/ocw-ui/frontend/app/index.html
+++ b/ocw-ui/frontend/app/index.html
@@ -93,7 +93,7 @@ under the License.
     <!-- Google visualization library needs to be initialized for the timeline -->
     <!-- Note that the terms of use forbid having a local copy of the code, so we're -->
     <!-- stuck downloading it this way unfortunately. -->
-    <script type="text/javascript" src="http://www.google.com/jsapi"></script>
+    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
     <script type="text/javascript">google.load("visualization", "1");</script>
 
     <!-- build:js(.) scripts/vendor.js -->
@@ -150,14 +150,14 @@ under the License.
       <div class="container">
         <hr>
         <p>
-          Apache Open Climate Workbench Software . 
+          Apache Open Climate Workbench Software .
           <a href="https://climate.apache.org/" target="_blank">About Us</a> . <a href="dev@climate.apache.org" target="_blank">Report an issue</a> .
           <br>
-          Copyright © 2013 The Apache Software Foundation, Licensed under the 
+          Copyright © 2013 The Apache Software Foundation, Licensed under the
           <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
         </p>
       </div>
     <footer>
-      
+
   </body>
 </html>


[2/2] climate git commit: CLIMATE-738 - Update Google jsapi call, this closes #295

Posted by om...@apache.org.
CLIMATE-738 - Update Google jsapi call, this closes #295


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/63867618
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/63867618
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/63867618

Branch: refs/heads/master
Commit: 638676184fd53f49bbdcc9e830e88ead7045793f
Parents: c706df1 0b5d3d8
Author: Omkar20895 <om...@Omkars-MacBook-Pro.local>
Authored: Mon Feb 1 00:54:22 2016 +0530
Committer: Omkar20895 <om...@Omkars-MacBook-Pro.local>
Committed: Mon Feb 1 00:54:22 2016 +0530

----------------------------------------------------------------------
 RCMES/metrics_and_plots.py     | 18 +++++++++-------
 RCMES/run_RCMES.py             | 41 ++++++++++++++++++++++++-------------
 ocw-ui/frontend/app/index.html |  8 ++++----
 ocw/dataset_processor.py       | 41 ++++++++++++++++++++++---------------
 ocw/utils.py                   |  2 ++
 5 files changed, 68 insertions(+), 42 deletions(-)
----------------------------------------------------------------------