Git

• 

  Nicholas Tenczar 28 Feb 2014 6f2ad087071b37c1e44401a4249089b1b3cd2173

  Final bit of merging the master with this branch... hopefully
• 

  Nicholas Tenczar 28 Feb 2014 87e580af670411b1a3bb397cdf1076e754c2095d

  Added modals and bug fixes for the new view system.

  • app/views/detail_view.scala.html (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • app/views/explore.scala.html (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • app/views/explore_data_nav.scala.html (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • app/views/index.scala.html (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • app/views/seagrant_modals.scala.html (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • bin/view/ControlsView.js (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • bin/view/DetailView.js (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • public/about_epa.html (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • public/stylesheets/main.css (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • src/javascript/view/AppView.js (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • src/javascript/view/ControlsView.js (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • src/javascript/view/DetailView.js (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • src/javascript/view/ExploreView.js (version 87e580af670411b1a3bb397cdf1076e754c2095d)
  • src/javascript/view/MainMapView.js (version 87e580af670411b1a3bb397cdf1076e754c2095d)
• 

  Nicholas Tenczar 28 Feb 2014 fa72d6dffdadd659afb31b90b8106d31ebd4478e

  Created new composite view for MainMapView and ExploreView. Moved these into their own space.

  • app/views/explore.scala.html (version fa72d6dffdadd659afb31b90b8106d31ebd4478e)
  • app/views/index.scala.html (version fa72d6dffdadd659afb31b90b8106d31ebd4478e)
  • public/stylesheets/main.css (version fa72d6dffdadd659afb31b90b8106d31ebd4478e)
  • src/Gruntfile.js (version fa72d6dffdadd659afb31b90b8106d31ebd4478e)
  • src/javascript/start.js (version fa72d6dffdadd659afb31b90b8106d31ebd4478e)
  • src/javascript/view/AppView.js (version fa72d6dffdadd659afb31b90b8106d31ebd4478e)
  • src/javascript/view/HomeView.js (version fa72d6dffdadd659afb31b90b8106d31ebd4478e)
• 

  Nicholas Tenczar 28 Feb 2014 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b

  Performing changes necessary for new view abstraction. The right way this time.

  • app/views/advanced_search.scala.html (version 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b)
  • app/views/detail_view.scala.html (version 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b)
  • app/views/explore_data_nav.scala.html (version 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b)
  • app/views/index.scala.html (version 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b)
  • app/views/info_window.scala.html (version 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b)
  • app/views/map_pin.scala.html (version 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b)
  • app/views/permalink.scala.html (version 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b)
  • bin/view/DetailView.js (version 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b)
  • src/javascript/view/AdvancedSearchView.js (version 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b)
  • src/javascript/view/AppView.js (version 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b)
  • src/javascript/view/DetailView.js (version 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b)
  • src/javascript/view/MainMapView.js (version 7eea743bef7a3a00b875a3f324c89b1f46c6cb2b)
• 

  Nicholas Tenczar 28 Feb 2014 2f008f48505fc61325a403829bc51e6443463828

  Changed the nomenclature in the ExploreView to 'regions' from 'lakes.' This is more generic and more intuitive for application other than Great Lakes Monitoring.

  • app/views/explore_data_nav.scala.html (version 2f008f48505fc61325a403829bc51e6443463828)
  • src/javascript/view/ExploreView.js (version 2f008f48505fc61325a403829bc51e6443463828)
• 

  Nicholas Tenczar 28 Feb 2014 709f3f72311c9c9f48541c6827aad35bd43ca596

  Moved most of the template from script tags in the body of index.scala.html to individual scala.html pages. This should increase legibility. Also fixed a bug where double clicking a pill in the ExploreView doesn't open the detail view.

  • .target/views/index.scala.html (version 709f3f72311c9c9f48541c6827aad35bd43ca596)
  • app/views/explore.scala.html (version 709f3f72311c9c9f48541c6827aad35bd43ca596)
  • app/views/explore_data_nav.scala.html (version 709f3f72311c9c9f48541c6827aad35bd43ca596)
  • app/views/index.scala.html (version 709f3f72311c9c9f48541c6827aad35bd43ca596)
  • app/views/info_icon.scala.html (version 709f3f72311c9c9f48541c6827aad35bd43ca596)
  • app/views/info_window.scala.html (version 709f3f72311c9c9f48541c6827aad35bd43ca596)
  • app/views/map_pin.scala.html (version 709f3f72311c9c9f48541c6827aad35bd43ca596)
  • src/javascript/start.js (version 709f3f72311c9c9f48541c6827aad35bd43ca596)
  • src/javascript/view/MainMapView.js (version 709f3f72311c9c9f48541c6827aad35bd43ca596)
• 

  Luigi Marini 24 Feb 2014 b2a4629800c8164f25a658c8f00cc1eae6e52ec9

  Merge pull request #7 in GEOD/geodashboard from GEO-189 to master
  * commit 'c6850c433acb0ee82bd84aea735ddd27942de3db':
    search polygon shape GEO-189
• 

  Nicholas Tenczar 18 Feb 2014 8a20780e5399dc0c871d59d608870ef93047d2cf

  Merge pull request #9 in GEOD/geodashboard from GEO-207 to master
  * commit '2b7de0664989fb94de0acf2f8088ce9f0499ee20':
    Making a couple more changes where the modifications to Sensors in the database caused bugs in the dashboard.
• 

  Nicholas Tenczar 18 Feb 2014 2b7de0664989fb94de0acf2f8088ce9f0499ee20

  Making a couple more changes where the modifications to Sensors in the database caused bugs in the dashboard.

  • .target/views/index.scala.html (version 2b7de0664989fb94de0acf2f8088ce9f0499ee20)
  • app/views/index.scala.html (version 2b7de0664989fb94de0acf2f8088ce9f0499ee20)
  • src/javascript/view/MainMapView.js (version 2b7de0664989fb94de0acf2f8088ce9f0499ee20)
  • src/javascript/view/MiniMapView.js (version 2b7de0664989fb94de0acf2f8088ce9f0499ee20)
• 

  Rob Kooper 17 Feb 2014 fd942c1fcbae51ca68a7e14a7e9670917a1a86c5

  add public/javascripts/plugins.min.js to ignore

  • .gitignore (version fd942c1fcbae51ca68a7e14a7e9670917a1a86c5)
• 

  Nicholas Tenczar 17 Feb 2014 dc20ba31c6d01b2d35491aa7e6c8e6b3945bc61f

  Accidentally added a npm debug file that shouldn't be tracked. Removing that file.

  • src/npm-debug.log (version dc20ba31c6d01b2d35491aa7e6c8e6b3945bc61f)
• 

  Nicholas Tenczar 17 Feb 2014 8258c394fcfe1b22a95766750dc91633d418de70

  Made changes to support the slight change in the postgis database.

  • bin/model/GeoStreamService.js (version 8258c394fcfe1b22a95766750dc91633d418de70)
  • public/stylesheets/main.css (version 8258c394fcfe1b22a95766750dc91633d418de70)
  • src/javascript/view/AppView.js (version 8258c394fcfe1b22a95766750dc91633d418de70)
  • src/javascript/view/MainMapView.js (version 8258c394fcfe1b22a95766750dc91633d418de70)
  • src/npm-debug.log (version 8258c394fcfe1b22a95766750dc91633d418de70)
• 

  Rob Kooper 14 Feb 2014 c6850c433acb0ee82bd84aea735ddd27942de3db

  search polygon shape GEO-189

  • src/javascript/view/AdvancedSearchView.js (version c6850c433acb0ee82bd84aea735ddd27942de3db)
• 

  Nicholas Tenczar 11 Feb 2014 e9a55d47e73621ed1cacdb5d712c1bb6c6bedc7a

  Merge pull request #6 in GEOD/geodashboard from GEO-198 to master
  * commit '84396ba48301246c649a534d3f0afac8ab5200c6':
    Actually adding the change to .gitignore
    Removing plugins.js from tracked files.
• 

  Nicholas Tenczar 11 Feb 2014 84396ba48301246c649a534d3f0afac8ab5200c6

  Actually adding the change to .gitignore

  • .gitignore (version 84396ba48301246c649a534d3f0afac8ab5200c6)
• 

  Nicholas Tenczar 11 Feb 2014 9233983b11abb7a79430c4c2d22aff3a2881e7bc

  Removing plugins.js from tracked files.

  • public/javascripts/plugins.js (version 9233983b11abb7a79430c4c2d22aff3a2881e7bc)
• 

  Nicholas Tenczar 11 Feb 2014 8ce3a915b59548ee2144b753c304d904adb05bc0

  Merge pull request #5 in GEOD/geodashboard from GEO-198 to master
  * commit '3b3001f2bb000f3a59009e3fba2d1833c8afde7c':
    Made changes in the nomenclature of 'selector-marker' to 'explore-pill' and 'marker-color' to 'map-pin-color.' These are far more intuitive and less ambiguous.
• 

  Nicholas Tenczar 05 Feb 2014 3b3001f2bb000f3a59009e3fba2d1833c8afde7c

  Made changes in the nomenclature of 'selector-marker' to 'explore-pill' and 'marker-color' to 'map-pin-color.' These are far more intuitive and less ambiguous.

  • .target/views/index.scala.html (version 3b3001f2bb000f3a59009e3fba2d1833c8afde7c)
  • app/views/index.scala.html (version 3b3001f2bb000f3a59009e3fba2d1833c8afde7c)
  • bin/views/html/index$$anonfun$f$1$$anonfun$apply$1.class (version 3b3001f2bb000f3a59009e3fba2d1833c8afde7c)
  • bin/views/html/index$$anonfun$f$1.class (version 3b3001f2bb000f3a59009e3fba2d1833c8afde7c)
  • bin/views/html/index$.class (version 3b3001f2bb000f3a59009e3fba2d1833c8afde7c)
  • public/javascripts/plugins.js (version 3b3001f2bb000f3a59009e3fba2d1833c8afde7c)
  • public/stylesheets/main.css (version 3b3001f2bb000f3a59009e3fba2d1833c8afde7c)
  • src/javascript/view/ExploreView.js (version 3b3001f2bb000f3a59009e3fba2d1833c8afde7c)
• 

  Nicholas Tenczar 05 Feb 2014 5860451ddae3166d1a9076e165be694b23d1ce3a

  Merge pull request #3 in GEOD/geodashboard from docco to master
  * commit 'b2efe8ea2df7e61d851bb94a9dcab170321cf6ea':
    add sublime project files to gitignore
    documentation for model and StationService.
    inline comments and doc generation: GeoStreamService, datapoints, event
    adding documentation for datapoints.js
    documentation for start.js
    adding grunt-docco and the docs/ directory. Inline comments in your JS files are then used to create html (pretty) documentation. After running 'npm install', you should be able to run 'grunt docs'.
• 

  Brock Angelo 05 Feb 2014 b2efe8ea2df7e61d851bb94a9dcab170321cf6ea

  add sublime project files to gitignore

  • .gitignore (version b2efe8ea2df7e61d851bb94a9dcab170321cf6ea)
• 

  Brock Angelo 04 Feb 2014 fea576a0ce8e6c03187af0e261a96e46821c9884

  documentation for model and StationService.

  • src/docs/StationService.html (version fea576a0ce8e6c03187af0e261a96e46821c9884)
  • src/docs/model.html (version fea576a0ce8e6c03187af0e261a96e46821c9884)
  • src/javascript/model/StationService.js (version fea576a0ce8e6c03187af0e261a96e46821c9884)
  • src/javascript/model/model.js (version fea576a0ce8e6c03187af0e261a96e46821c9884)
• 

  Brock Angelo 04 Feb 2014 fa8e1457475aa90332142beec5a99eee69f899f4

  inline comments and doc generation: GeoStreamService, datapoints, event

  • src/docs/GeoStreamService.html (version fa8e1457475aa90332142beec5a99eee69f899f4)
  • src/docs/datapoints.html (version fa8e1457475aa90332142beec5a99eee69f899f4)
  • src/docs/event.html (version fa8e1457475aa90332142beec5a99eee69f899f4)
  • src/javascript/event/event.js (version fa8e1457475aa90332142beec5a99eee69f899f4)
  • src/javascript/model/GeoStreamService.js (version fa8e1457475aa90332142beec5a99eee69f899f4)
• 

  Brock Angelo 04 Feb 2014 14a9291224d109d076fccff5ac3b26f82bf88e22

  adding documentation for datapoints.js

  • src/javascript/collection/datapoints.js (version 14a9291224d109d076fccff5ac3b26f82bf88e22)
• 

  Brock Angelo 04 Feb 2014 49ae444eae10fa52b1d62531605245f834f3c247

  documentation for start.js

  • src/docs/start.html (version 49ae444eae10fa52b1d62531605245f834f3c247)
  • src/javascript/start.js (version 49ae444eae10fa52b1d62531605245f834f3c247)
• 

  Brock Angelo 04 Feb 2014 b02bb8f182bf2e9743f2fdc7834f4aad71481c5b

  adding grunt-docco and the docs/ directory. Inline comments in your JS files are then used to create html (pretty) documentation. After running 'npm install', you should be able to run 'grunt docs'.

  • src/Gruntfile.js (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/AdvancedSearchView.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/AppRouter.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/AppView.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/ControlsView.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/DetailView.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/EventBus.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/ExploreView.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/GeoStreamService.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/LimnologyView.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/MainMapView.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/MapView.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/MiniMapView.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/StationService.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/TimeSeriesView.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/datapoints.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/docco.css (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/end.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/event.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/model.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/fonts/aller-bold.eot (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/fonts/aller-bold.ttf (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/fonts/aller-bold.woff (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/fonts/aller-light.eot (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/fonts/aller-light.ttf (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/fonts/aller-light.woff (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/fonts/fleurons.eot (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/fonts/fleurons.ttf (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/fonts/fleurons.woff (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/fonts/novecento-bold.eot (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/fonts/novecento-bold.ttf (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/fonts/novecento-bold.woff (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/images/gray.png (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/public/stylesheets/normalize.css (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/router.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/sensor.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/sensors.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/start.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/docs/view.html (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
  • src/package.json (version b02bb8f182bf2e9743f2fdc7834f4aad71481c5b)
• 

  Brock Angelo 03 Feb 2014 72f92a877c88e89b165907cb8a11f4bea25be961

  update StationService to use app.mediciUrl

  • src/javascript/model/StationService.js (version 72f92a877c88e89b165907cb8a11f4bea25be961)