Skip to navigation
Skip to content

Code commits

GeoDashboard

Brock Angelo 20 Jan 2016 36996dad0aaa7cdc67642eae7a61fc90fb1fbaf7

resolve merge conflict
Luigi Marini 16 Dec 2015 40734fced13f0840d45a86bffd360087ff786c1b m

Replacing local sbt jar to 0.13.2 just in case
In case some of the build script uses the local sbt jar instead of the
one on the path rizzo:/usr/local/sbt-0.13.2/bin
- sbt (version 40734fced13f0840d45a86bffd360087ff786c1b) (diffs)
- sbt-launch.jar (version 40734fced13f0840d45a86bffd360087ff786c1b) (diffs)
Luigi Marini 16 Dec 2015 cd919a2c09378134d8022c3f0b1979173d977082 m

sbt 0.13.2
Trying this version since that's what on the build machine
- project/build.properties (version cd919a2c09378134d8022c3f0b1979173d977082) (diffs)
Luigi Marini 16 Dec 2015 17310b7e9a92f07a95cabe23bc4ab796743e6262 m

Upgraded play and sbt to get build to work with java 1.8
play 2.2.6
sbt 0.13.9
- project/build.properties (version 17310b7e9a92f07a95cabe23bc4ab796743e6262) (diffs)
- project/plugins.sbt (version 17310b7e9a92f07a95cabe23bc4ab796743e6262) (diffs)
Brock Angelo 16 Dec 2015 645739796f14b73ece4aee644ca4e1266c3d1612 m

update the build script
- project/Build.scala (version 645739796f14b73ece4aee644ca4e1266c3d1612) (diffs)
Brock Angelo 02 Dec 2015 65dfcfbf6d2ba8c642c633fc6c6ac67ea4d7c517 m

turns off the layer zoom by default, just as we are doing with app.config.areas
- src/javascript/view/ExploreMapView.js (version 65dfcfbf6d2ba8c642c633fc6c6ac67ea4d7c517) (diffs)
Luigi Marini 25 Nov 2015 bf863f40bed603873e1616c5051df8dc40abebd7 m

Merge pull request #454 in GEOD/geodashboard from compare-view-linear-interpolation to master
* commit '5a22d889c91ee277b9353a1f5ccceb664c3de485':
use linear interpolation for line graphs
Luigi Marini 25 Nov 2015 c7263309af8c2f87fcfbea4ef7f51f557ce32d89 m

Merge pull request #455 in GEOD/geodashboard from bugfix-compare-graph-hanging-chad-of-sensors to master
* commit '9aea151577c7668720accc573a9d2b332316ee44':
fix the issue of sensor graphs that hung around when they didn't have data for the selected parameter
Luigi Marini 25 Nov 2015 f033db698442ae155c44596c89ccf97884b1b404 m

Merge pull request #456 in GEOD/geodashboard from GEOD-742-show-legend-for-geoserver-layers to master
* commit '7a4970423191863a4cf56f3398c55a0260b697c5':
Show legend for layers when available
Luigi Marini 25 Nov 2015 f07b239eb8fe6ee3d00e8889a2036a936b84a7db m

Merge pull request #451 in GEOD/geodashboard from GLGVO-178/remove-info-icons to master
* commit '31ebd71d025fe3970bdc89ba73f1dd11ddd2383c':
cleanup and documentation
GLGVO-178: remove info icons from explore data by watershed
Luigi Marini 25 Nov 2015 7a4970423191863a4cf56f3398c55a0260b697c5 m

Show legend for layers when available
Brock Angelo 25 Nov 2015 9aea151577c7668720accc573a9d2b332316ee44 m

fix the issue of sensor graphs that hung around when they didn't have data for the selected parameter
- src/javascript/view/CompareGraphMGTimeSeriesView.js (version 9aea151577c7668720accc573a9d2b332316ee44) (diffs)
Brock Angelo 25 Nov 2015 5a22d889c91ee277b9353a1f5ccceb664c3de485 m

use linear interpolation for line graphs
- src/javascript/view/CompareGraphMGTimeSeriesView.js (version 5a22d889c91ee277b9353a1f5ccceb664c3de485) (diffs)
Brock Angelo 25 Nov 2015 cf511fd034ec2baf3dd8848024beaef33fb9b05d m

prevents excessive rendering of graphs
- src/javascript/view/CompareGraphView.js (version cf511fd034ec2baf3dd8848024beaef33fb9b05d) (diffs)
Brock Angelo 11 Nov 2015 31ebd71d025fe3970bdc89ba73f1dd11ddd2383c m

resolve merge conflict
Brock Angelo 20 Jul 2015 526f0c5df292e2f0a68a824ce32b1530167196e2 m

cleanup and documentation
- src/javascript/view/ExploreByCustomView.js (version 526f0c5df292e2f0a68a824ce32b1530167196e2) (diffs)
Marcus Slavenas 15 Jul 2015 fc017a7a25c9beb61ae53a8e41ea2a7b0daa1a5e m

GLGVO-178: remove info icons from explore data by watershed