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 03:06:23 UTC
[3/3] climate git commit: Merge branch 'CLIMATE-945' of
https://github.com/MichaelArthurAnderson/climate
Merge branch 'CLIMATE-945' 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/3be7da88
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/3be7da88
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/3be7da88
Branch: refs/heads/master
Commit: 3be7da888f75b0a426e5108787b86cd9bc6f2bb0
Parents: d4d2eab ac52e38
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Tue Jan 16 19:06:17 2018 -0800
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Tue Jan 16 19:06:17 2018 -0800
----------------------------------------------------------------------
ocw-ui/frontend/.jscsrc | 17 +++++++++++++++++
ocw-ui/frontend/Gruntfile.js | 9 +++++++++
ocw-ui/frontend/app/views/modelselect.html | 2 +-
ocw-ui/frontend/package.json | 2 ++
4 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/3be7da88/ocw-ui/frontend/package.json
----------------------------------------------------------------------
diff --cc ocw-ui/frontend/package.json
index d158a20,99cafcb..844c76e
--- a/ocw-ui/frontend/package.json
+++ b/ocw-ui/frontend/package.json
@@@ -30,8 -30,9 +31,9 @@@
"grunt-contrib-watch": "^0.6.1",
"grunt-filerev": "^0.2.1",
"grunt-google-cdn": "^0.4.0",
- "grunt-karma": "^0.8.3",
+ "grunt-karma": "^0.12.2",
"grunt-newer": "^0.7.0",
+ "grunt-ngmin": "^0.0.3",
"grunt-ng-annotate": "^0.1.0",
"grunt-svgmin": "^0.4.0",
"grunt-usemin": "^2.1.1",