Merge branch 'master' of github.com:torkelo/grafana-private into pro

package.json

@@ -30,6 +30,7 @@
     "grunt-filerev": "^0.2.1",
     "grunt-git-describe": "~2.3.2",
     "grunt-karma": "~0.8.3",
+    "grunt-ng-annotate": "^0.9.2",
     "grunt-ngmin": "0.0.3",
     "grunt-string-replace": "~0.2.4",
     "grunt-usemin": "3.0.0",
@@ -44,7 +45,7 @@
     "karma-html2js-preprocessor": "~0.1.0",
     "karma-jasmine": "~0.2.2",
     "karma-mocha": "~0.1.4",
-    "karma-phantomjs-launcher": "~0.1.1",
+    "karma-phantomjs-launcher": "~0.1.4",
     "karma-requirejs": "~0.2.1",
     "karma-script-launcher": "~0.1.0",
     "load-grunt-tasks": "~0.2.0",
@@ -62,7 +63,7 @@
   },
   "license": "Apache License",
   "dependencies": {
-    "grunt-jscs-checker": "^0.4.4",
+    "grunt-jscs": "^0.8.1",
     "karma-sinon": "^1.0.3",
     "lodash": "^2.4.1",
     "sinon": "^1.10.3"

tasks/build_task.js

@@ -15,7 +15,7 @@ module.exports = function(grunt) {
     'ngtemplates',
     'cssmin:build',
     'build:grafanaVersion',
-    'ngmin:build',
+    'ngAnnotate:build',
     'requirejs:build',
     'concat:js',
     'filerev',

tasks/options/ngmin.js → tasks/options/ngAnnotate.js

@@ -1,7 +1,7 @@
 module.exports = function(config) {
   return {
     build: {
-      expand:true,
+      expand: true,
       cwd:'<%= tempDir %>',
       src: [
         'app/controllers/**/*.js',