[Opengeoscience-developers] OpenGeoscience branch, 161-list-variables-on-search, updated. master-no-submodule-64-gbe01223

[Ben Burnett]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenGeoscience".

The branch, 161-list-variables-on-search has been updated
       via  be01223345a733dbe842a072a283b675a6d0c33e (commit)
       via  b683e60d4c1039ae360e901ed45c87b5d79ac792 (commit)
       via  752fde872b2f204798d84da89ed419ffd4304fdf (commit)
       via  367aabefeb1b5c0b8bce0d4f75823e41d1d4836c (commit)
       via  3271113af705b25c315412cc03b969c7d7f9d3c0 (commit)
       via  24f0d5c6d4b503ff6a0b500f8f590e14e3f98b9d (commit)
       via  2ce20cc910cd5da563c6bde5bc33eb7f7c977eb1 (commit)
       via  ec4042c56772082610dbf97f0cb5586f5a2301de (commit)
       via  d6d4a02a78991f56f1f253fd2bef99f76958df34 (commit)
       via  f8ba86cd3fe6b92e53dd04c1ede4d3c803e2fbb9 (commit)
       via  2a8a2916d341d8d9037118448e95d58c82abb34c (commit)
       via  f1680afcbfaef6749521552296c7e0abb85d406d (commit)
      from  b318e7c7bdcd1e09afeeee523c514ba968d49b8d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=be01223345a733dbe842a072a283b675a6d0c33e
commit be01223345a733dbe842a072a283b675a6d0c33e
Merge: b318e7c b683e60
Author: Ben Burnett <benbu at nyu.edu>
Date:   Tue Nov 12 11:19:18 2013 -0700

    Merge branch 'master' into 161-list-variables-on-search
    
    Conflicts:
    	web/apps/archive/archive.js

 services/cdms.py                   |   49 ++++++-
 web/apps/archive/archive.css       |   30 ++++-
 web/apps/archive/archive.js        |  327 ++++++++++++++++++++++++++++++++---
 web/apps/archive/index.html        |    4 +-
 web/apps/archive/timeseriesPlot.js |   71 ++++++++
 web/lib/geojs                      |    2 +-
 6 files changed, 451 insertions(+), 32 deletions(-)

-----------------------------------------------------------------------

Summary of changes:
 services/cdms.py                   |   49 ++++++-
 web/apps/archive/archive.css       |   30 ++++-
 web/apps/archive/archive.js        |  327 ++++++++++++++++++++++++++++++++---
 web/apps/archive/index.html        |    4 +-
 web/apps/archive/timeseriesPlot.js |   71 ++++++++
 web/lib/geojs                      |    2 +-
 6 files changed, 451 insertions(+), 32 deletions(-)
 create mode 100644 web/apps/archive/timeseriesPlot.js


hooks/post-receive
-- 
OpenGeoscience