[Opengeoscience-developers] OpenGeoscience branch, master, updated. master-no-submodule-10-gc4d8af5

[Aashish Chaudhary]

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  c4d8af5a9fbbc03c0404caa2f71fb539a4481f36 (commit)
       via  7ce6dbaf1f98e2c45daa20028c935ce92a45aadc (commit)
       via  5af18585a97da2a22a1f5106b4e15770acc51958 (commit)
       via  4f03114e53cd7311daf2ca204ebe39960cb93263 (commit)
       via  b48daaf4b673a223804da3b1fc71e0897bb4e38a (commit)
      from  09e80ffb66a12b32c3df29833daf88e28ba3f758 (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=c4d8af5a9fbbc03c0404caa2f71fb539a4481f36
commit c4d8af5a9fbbc03c0404caa2f71fb539a4481f36
Merge: 09e80ff 7ce6dba
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Fri Sep 27 13:29:42 2013 -0400

    Merge remote-tracking branch 'origin/158-workflow-bootstrap-modal'
    
    * origin/158-workflow-bootstrap-modal:
      Use custom div behavior for map info popup
      Finish switching to bootstrap modal for workflows
      More attempts at worklfow dialog layout
      Initial attempt to use bootstrap modal for workflow dialog
    
    Conflicts:
    	web/apps/archive/archive.js

 web/apps/archive/archive.css |   18 ++++
 web/apps/archive/archive.js  |  182 ++++++++++++++++++++++--------------------
 web/apps/archive/index.html  |   25 +++++-
 3 files changed, 136 insertions(+), 89 deletions(-)

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

Summary of changes:
 web/apps/archive/archive.css |   18 ++++
 web/apps/archive/archive.js  |  182 ++++++++++++++++++++++--------------------
 web/apps/archive/index.html  |   25 +++++-
 3 files changed, 136 insertions(+), 89 deletions(-)


hooks/post-receive
-- 
OpenGeoscience