[Opengeoscience-developers] OpenGeoscience branch, next, updated. 5dcf962f4eeebf23cea442cfc09d58ca612b1aa4
Aashish Chaudhary
aashish.chaudhary at kitware.com
Tue Sep 10 09:52:47 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, next has been updated
via 5dcf962f4eeebf23cea442cfc09d58ca612b1aa4 (commit)
via 60ac351510df6a295c3545ac0bdf92dbf3ad08d7 (commit)
via e8adbbd58716435c9a1bf1998bf8d0442709047f (commit)
via 6f0fa737c5d8a893be9140a97db7b83abfbcd3e5 (commit)
via 7e32c3229038ad7757c6f9334db1aa3e0b6cf719 (commit)
via f497a9df471d2b58a80227fbf0f8e25afb57c366 (commit)
via fa5647c8a8f6f31a9ed1778e9eb8070d183f9115 (commit)
via a4d8cd989c98806b209cedf4639a596852e33c30 (commit)
from 71695976fc306d6b7b6adee57d0d7ccf1d62a5c5 (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=5dcf962f4eeebf23cea442cfc09d58ca612b1aa4
commit 5dcf962f4eeebf23cea442cfc09d58ca612b1aa4
Merge: 7169597 60ac351
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Tue Sep 10 09:52:26 2013 -0400
Merge remote-tracking branch 'origin/127_fix_legend' into next
* origin/127_fix_legend:
Added API for initialization and destruction of layer and source
Fixed bug where removing layer didn't remove legend
Improved API
Conflicts:
web/lib/geoweb.min.js
web/apps/archive/archive.js | 8 ++--
web/lib/geo/archiveLayerSource.js | 17 +++++-
web/lib/geo/featureCollection.js | 4 +-
web/lib/geo/featureLayer.js | 107 +++++++++++++++++++++++++++----------
web/lib/geo/layer.js | 59 +++++++++++++++++---
web/lib/geo/layerSource.js | 16 ++++++
web/lib/geo/map.js | 22 +++-----
7 files changed, 176 insertions(+), 57 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
web/apps/archive/archive.js | 8 ++--
web/lib/geo/archiveLayerSource.js | 17 +++++-
web/lib/geo/featureCollection.js | 4 +-
web/lib/geo/featureLayer.js | 107 +++++++++++++++++++++++++++----------
web/lib/geo/layer.js | 59 +++++++++++++++++---
web/lib/geo/layerSource.js | 16 ++++++
web/lib/geo/map.js | 22 +++-----
7 files changed, 176 insertions(+), 57 deletions(-)
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list