You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by le...@apache.org on 2018/01/17 02:06:31 UTC

[1/2] climate git commit: CLIMATE-366 Add full temporal rebin option to UI

Repository: climate
Updated Branches:
  refs/heads/master 47940c4e1 -> 09b47299b


CLIMATE-366 Add full temporal rebin option to UI


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/18e3a163
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/18e3a163
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/18e3a163

Branch: refs/heads/master
Commit: 18e3a1635b364ac0336c529400bf073338ecaf56
Parents: 4cf79f3
Author: Michael Anderson <mi...@Michaels-iMac.local>
Authored: Fri Jan 5 05:42:02 2018 -0500
Committer: Michael Anderson <mi...@Michaels-iMac.local>
Committed: Fri Jan 5 05:42:02 2018 -0500

----------------------------------------------------------------------
 ocw-ui/frontend/app/scripts/services/evaluationsettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/18e3a163/ocw-ui/frontend/app/scripts/services/evaluationsettings.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/scripts/services/evaluationsettings.js b/ocw-ui/frontend/app/scripts/services/evaluationsettings.js
index b53842c..7d40a87 100644
--- a/ocw-ui/frontend/app/scripts/services/evaluationsettings.js
+++ b/ocw-ui/frontend/app/scripts/services/evaluationsettings.js
@@ -42,7 +42,7 @@ angular.module('ocwUiApp')
     var settings = {
       'metrics': [],
       'temporal': {
-        'options': ['daily', 'monthly', 'yearly'],
+        'options': ['daily', 'monthly', 'annual', 'full'],
         'selected': 'yearly',
       },
       'spatialSelect': null,


[2/2] climate git commit: Merge branch 'CLIMATE-366' of https://github.com/MichaelArthurAnderson/climate

Posted by le...@apache.org.
Merge branch 'CLIMATE-366' 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/09b47299
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/09b47299
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/09b47299

Branch: refs/heads/master
Commit: 09b47299bf079eb7d4c0db44868d9fd28e003b9f
Parents: 47940c4 18e3a16
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Tue Jan 16 18:06:26 2018 -0800
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Tue Jan 16 18:06:26 2018 -0800

----------------------------------------------------------------------
 ocw-ui/frontend/app/scripts/services/evaluationsettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------