[Opengeoscience-developers] OpenGeoscience branch, next, updated. a9c2070e0c9d720374db85e06d858c061eb16f35

[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, next has been updated
       via  a9c2070e0c9d720374db85e06d858c061eb16f35 (commit)
       via  bb07452c4f99dc0ceb4095b64da3dd0fff5a210f (commit)
       via  b394c2391a8f7118bebfe28acc6338d7ad5539b7 (commit)
       via  6d7636366fd43ffbc4a645ce4c0e97016eb39063 (commit)
       via  2f368aa3d99402051c4c305bb7662036831eb612 (commit)
      from  12c39efbd08caab27d44f41a58d5cbe8eedf734d (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/opengeoscience.git;a=commitdiff;h=a9c2070e0c9d720374db85e06d858c061eb16f35
commit a9c2070e0c9d720374db85e06d858c061eb16f35
Merge: 12c39ef bb07452
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Sat Mar 16 19:06:20 2013 -0400

    Merge remote-tracking branch 'origin/uplift_frontend' into next
    
    * origin/uplift_frontend:
      Improving the app control panel
      Updating archive controls
      Initial pass
    
    Conflicts:
    	CMakeLists.txt

 CMakeLists.txt                                |   20 +-
 ogs.py                                        |    5 -
 server.conf.in                                |    3 +-
 web/{lib/app.js => apps/archive/archive.js}   |    4 +-
 web/apps/archive/index.html                   |  116 +
 web/common/css/bootstrap-responsive.css       | 1109 ++
 web/common/css/bootstrap-responsive.min.css   |    9 +
 web/common/css/bootstrap.css                  | 6158 ++++++++++
 web/common/css/bootstrap.min.css              |    9 +
 web/common/img/glyphicons-halflings-white.png |  Bin 0 -> 8777 bytes
 web/common/img/glyphicons-halflings.png       |  Bin 0 -> 12799 bytes
 web/common/js/bootstrap.js                    | 2268 ++++
 web/common/js/jquery-1.9.1.js                 | 9597 ++++++++++++++++
 web/common/js/jquery-ui.js                    |14936 +++++++++++++++++++++++++
 web/index.html                                |  149 +-
 15 files changed, 34329 insertions(+), 54 deletions(-)

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

Summary of changes:
 CMakeLists.txt                                |   20 +-
 ogs.py                                        |    5 -
 server.conf.in                                |    3 +-
 web/{lib/app.js => apps/archive/archive.js}   |    4 +-
 web/apps/archive/index.html                   |  116 +
 web/common/css/bootstrap-responsive.css       | 1109 ++
 web/common/css/bootstrap-responsive.min.css   |    9 +
 web/common/css/bootstrap.css                  | 6158 ++++++++++
 web/common/css/bootstrap.min.css              |    9 +
 web/common/img/glyphicons-halflings-white.png |  Bin 0 -> 8777 bytes
 web/common/img/glyphicons-halflings.png       |  Bin 0 -> 12799 bytes
 web/common/js/bootstrap.js                    | 2268 ++++
 web/common/js/jquery-1.9.1.js                 | 9597 ++++++++++++++++
 web/common/js/jquery-ui.js                    |14936 +++++++++++++++++++++++++
 web/index.html                                |  149 +-
 15 files changed, 34329 insertions(+), 54 deletions(-)
 rename web/{lib/app.js => apps/archive/archive.js} (95%)
 create mode 100644 web/apps/archive/index.html
 create mode 100644 web/common/css/bootstrap-responsive.css
 create mode 100644 web/common/css/bootstrap-responsive.min.css
 create mode 100644 web/common/css/bootstrap.css
 create mode 100644 web/common/css/bootstrap.min.css
 create mode 100644 web/common/img/glyphicons-halflings-white.png
 create mode 100644 web/common/img/glyphicons-halflings.png
 create mode 100644 web/common/js/bootstrap.js
 create mode 100644 web/common/js/jquery-1.9.1.js
 create mode 100644 web/common/js/jquery-ui.js


hooks/post-receive
-- 
OpenGeoscience