Merge branch 'master' of https://github.com/cmusv-sc/ApacheCMDA-Frontend.git

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

Branch: refs/heads/master
Commit: bca08e0967ac754b8f26a5c87aaf4e6822e42dd4
Parents: 07e3c1f 07a31d1
Author: mingqi830 <m...@andrew.cmu.edu>
Authored: Fri Sep 4 16:28:32 2015 -0700
Committer: mingqi830 <m...@andrew.cmu.edu>
Committed: Fri Sep 4 16:28:32 2015 -0700

----------------------------------------------------------------------
 app/views/climate/aboutus.scala.html               | 17 +++++++++++++++++
 app/views/climate/addClimateServices.scala.html    | 17 +++++++++++++++++
 app/views/climate/bugReporting.scala.html          | 16 ++++++++++++++++
 app/views/climate/bugs.scala.html                  | 16 ++++++++++++++++
 app/views/climate/climateServices.scala.html       | 16 ++++++++++++++++
 app/views/climate/conditionalSampling.scala.html   | 17 +++++++++++++++++
 .../climate/conditionalSampling2Var.scala.html     | 17 +++++++++++++++++
 app/views/climate/correlationMap.scala.html        | 17 +++++++++++++++++
 app/views/climate/dataRecommend.scala.html         | 17 +++++++++++++++++
 app/views/climate/dataSetList.scala.html           | 17 +++++++++++++++++
 app/views/climate/datasetTime.scala.html           | 17 +++++++++++++++++
 ...fferencePlotTwoTimeAveragedVariables.scala.html | 17 +++++++++++++++++
 app/views/climate/header.scala.html                | 16 ++++++++++++++++
 app/views/climate/home.scala.html                  | 17 +++++++++++++++++
 app/views/climate/main.scala.html                  | 17 +++++++++++++++++
 app/views/climate/mostPopularServices.scala.html   | 17 +++++++++++++++++
 .../climate/mostRecentlyAddedServices.scala.html   | 17 +++++++++++++++++
 .../climate/mostRecentlyUsedServices.scala.html    | 17 +++++++++++++++++
 app/views/climate/oneService.scala.html            | 17 +++++++++++++++++
 app/views/climate/recommend.scala.html             | 17 +++++++++++++++++
 app/views/climate/regridAndDownload.scala.html     | 17 +++++++++++++++++
 .../scatterAndHistogramTwoVariable.scala.html      | 17 +++++++++++++++++
 app/views/climate/searchDataSet.scala.html         | 17 +++++++++++++++++
 .../climate/searchGenerateWorkflow.scala.html      | 17 +++++++++++++++++
 app/views/climate/searchLogResult.scala.html       | 17 +++++++++++++++++
 .../climate/searchLogResultWorkflow.scala.html     | 17 +++++++++++++++++
 app/views/climate/searchServiceLog.scala.html      | 17 +++++++++++++++++
 app/views/climate/serviceLog.scala.html            | 17 +++++++++++++++++
 .../threeDVariableAerageVerticalProfile.scala.html | 17 +++++++++++++++++
 .../climate/threeDVariableTwoDSlice.scala.html     | 17 +++++++++++++++++
 .../climate/threeDVariableZonalMean.scala.html     | 17 +++++++++++++++++
 app/views/climate/tutorial.scala.html              | 17 +++++++++++++++++
 app/views/climate/twoDVariableMap.scala.html       | 17 +++++++++++++++++
 .../climate/twoDVariableTimeSeries.scala.html      | 17 +++++++++++++++++
 app/views/climate/twoDVariableZonelMean.scala.html | 17 +++++++++++++++++
 35 files changed, 591 insertions(+)
----------------------------------------------------------------------


Reply via email to