[Opengeoscience-developers] OpenGeoscience branch, next, updated. 100eb61d44a94fc4b06dcbcb8fd9a1facbb34edc

Aashish Chaudhary aashish.chaudhary at kitware.com
Mon Aug 26 10:25:08 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  100eb61d44a94fc4b06dcbcb8fd9a1facbb34edc (commit)
       via  5ec2b806812fe85e1edf9c6696b3fbb9424d03b1 (commit)
       via  67499b130243dcf804f80ead11e3b9c16ee3575c (commit)
       via  e05fcdd907e42f6c9bb014152ef3dce5e05c38f4 (commit)
       via  55800f7aeedd247a3cbd1477f5da47b31db43014 (commit)
       via  67be438ff0e75e88fa1026a2004daeb9bd8805e6 (commit)
       via  70234947cbfa8ce3166d755a99e5c0c8521462a8 (commit)
       via  8649fa5c57aa2862d61ada013358052e6c47da9b (commit)
       via  203d66aed46664a98052b781d20b1a8ecab4e3e1 (commit)
       via  ef40be09cea5b00d11ff057cb95f362541591589 (commit)
      from  d1de7b2211770b51c301e63073879b4fc64bb04b (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=100eb61d44a94fc4b06dcbcb8fd9a1facbb34edc
commit 100eb61d44a94fc4b06dcbcb8fd9a1facbb34edc
Merge: d1de7b2 5ec2b80
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Mon Aug 26 10:24:55 2013 -0400

    Merge remote-tracking branch 'origin/fix_legend' into next
    
    * origin/fix_legend:
      Fixed arrays not getting cleared up
      Use base class members
      Fixing various issues with animations
      Use orange color for legend text
      Do not consider layers with no legend for legend placements
      Removed debug messages
      Fixed incorrect construction of parameters
      Initial work on map setting up the legends for layers
    
    Conflicts:
    	web/apps/archive/archive.js

 web/apps/archive/archive.js       |    4 +-
 web/lib/geo/featureCollection.js  |    4 +-
 web/lib/geo/featureLayer.js       |   75 +++++++++++++++++++++++++++++++++++--
 web/lib/geo/layer.js              |   17 ++++++--
 web/lib/geo/map.js                |   63 ++++++++++++++++++++++++++++++-
 web/lib/geo/openStreetMapLayer.js |    6 ++-
 web/lib/vgl/renderer.js           |    2 +-
 web/lib/vgl/utils.js              |    4 +-
 8 files changed, 157 insertions(+), 18 deletions(-)

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

Summary of changes:
 web/apps/archive/archive.js       |    4 +-
 web/lib/geo/featureCollection.js  |    4 +-
 web/lib/geo/featureLayer.js       |   75 +++++++++++++++++++++++++++++++++++--
 web/lib/geo/layer.js              |   17 ++++++--
 web/lib/geo/map.js                |   63 ++++++++++++++++++++++++++++++-
 web/lib/geo/openStreetMapLayer.js |    6 ++-
 web/lib/vgl/renderer.js           |    2 +-
 web/lib/vgl/utils.js              |    4 +-
 8 files changed, 157 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
OpenGeoscience



More information about the Opengeoscience-developers mailing list