[Opengeoscience-developers] OpenGeoscience branch, 54-workflow-support-fix, created. 4ed17492349eddd2915cbaa1a235c4cebfe3b9cb
Ben Burnett
bburnett at poly.edu
Wed Jun 5 17:14:39 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, 54-workflow-support-fix has been created
at 4ed17492349eddd2915cbaa1a235c4cebfe3b9cb (commit)
- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=4ed17492349eddd2915cbaa1a235c4cebfe3b9cb
commit 4ed17492349eddd2915cbaa1a235c4cebfe3b9cb
Merge: 0bc219d 0a8da54
Author: Ben Burnett <bburnett at poly.edu>
Date: Wed Jun 5 17:06:45 2013 -0400
Fix merge conflict
web/apps/workflow/workflow.js | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=0bc219d8bd4ddb15e980767a1fd61bafb309277c
commit 0bc219d8bd4ddb15e980767a1fd61bafb309277c
Author: Ben Burnett <bburnett at poly.edu>
Date: Wed Jun 5 16:58:05 2013 -0400
Comment out stream button for now
web/lib/ui/gis.js | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=58e8e931d233d8ea60c9a52581c49a58bd865b81
commit 58e8e931d233d8ea60c9a52581c49a58bd865b81
Merge: 084e83f 253d54e
Author: Ben Burnett <bburnett at poly.edu>
Date: Wed Jun 5 16:49:28 2013 -0400
Merge branch 'master' into 54-workflow-support
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=084e83f5977d0acb0a15374f39fdc206a85ede99
commit 084e83f5977d0acb0a15374f39fdc206a85ede99
Author: Ben Burnett <bburnett at poly.edu>
Date: Wed Jun 5 16:48:40 2013 -0400
Adds 10 year average workflow
.gitignore | 5 +-
geoweb.py | 5 +-
modules/geodata.py | 9 +-
modules/ogsvtk.py | 543 ++++-
modules/reader.py | 4 +-
modules/vtk_reader.py | 34 +-
nodes/streammaster.py | 22 +-
nodes/streamworker.py | 101 +-
scripts/mongoimp.py | 9 +-
utils/packages/geoweb.py | 116 +
utils/packages/pvcdmsreader.py | 262 +++
utils/xml2json.py | 193 ++
web/apps/archive/archive.js | 47 +-
web/apps/{workflow => oldworkflow}/climatepipes.js | 0
web/apps/{workflow => oldworkflow}/hint-textbox.js | 0
web/apps/{workflow => oldworkflow}/index.html | 46 -
.../modules/basic_modules.js | 0
.../modules/climatepipes_modules.js | 0
.../modules/cpsimplified_modules.js | 0
.../modules/esgf_modules.js | 0
.../modules/http_modules.js | 0
.../modules/simple_modules.js | 0
.../modules/subworkflow_modules.js | 0
web/apps/{workflow => oldworkflow}/res/wheel.gif | Bin 1787 -> 1787 bytes
.../wireit/css/WireIt.css | 0
.../wireit/css/WireItEditor.css | 0
.../wireit/images/close.png | Bin 404 -> 404 bytes
.../wireit/images/cut.png | Bin 648 -> 648 bytes
.../wireit/images/icons/add.png | Bin 733 -> 733 bytes
.../wireit/images/icons/application_go.png | Bin 634 -> 634 bytes
.../wireit/images/icons/bullet_go.png | Bin 410 -> 410 bytes
.../wireit/images/icons/database_save.png | Bin 755 -> 755 bytes
.../wireit/images/icons/delete.png | Bin 715 -> 715 bytes
.../wireit/images/icons/help.png | Bin 786 -> 786 bytes
.../wireit/images/terminals.png | Bin 2877 -> 2877 bytes
.../wireit/images/terminals2.png | Bin 2782 -> 2782 bytes
.../wireit/images/terminals3.png | Bin 1892 -> 1892 bytes
.../wireit/js/CanvasElement.js | 0
.../wireit/js/Container.js | 0
.../wireit/js/EsriContainer | 0
.../wireit/js/ImageContainer.js | 0
.../wireit/js/InOutContainer.js | 0
.../{workflow => oldworkflow}/wireit/js/Layer.js | 0
.../wireit/js/LayerMap.js | 0
.../{workflow => oldworkflow}/wireit/js/Layout.js | 0
.../wireit/js/Terminal.js | 0
.../{workflow => oldworkflow}/wireit/js/Wire.js | 0
.../{workflow => oldworkflow}/wireit/js/WireIt.js | 0
.../wireit/js/WiringEditor.js | 0
.../wireit/js/adapters/ajax.js | 0
.../wireit/js/adapters/gears.js | 0
.../wireit/js/adapters/json-rpc.js | 0
.../wireit/js/util/Anim.js | 0
.../{workflow => oldworkflow}/wireit/js/util/DD.js | 0
.../wireit/js/util/DDResize.js | 0
.../wireit/js/util/inputex/FormContainer-beta.js | 0
.../wireit/js/util/inputex/WirableField-beta.js | 0
.../wireit/lib/accordionview/accordionview-min.js | 0
.../wireit/lib/accordionview/accordionview.js | 0
.../assets/skins/sam/accordionview.css | 0
.../lib/accordionview/assets/skins/sam/sprite.png | Bin 3123 -> 3123 bytes
.../wireit/lib/inputex/css/inputEx-IE6.css | 0
.../wireit/lib/inputex/css/inputEx.css | 0
.../wireit/lib/inputex/js/Field.js | 0
.../wireit/lib/inputex/js/Form.js | 0
.../wireit/lib/inputex/js/Group.js | 0
.../wireit/lib/inputex/js/Visus.js | 0
.../wireit/lib/inputex/js/fields/AutoComplete.js | 0
.../wireit/lib/inputex/js/fields/CheckBox.js | 0
.../wireit/lib/inputex/js/fields/ColorField.js | 0
.../wireit/lib/inputex/js/fields/CombineField.js | 0
.../wireit/lib/inputex/js/fields/DSSelectField.js | 0
.../wireit/lib/inputex/js/fields/DateField.js | 0
.../lib/inputex/js/fields/DatePickerField.js | 0
.../wireit/lib/inputex/js/fields/DateSplitField.js | 0
.../wireit/lib/inputex/js/fields/DateTimeField.js | 0
.../wireit/lib/inputex/js/fields/EmailField.js | 0
.../wireit/lib/inputex/js/fields/FileField-beta.js | 0
.../wireit/lib/inputex/js/fields/HiddenField.js | 0
.../wireit/lib/inputex/js/fields/InPlaceEdit.js | 0
.../wireit/lib/inputex/js/fields/IntegerField.js | 0
.../wireit/lib/inputex/js/fields/ListField.js | 0
.../wireit/lib/inputex/js/fields/MenuField.js | 0
.../lib/inputex/js/fields/MultiAutoComplete.js | 0
.../lib/inputex/js/fields/MultiSelectField.js | 0
.../wireit/lib/inputex/js/fields/NumberField.js | 0
.../wireit/lib/inputex/js/fields/PairField.js | 0
.../wireit/lib/inputex/js/fields/PasswordField.js | 0
.../wireit/lib/inputex/js/fields/RTEField.js | 0
.../wireit/lib/inputex/js/fields/RadioButton.js | 0
.../wireit/lib/inputex/js/fields/RadioField.js | 0
.../wireit/lib/inputex/js/fields/SelectField.js | 0
.../wireit/lib/inputex/js/fields/SliderField.js | 0
.../wireit/lib/inputex/js/fields/StringField.js | 0
.../wireit/lib/inputex/js/fields/Textarea.js | 0
.../wireit/lib/inputex/js/fields/TimeField.js | 0
.../wireit/lib/inputex/js/fields/TreeField.js | 0
.../wireit/lib/inputex/js/fields/TypeField.js | 0
.../lib/inputex/js/fields/UneditableField.js | 0
.../wireit/lib/inputex/js/fields/UrlField.js | 0
.../wireit/lib/inputex/js/inputex-loader.js | 0
.../wireit/lib/inputex/js/inputex.js | 0
.../wireit/lib/inputex/js/json-schema.js | 0
.../wireit/res/icons/application_edit.png | Bin 703 -> 703 bytes
.../wireit/res/icons/arrow_join.png | Bin 626 -> 626 bytes
.../wireit/res/icons/arrow_right.png | Bin 349 -> 349 bytes
.../wireit/res/icons/color_wheel.png | Bin 892 -> 892 bytes
.../wireit/res/icons/comment.png | Bin 413 -> 413 bytes
.../wireit/res/icons/comments.png | Bin 557 -> 557 bytes
web/apps/workflow/10yearAverage.js | 1 +
web/apps/workflow/10yearAverage.xml | 61 +
web/apps/workflow/brain.js | 1 +
web/apps/workflow/geowebRegistry.js | 2384 ++++++++++++++++++++
web/apps/workflow/geowebRegistry.xml | 338 +++
web/apps/workflow/index.html | 422 +----
web/apps/workflow/workflow.css | 27 +
web/apps/workflow/workflow.js | 554 +++++
web/apps/workflow/workflowStyle.js | 28 +
web/common/css/select2.css | 2 +-
web/index.html | 6 +
web/lib/geo/feature.js | 22 +-
web/lib/geo/map.js | 3 +-
web/lib/ui/gis.js | 44 +-
web/lib/vgl/geojsonReader.js | 262 ++-
web/lib/vgl/geomData.js | 55 +-
web/lib/vgl/texture.js | 113 +-
web/lib/vgl/utils.js | 206 ++
web/lib/vgl/vtkUnpack.js | 2 +-
128 files changed, 5211 insertions(+), 716 deletions(-)
-----------------------------------------------------------------------
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list