[Opengeoscience-developers] OpenGeoscience branch, 161-list-variables-on-search, updated. master-no-submodule-52-gb318e7c
Ben Burnett
bburnett at poly.edu
Thu Nov 7 13:14:35 EST 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, 161-list-variables-on-search has been updated
via b318e7c7bdcd1e09afeeee523c514ba968d49b8d (commit)
via 186b9306eb77293ffd6d97a48c377013bbe12968 (commit)
via 864f2547dad5ff3a8265ee2c61c208322e441880 (commit)
via 82ca5c3e326816a5d6afbb9225270fb8d7cd06f6 (commit)
via 1ea9da7f164dfebd07ffd8b0a8e3480e0cd2a0a9 (commit)
via 079373e607dec94c2b6ec94554058ac2ce018f15 (commit)
via 112cee4be5b0039a01d0768fae306a47db1fa986 (commit)
via b67b233166ffce845923477605ca531ee3668393 (commit)
via a24f844999c8b951f8108afe5d1274d7c21b8914 (commit)
via 940c2f028d94a0d22796dc2e8d83bf007b063c11 (commit)
via 924fb6884bf6f0bc2bbd9d75d9f4c02965d9018f (commit)
via 49fc8f7f618eddcd7080d3233fd6de8874e8b5fb (commit)
via bc7e843db7088306971760c8acffc3d6e7c96504 (commit)
via 41af254631fcba138629920a3713d439c9e627fe (commit)
via 62a7aaec29f4ba583a850b43d409efa40d59cf17 (commit)
via 6be665ddb01643ea1b56c4ecf86a9390daa95524 (commit)
via aebb8f334c5234c91c27f997922d6c40e5164660 (commit)
via b48a86925b02e200e96303a08bb2fa80c3e1691f (commit)
via 60d3487e9be189f637041a220796315716847217 (commit)
via fd8c1d24446ecfcaa6f85ef6e0e0959d5f69c0ed (commit)
via dbf826a0ca8178d37155590242be3aaacdb6d743 (commit)
via e4f3962fc7a5bb17478ddf439ed72165cc17481b (commit)
via deb94f596872da7b9c361fb52ce8e214c589a82b (commit)
via 3fe5afbe7605abb44f6f365f5594c59d3c830f32 (commit)
via 3e920124a412c84e1ec5db2b6b403a10430aff5b (commit)
via 175ef11c8a243413632df7824c02e6e1de1f272e (commit)
via 015e988f7b40c6fb06c632d82d6371d4dc69ddb3 (commit)
via a5949bbb5c1cfb58b3c87983939123594ad19b98 (commit)
via b41f48a7ae64a76a4dc5d25e449bdd77a53efa22 (commit)
via e77c65d5133ebc64faff3734e7dda376012f2983 (commit)
via 883fa1d759b492aee308c2e64620e356f40d270f (commit)
from 8aca5bd30b492231a3c46b594e4b583b3ec06dab (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=b318e7c7bdcd1e09afeeee523c514ba968d49b8d
commit b318e7c7bdcd1e09afeeee523c514ba968d49b8d
Merge: 8aca5bd 186b930
Author: Ben Burnett <benbu at nyu.edu>
Date: Thu Nov 7 11:13:42 2013 -0700
Merge in master and fix css conflict
CMakeLists.txt | 73 +-
cmake/configure.cmake | 8 +-
cmake/configure_server.cmake.in | 8 +-
cmake/geocelery_conf.py.in | 2 +-
cmake/geoweb.conf.in | 23 +
cmake/run.sh.in | 2 +-
cmake/server.conf.in | 17 +-
geoweb | 12 +-
geoweb.py | 41 +-
login.html | 113 +
modules/authentication.py | 63 +
modules/esgf/__init__.py | 67 -
modules/esgf/authentication.py | 34 +
modules/esgf/download.py | 77 +-
modules/esgf/query.py | 28 +-
modules/esgf/registration.py | 57 +
modules/esgf/utils.py | 22 +
modules/geodata.py => services/data.py | 20 +-
modules/esgf/__init__.py => services/esgf.py | 65 +-
{modules => services}/mongo.py | 1 +
services/session.py | 15 +
services/vistrail.py | 3 +-
utils/__init__.py | 2 +-
web/apps/archive/archive.css | 14 +-
web/apps/archive/archive.js | 336 +-
web/apps/archive/index.html | 85 +-
web/apps/archive/mask.js | 78 +
web/common/bootstrap-3.0/css/bootstrap-theme.css | 384 ++
.../bootstrap-3.0/css/bootstrap-theme.min.css | 1 +
web/common/bootstrap-3.0/css/bootstrap.css | 6805 ++++++++++++++++++++
web/common/bootstrap-3.0/css/bootstrap.min.css | 9 +
.../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 14079 bytes
.../fonts/glyphicons-halflings-regular.svg | 228 +
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 29512 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 16448 bytes
web/common/bootstrap-3.0/js/bootstrap.js | 1999 ++++++
web/common/bootstrap-3.0/js/bootstrap.min.js | 6 +
web/index.html | 1 +
web/lib/geojs | 2 +-
39 files changed, 10353 insertions(+), 348 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 73 +-
cmake/configure.cmake | 8 +-
cmake/configure_server.cmake.in | 8 +-
cmake/geocelery_conf.py.in | 2 +-
cmake/geoweb.conf.in | 23 +
cmake/run.sh.in | 2 +-
cmake/server.conf.in | 17 +-
geoweb | 12 +-
geoweb.py | 41 +-
login.html | 113 +
modules/authentication.py | 63 +
modules/esgf/__init__.py | 67 -
modules/esgf/authentication.py | 34 +
modules/esgf/download.py | 77 +-
modules/esgf/query.py | 28 +-
modules/esgf/registration.py | 57 +
modules/esgf/utils.py | 22 +
modules/geodata.py => services/data.py | 20 +-
modules/esgf/__init__.py => services/esgf.py | 65 +-
{modules => services}/mongo.py | 1 +
services/session.py | 15 +
services/vistrail.py | 3 +-
utils/__init__.py | 2 +-
web/apps/archive/archive.css | 14 +-
web/apps/archive/archive.js | 336 +-
web/apps/archive/index.html | 85 +-
web/apps/archive/mask.js | 78 +
web/common/bootstrap-3.0/css/bootstrap-theme.css | 384 ++
.../bootstrap-3.0/css/bootstrap-theme.min.css | 1 +
web/common/bootstrap-3.0/css/bootstrap.css | 6805 ++++++++++++++++++++
web/common/bootstrap-3.0/css/bootstrap.min.css | 9 +
.../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 14079 bytes
.../fonts/glyphicons-halflings-regular.svg | 228 +
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 29512 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 16448 bytes
web/common/bootstrap-3.0/js/bootstrap.js | 1999 ++++++
web/common/bootstrap-3.0/js/bootstrap.min.js | 6 +
web/index.html | 1 +
web/lib/geojs | 2 +-
39 files changed, 10353 insertions(+), 348 deletions(-)
create mode 100644 cmake/geoweb.conf.in
create mode 100644 login.html
create mode 100644 modules/authentication.py
create mode 100644 modules/esgf/authentication.py
create mode 100644 modules/esgf/registration.py
create mode 100644 modules/esgf/utils.py
rename modules/geodata.py => services/data.py (74%)
copy modules/esgf/__init__.py => services/esgf.py (51%)
rename {modules => services}/mongo.py (99%)
create mode 100644 services/session.py
create mode 100644 web/apps/archive/mask.js
create mode 100644 web/common/bootstrap-3.0/css/bootstrap-theme.css
create mode 100644 web/common/bootstrap-3.0/css/bootstrap-theme.min.css
create mode 100644 web/common/bootstrap-3.0/css/bootstrap.css
create mode 100644 web/common/bootstrap-3.0/css/bootstrap.min.css
create mode 100644 web/common/bootstrap-3.0/fonts/glyphicons-halflings-regular.eot
create mode 100644 web/common/bootstrap-3.0/fonts/glyphicons-halflings-regular.svg
create mode 100644 web/common/bootstrap-3.0/fonts/glyphicons-halflings-regular.ttf
create mode 100644 web/common/bootstrap-3.0/fonts/glyphicons-halflings-regular.woff
create mode 100644 web/common/bootstrap-3.0/js/bootstrap.js
create mode 100644 web/common/bootstrap-3.0/js/bootstrap.min.js
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list