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, master has been updated
via caa022f0023e03171f5023a24d8ee4a8d794b5d8 (commit)
via 5c7f7617ef9463dd96d506e7aa0599d67fa63080 (commit)
via 02915fe9ae29cdfc7480059986a9cbe27730615d (commit)
via 0a07a202e215307c3373540a52c43bb79599fc51 (commit)
via baea50312ce9d1c388930e5992e24ac42f069a47 (commit)
via 3ef0f1461c4f9a994199fe76e26238554411a550 (commit)
from f8d5e1202b8c8993d54efa40d383ccd5a9f547cd (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=caa022f0023e03171f5023a24d8ee4a8d794b5d8
commit caa022f0023e03171f5023a24d8ee4a8d794b5d8
Merge: f8d5e12 5c7f761
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Fri Jun 7 15:28:26 2013 -0400
Merge remote-tracking branch 'origin/improve-error-handling'
* origin/improve-error-handling:
Resolving merge conflicts
Propagate file reading errors to client side
Add error dialog to display errors to user
Remove tabs
modules/geodata.py | 27 +++++++++++++++------------
modules/reader.py | 12 ++++--------
modules/vtk_reader.py | 4 ++++
web/apps/archive/archive.js | 21 ++++++++++++++++++++-
web/apps/archive/index.html | 17 +++++++++++++++--
web/lib/geo/archiveLayerSource.js | 36 ++++++++++++++++++++++++++++++------
6 files changed, 88 insertions(+), 29 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
modules/geodata.py | 27 +++++++++++++++------------
modules/reader.py | 12 ++++--------
modules/vtk_reader.py | 4 ++++
web/apps/archive/archive.js | 21 ++++++++++++++++++++-
web/apps/archive/index.html | 17 +++++++++++++++--
web/lib/geo/archiveLayerSource.js | 36 ++++++++++++++++++++++++++++++------
6 files changed, 88 insertions(+), 29 deletions(-)
hooks/post-receive
--
OpenGeoscience