Changeset 21341 for issm/trunk/jenkins/javascript/karma

Timestamp:

11/04/16 13:48:43 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

• . (modified) (view diffs)
• jenkins/javascript (copied) (copied from issm/trunk-jpl/jenkins/javascript ) (view diffs)
• jenkins/javascript/karma (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma ) (view diffs)
• jenkins/javascript/karma/index.html (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/index.html ) (view diffs)
• jenkins/javascript/karma/karma.conf.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/karma.conf.js ) (view diffs)
• jenkins/javascript/karma/karmalog (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/karmalog ) (view diffs)
• jenkins/javascript/karma/lib (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib ) (view diffs)
• jenkins/javascript/karma/lib/Data (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/Data ) (view diffs)
• jenkins/javascript/karma/lib/Data/SquareShelfConstrained.data.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/Data/SquareShelfConstrained.data.js ) (view diffs)
• jenkins/javascript/karma/lib/Exp (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/Exp ) (view diffs)
• jenkins/javascript/karma/lib/Exp/Square.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/Exp/Square.js ) (view diffs)
• jenkins/javascript/karma/lib/Par (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/Par ) (view diffs)
• jenkins/javascript/karma/lib/Par/SquareShelfConstrained.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/Par/SquareShelfConstrained.js ) (view diffs)
• jenkins/javascript/karma/lib/bin (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin ) (view diffs)
• jenkins/javascript/karma/lib/bin/DepthAverage.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/DepthAverage.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/EnumDefinitions.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/EnumDefinitions.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/GetAreas.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/GetAreas.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/SMBforcing.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/SMBforcing.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/adjacency.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/adjacency.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/basalforcings.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/basalforcings.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/calving.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/calving.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/contourenvelope.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/contourenvelope.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/damage.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/damage.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/flowequation.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/flowequation.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/friction.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/friction.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/geometry.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/geometry.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/hydrologyshreve.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/hydrologyshreve.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/initialization.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/initialization.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/inversion.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/inversion.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/issm-binaries.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/issm-binaries.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/issm-extlibraries.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/issm-extlibraries.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/levelset.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/levelset.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/link-libs.sh (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/link-libs.sh ) (view diffs)
• jenkins/javascript/karma/lib/bin/mask.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/mask.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/masstransport.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/masstransport.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/matice.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/matice.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/matlabfunc.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/matlabfunc.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/mesh2d.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/mesh2d.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/mesh3dprisms.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/mesh3dprisms.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/model.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/model.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/partitioner.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/partitioner.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/project2d.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/project2d.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/project3d.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/project3d.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/qmu.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/qmu.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/stressbalance.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/stressbalance.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/supportedcontrols.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/supportedcontrols.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/supportedcostfunctions.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/supportedcostfunctions.js ) (view diffs)
• jenkins/javascript/karma/lib/bin/thermal.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/lib/bin/thermal.js ) (view diffs)
• jenkins/javascript/karma/node_modules (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/node_modules ) (view diffs)
• jenkins/javascript/karma/package.json (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/package.json ) (view diffs)
• jenkins/javascript/karma/scripts (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts ) (view diffs)
• jenkins/javascript/karma/scripts/m2js.sh (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/m2js.sh ) (view diffs)
• jenkins/javascript/karma/scripts/reload-tests.sh (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/reload-tests.sh ) (view diffs)
• jenkins/javascript/karma/scripts/run-server.sh (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/run-server.sh ) (view diffs)
• jenkins/javascript/karma/scripts/runme.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/runme.js ) (view diffs)
• jenkins/javascript/karma/scripts/runscript.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/runscript.js ) (view diffs)
• jenkins/javascript/karma/scripts/specs (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/specs ) (view diffs)
• jenkins/javascript/karma/scripts/specs/generate-spec.sh (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/specs/generate-spec.sh ) (view diffs)
• jenkins/javascript/karma/scripts/specs/issm-ajax.spec.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/specs/issm-ajax.spec.js ) (view diffs)
• jenkins/javascript/karma/scripts/specs/issm.spec.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/specs/issm.spec.js ) (view diffs)
• jenkins/javascript/karma/scripts/test231.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/test231.js ) (view diffs)
• jenkins/javascript/karma/scripts/test232.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/test232.js ) (view diffs)
• jenkins/javascript/karma/scripts/test233.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/test233.js ) (view diffs)
• jenkins/javascript/karma/scripts/test234.js (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/scripts/test234.js ) (view diffs)
• jenkins/javascript/karma/spec (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/spec ) (view diffs)
• jenkins/javascript/karma/spec/support (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/spec/support ) (view diffs)
• jenkins/javascript/karma/spec/support/jasmine.json (copied) (copied from issm/trunk-jpl/jenkins/javascript/karma/spec/support/jasmine.json ) (view diffs)