You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by le...@apache.org on 2016/02/02 19:28:07 UTC

[1/2] climate git commit: CLIMATE-740 - Add path handler for img directory to run_webservices.py.

Repository: climate
Updated Branches:
  refs/heads/master c6249f641 -> 4bcd9d071


CLIMATE-740 - Add path handler for img directory to run_webservices.py.


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

Branch: refs/heads/master
Commit: 0837468bf7185d69635c53ed0c4787b4d9745991
Parents: adf9ccd
Author: MichaelArthurAnderson <mi...@gmail.com>
Authored: Sun Jan 31 14:26:38 2016 -0500
Committer: MichaelArthurAnderson <mi...@gmail.com>
Committed: Sun Jan 31 14:26:38 2016 -0500

----------------------------------------------------------------------
 ocw-ui/backend/run_webservices.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/0837468b/ocw-ui/backend/run_webservices.py
----------------------------------------------------------------------
diff --git a/ocw-ui/backend/run_webservices.py b/ocw-ui/backend/run_webservices.py
index 3f38e2c..dae2567 100644
--- a/ocw-ui/backend/run_webservices.py
+++ b/ocw-ui/backend/run_webservices.py
@@ -49,10 +49,14 @@ def serve_static(path):
 def serve_static(path):
     return static_file(path, root='./frontend/app/views/')
 
+@app.route('/img/:path#.+#')
+def server_static(path):
+     return static_file(path, root='./frontend/app/img/')
+
 @app.route('/static/eval_results/<file_path:path>')
 def get_eval_result_image(file_path):
     ''' Return static file.
-    
+
     Return static file specified by root + filepath where root defaults to:
         /tmp/ocw
 


[2/2] climate git commit: Merge branch 'CLIMATE-740' of https://github.com/MichaelArthurAnderson/climate this closes #297

Posted by le...@apache.org.
Merge branch 'CLIMATE-740' of https://github.com/MichaelArthurAnderson/climate this closes #297


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

Branch: refs/heads/master
Commit: 4bcd9d071615f67560c8432e47dc9b9145b41168
Parents: c6249f6 0837468
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Tue Feb 2 10:30:38 2016 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Tue Feb 2 10:30:38 2016 -0800

----------------------------------------------------------------------
 ocw-ui/backend/run_webservices.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------