[Opengeoscience-developers] OpenGeoscience branch, normalize_time_semi_merged, created. b7dbe281338f5f9dbe65b6307311a15a45c06f6b
Aashish Chaudhary
aashish.chaudhary at kitware.com
Thu Jul 11 18:13:37 EDT 2013
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, normalize_time_semi_merged has been created
at b7dbe281338f5f9dbe65b6307311a15a45c06f6b (commit)
- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=b7dbe281338f5f9dbe65b6307311a15a45c06f6b
commit b7dbe281338f5f9dbe65b6307311a15a45c06f6b
Merge: 633c984 428b5d3
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Thu Jul 11 18:00:09 2013 -0400
Merge remote-tracking branch 'origin/normalize_time'
* origin/normalize_time:
fix data path to do better than clt.nc and add units
fix commit late induced typos
Add infrastructure needed to interpret, convert and search time.
Conflicts:
web/apps/archive/archive.js
CMakeLists.txt | 8 +++++
modules/mongo.py | 4 +++
modules/vtk_reader.py | 39 ++++++++++++++++++++++----
scripts/mongoimp.py | 62 +++++++++++++++++++++++++++++++++--------
scripts/standardtime.py | 57 ++++++++++++++++++++++++++++++++++++++
web/apps/archive/archive.js | 32 +++++++++++++++++++---
web/lib/ui/gis.js | 13 +++++----
web/lib/vgl/geojsonReader.js | 24 +++++++++++++++-
web/lib/vgl/geomData.js | 15 +++++++++-
9 files changed, 224 insertions(+), 30 deletions(-)
-----------------------------------------------------------------------
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list