Merge branch 'CLIMATE-943' of https://github.com/MichaelArthurAnderson/climate
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/d4d2eab5 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/d4d2eab5 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/d4d2eab5 Branch: refs/heads/master Commit: d4d2eab5d200f7ae2a71f808b0d6fde3f6759698 Parents: 08c565d 50b9d98 Author: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Authored: Tue Jan 16 19:05:07 2018 -0800 Committer: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Committed: Tue Jan 16 19:05:07 2018 -0800 ---------------------------------------------------------------------- .../app/scripts/controllers/parameterselect.js | 31 +++++++++++++++----- .../app/scripts/controllers/rcmedselection.js | 24 ++++++++------- .../app/scripts/controllers/timeline.js | 16 +++++----- .../app/scripts/controllers/worldmap.js | 4 +-- ocw-ui/frontend/app/views/main.html | 20 ++++++------- ocw-ui/frontend/bower.json | 14 ++++----- 6 files changed, 64 insertions(+), 45 deletions(-) ----------------------------------------------------------------------
