[Opengeoscience-developers] OpenGeoscience branch, 29-query-facelift, updated. master-no-submodule-66-g21d6784
Ben Burnett
bburnett at poly.edu
Fri Nov 8 12:49:31 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, 29-query-facelift has been updated
via 21d678468b40460414738eafd0192bf289b851d8 (commit)
via 3ba7fb05084fac9e8f796401a6bb47b9bd87400f (commit)
via 367aabefeb1b5c0b8bce0d4f75823e41d1d4836c (commit)
via 3271113af705b25c315412cc03b969c7d7f9d3c0 (commit)
via 24f0d5c6d4b503ff6a0b500f8f590e14e3f98b9d (commit)
via 2ce20cc910cd5da563c6bde5bc33eb7f7c977eb1 (commit)
via ec4042c56772082610dbf97f0cb5586f5a2301de (commit)
via d6d4a02a78991f56f1f253fd2bef99f76958df34 (commit)
via f8ba86cd3fe6b92e53dd04c1ede4d3c803e2fbb9 (commit)
via 2a8a2916d341d8d9037118448e95d58c82abb34c (commit)
via f1680afcbfaef6749521552296c7e0abb85d406d (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)
from 9295374d53af51446f56b08512e1d51f2f529a59 (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=21d678468b40460414738eafd0192bf289b851d8
commit 21d678468b40460414738eafd0192bf289b851d8
Author: Ben Burnett <benbu at nyu.edu>
Date: Fri Nov 8 10:48:51 2013 -0700
Update geojs submodule ref
web/lib/geojs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=3ba7fb05084fac9e8f796401a6bb47b9bd87400f
commit 3ba7fb05084fac9e8f796401a6bb47b9bd87400f
Merge: 9295374 367aabe
Author: Ben Burnett <benbu at nyu.edu>
Date: Fri Nov 8 10:48:28 2013 -0700
Merge branch 'add_timeseries_analysis' into 29-query-facelift
Conflicts:
web/apps/archive/archive.js
web/lib/geojs
CMakeLists.txt | 34 +-
cmake/configure.cmake | 2 +-
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 +
services/cdms.py | 49 +-
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 | 39 +-
web/apps/archive/archive.js | 676 ++-
web/apps/archive/index.html | 74 +-
web/apps/archive/timeseriesPlot.js | 71 +
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 +
39 files changed, 10643 insertions(+), 407 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 34 +-
cmake/configure.cmake | 2 +-
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 +
services/cdms.py | 49 +-
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 | 39 +-
web/apps/archive/archive.js | 676 ++-
web/apps/archive/index.html | 74 +-
web/apps/archive/timeseriesPlot.js | 71 +
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 +-
40 files changed, 10644 insertions(+), 408 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/timeseriesPlot.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