[Opengeoscience-developers] OpenGeoscience branch, improve-error-handling, updated. 5c7f7617ef9463dd96d506e7aa0599d67fa63080
Chris Harris
chris.harris at kitware.com
Fri Jun 7 13:01:13 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, improve-error-handling has been updated
via 5c7f7617ef9463dd96d506e7aa0599d67fa63080 (commit)
via 02915fe9ae29cdfc7480059986a9cbe27730615d (commit)
via d2abe256f6bbfd3a88f000ecf7cae3038361715b (commit)
via ffe97d5ce44bb748600b48caeb9c3f02ee668a31 (commit)
via 2edc8fd2e3d1655d71dafd6622265f1b33acf99e (commit)
via d84c2f72303e5aa016313fac423ebaa16507713e (commit)
via 40561607aadfbd2ed8d4168bbbc36eb2e93c81c2 (commit)
via 63fc5356284f9166f57102631a931b326c72089a (commit)
via 9257e00b674be1f0f9a466759e955e8e42dfbbce (commit)
via 151f0b944ae9f1bfc0ebad8b9e1396553f9f6b86 (commit)
via eb81cbab58e2886f4080bec453c64aaab16f853a (commit)
via cded69a3b806cbd32367aea82edae62fd306d8fc (commit)
via f1ac3d4fd076ffd5417173c44dc3ecdad48b447e (commit)
via 8184baa70c8eb488e41aa7c9fc4a0a869c6c40c2 (commit)
via 44e9bc446419e7b6f5170dd001d4a6e8c752dfcf (commit)
via 52493aaa1317a292f873ac75940af0b7d702d221 (commit)
via bb51183c6875bd006a42b65ff3a6891b950930d6 (commit)
via 65093dd709b479b982eee08e3da547b66d9ae871 (commit)
via 4216f4aa53adaa53729de32d109aea11c19a17be (commit)
via 61ac05795e6d870a081feb72b00f0a32ae2b1b16 (commit)
via 9230c6147a306171db3aebfd771ef0f6be85500e (commit)
via 578a754726550933b2556392f7c0208208b11f5c (commit)
via b878a03e7cd064fb02c63d5f606d1fa771504c45 (commit)
via 49636c284602912bbad0cf80dca8c44ab12bcaed (commit)
via 095e61f4be459e2c353750005c949e8d8a2e594f (commit)
via 03d463ea902328b0ba0654d27de98aa05d6087ea (commit)
via 253d54ef8e041ce6e57330815dab05b64ed88a73 (commit)
via 8c32313aa30372522cf63aeb88bcf633a9329cf1 (commit)
via 12ae69db0141020c97fe91f736deca0b7699d805 (commit)
via e212f19762ea8e8ab7e0d3d764eebbfd03a6df25 (commit)
via 2f3210aa23c39ca85b06eab16c0cb7cc1ce13f27 (commit)
via fc866e472cab64ddc980b3e29ad60baec8fb5409 (commit)
via 6a7312f227d58654529db47e44712af7335da746 (commit)
via 582344b05d1a580d32d5a022c0d493413d649920 (commit)
via 2bcd5d9b139585cb67b8c0f1508d4943560d9616 (commit)
via 7c989c87ee7ba319f4cb16d68a2c1f17ead8d51f (commit)
via 0111f724b6fd9cac159340726532c5478616ad45 (commit)
via 0b73f0370cf8bd8aa5678c64ad99f6d27eb520fe (commit)
from 0a07a202e215307c3373540a52c43bb79599fc51 (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=5c7f7617ef9463dd96d506e7aa0599d67fa63080
commit 5c7f7617ef9463dd96d506e7aa0599d67fa63080
Author: Chris Harris <chris.harris at kitware.com>
Date: Fri Jun 7 11:10:45 2013 -0400
Resolving merge conflicts
modules/geodata.py | 2 +-
web/apps/archive/archive.js | 22 +++++++++++++++++-----
web/lib/geo/archiveLayerSource.js | 36 ++++++++++++++++++++++++++++++------
3 files changed, 48 insertions(+), 12 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=02915fe9ae29cdfc7480059986a9cbe27730615d
commit 02915fe9ae29cdfc7480059986a9cbe27730615d
Merge: 0a07a20 d2abe25
Author: Chris Harris <chris.harris at kitware.com>
Date: Fri Jun 7 11:10:26 2013 -0400
Merge branch 'master' into improve-error-handling
Conflicts:
modules/geodata.py
modules/reader.py
web/apps/archive/archive.js
CMakeLists.txt | 8 +
geoweb.py | 5 +-
modules/geodata.py | 34 ++--
modules/ogsvtk.py | 543 ++++++++++++++++++++++++++++++-------
modules/reader.py | 4 +-
modules/vtk_reader.py | 34 ++-
scripts/mongoimp.py | 9 +-
web/apps/archive/archive.js | 166 +++++-------
web/apps/archive/index.html | 2 +
web/common/js/tween.min.js | 13 +
web/lib/geo/archiveLayerSource.js | 119 ++++++++
web/lib/geo/command.js | 2 +
web/lib/geo/feature.js | 58 ++++-
web/lib/geo/layer.js | 299 ++++++++++++++++-----
web/lib/geo/layerFeatures.js | 83 ++++++
web/lib/geo/layerSource.js | 51 ++++
web/lib/geo/map.js | 131 +++++++++-
web/lib/ui/gis.js | 25 ++-
web/lib/vgl/data.js | 21 ++
web/lib/vgl/geojsonReader.js | 273 ++++++++++++-------
web/lib/vgl/geomData.js | 101 +++++++-
web/lib/vgl/groupNode.js | 9 +
web/lib/vgl/renderer.js | 38 +++-
web/lib/vgl/texture.js | 113 ++++++++-
web/lib/vgl/utils.js | 206 ++++++++++++++
web/lib/vgl/vtkUnpack.js | 2 +-
26 files changed, 1928 insertions(+), 421 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 8 +
geoweb.py | 5 +-
modules/geodata.py | 34 ++--
modules/ogsvtk.py | 543 ++++++++++++++++++++++++++++++-------
modules/reader.py | 4 +-
modules/vtk_reader.py | 34 ++-
scripts/mongoimp.py | 9 +-
web/apps/archive/archive.js | 154 +++++-------
web/apps/archive/index.html | 2 +
web/common/js/tween.min.js | 13 +
web/lib/geo/archiveLayerSource.js | 143 ++++++++++
web/lib/geo/command.js | 2 +
web/lib/geo/feature.js | 58 ++++-
web/lib/geo/layer.js | 299 ++++++++++++++++-----
web/lib/geo/layerFeatures.js | 83 ++++++
web/lib/geo/layerSource.js | 51 ++++
web/lib/geo/map.js | 131 +++++++++-
web/lib/ui/gis.js | 25 ++-
web/lib/vgl/data.js | 21 ++
web/lib/vgl/geojsonReader.js | 273 ++++++++++++-------
web/lib/vgl/geomData.js | 101 +++++++-
web/lib/vgl/groupNode.js | 9 +
web/lib/vgl/renderer.js | 38 +++-
web/lib/vgl/texture.js | 113 ++++++++-
web/lib/vgl/utils.js | 206 ++++++++++++++
web/lib/vgl/vtkUnpack.js | 2 +-
26 files changed, 1952 insertions(+), 409 deletions(-)
create mode 100644 web/common/js/tween.min.js
create mode 100644 web/lib/geo/archiveLayerSource.js
create mode 100644 web/lib/geo/layerFeatures.js
create mode 100644 web/lib/geo/layerSource.js
create mode 100644 web/lib/vgl/data.js
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list