Merge branch 'master' into adrianlzt-bug/show_multiple_tags_with_influxdb
Showing
... | ... | @@ -10,51 +10,50 @@ |
"url": "http://github.com/grafana/grafana.git" | ||
}, | ||
"devDependencies": { | ||
"zone.js": "^0.6.6", | ||
"autoprefixer": "^6.4.0", | ||
"es6-promise": "^3.0.2", | ||
"es6-shim": "^0.35.1", | ||
"expect.js": "~0.2.0", | ||
"glob": "~7.1.1", | ||
"grunt": "~0.4.0", | ||
"grunt-angular-templates": "^0.5.5", | ||
"grunt-cli": "~0.1.13", | ||
"grunt-contrib-clean": "~0.7.0", | ||
"glob": "~7.0.0", | ||
"grunt": "^0.4.5", | ||
"grunt-angular-templates": "^1.1.0", | ||
"grunt-cli": "~1.2.0", | ||
"grunt-contrib-clean": "~1.0.0", | ||
"grunt-contrib-compress": "^1.3.0", | ||
"grunt-contrib-concat": "^0.5.1", | ||
"grunt-contrib-copy": "~0.8.2", | ||
"grunt-contrib-cssmin": "~0.14.0", | ||
"grunt-contrib-htmlmin": "~0.6.0", | ||
"grunt-contrib-jshint": "~1.0.0", | ||
"grunt-contrib-uglify": "~0.11.0", | ||
"grunt-contrib-watch": "^0.6.1", | ||
"grunt-filerev": "^0.2.1", | ||
"grunt-git-describe": "~2.3.2", | ||
"grunt-karma": "~0.12.2", | ||
"grunt-ng-annotate": "^1.0.1", | ||
"grunt-notify": "^0.4.3", | ||
"grunt-contrib-concat": "^1.0.1", | ||
"grunt-contrib-copy": "~1.0.0", | ||
"grunt-contrib-cssmin": "~1.0.2", | ||
"grunt-contrib-htmlmin": "~2.0.0", | ||
"grunt-contrib-jshint": "~1.1.0", | ||
"grunt-contrib-uglify": "~2.0.0", | ||
"grunt-contrib-watch": "^1.0.0", | ||
"grunt-exec": "^1.0.1", | ||
"grunt-filerev": "^2.3.1", | ||
"grunt-git-describe": "~2.4.2", | ||
"grunt-karma": "~2.0.0", | ||
"grunt-ng-annotate": "^3.0.0", | ||
"grunt-notify": "^0.4.5", | ||
"grunt-postcss": "^0.8.0", | ||
"grunt-sass": "^1.1.0", | ||
"grunt-string-replace": "~1.2.1", | ||
"grunt-systemjs-builder": "^0.2.6", | ||
"grunt-tslint": "^3.0.2", | ||
"grunt-typescript": "^0.8.0", | ||
"grunt-usemin": "3.0.0", | ||
"jshint-stylish": "~2.1.0", | ||
"karma": "0.13.22", | ||
"karma-chrome-launcher": "~0.2.2", | ||
"karma-coverage": "0.5.3", | ||
"grunt-sass": "^1.2.1", | ||
"grunt-string-replace": "~1.3.1", | ||
"grunt-systemjs-builder": "^0.2.7", | ||
"grunt-usemin": "3.1.1", | ||
"jshint-stylish": "~2.2.1", | ||
"karma": "1.3.0", | ||
"karma-chrome-launcher": "~2.0.0", | ||
"karma-coverage": "1.1.1", | ||
"karma-coveralls": "1.1.2", | ||
"karma-expect": "~1.1.0", | ||
"karma-mocha": "~0.2.1", | ||
"karma-phantomjs-launcher": "1.0.0", | ||
"load-grunt-tasks": "3.4.0", | ||
"mocha": "2.3.4", | ||
"phantomjs-prebuilt": "^2.1.7", | ||
"reflect-metadata": "0.1.2", | ||
"rxjs": "5.0.0-beta.4", | ||
"sass-lint": "^1.7.0", | ||
"systemjs": "0.19.24" | ||
"karma-expect": "~1.1.3", | ||
"karma-mocha": "~1.3.0", | ||
"karma-phantomjs-launcher": "1.0.2", | ||
"load-grunt-tasks": "3.5.2", | ||
"mocha": "3.2.0", | ||
"phantomjs-prebuilt": "^2.1.13", | ||
"reflect-metadata": "0.1.8", | ||
"rxjs": "^5.0.0-rc.5", | ||
"sass-lint": "^1.10.2", | ||
"systemjs": "0.19.41", | ||
"zone.js": "^0.7.2" | ||
}, | ||
"engines": { | ||
"node": "4.x", | ||
... | ... | @@ -67,21 +66,21 @@ |
}, | ||
"license": "Apache-2.0", | ||
"dependencies": { | ||
"eventemitter3": "^1.2.0", | ||
"eventemitter3": "^2.0.2", | ||
"gaze": "^1.1.2", | ||
"grunt-jscs": "~1.5.x", | ||
"grunt-sass-lint": "^0.2.0", | ||
"grunt-sync": "^0.4.1", | ||
"karma-sinon": "^1.0.3", | ||
"lodash": "^2.4.1", | ||
"grunt-jscs": "3.0.1", | ||
"grunt-sass-lint": "^0.2.2", | ||
"grunt-sync": "^0.6.2", | ||
"karma-sinon": "^1.0.5", | ||
"lodash": "^4.17.2", | ||
"mousetrap": "^1.6.0", | ||
"remarkable": "^1.6.2", | ||
"sinon": "1.16.1", | ||
"systemjs-builder": "^0.15.13", | ||
"tether": "^1.2.0", | ||
"remarkable": "^1.7.1", | ||
"sinon": "1.17.6", | ||
"systemjs-builder": "^0.15.34", | ||
"tether": "^1.4.0", | ||
"tether-drop": "^1.4.2", | ||
"tslint": "^3.4.0", | ||
"typescript": "^1.7.5", | ||
"tslint": "^4.0.2", | ||
"typescript": "^2.1.4", | ||
"virtual-scroll": "^1.1.1" | ||
} | ||
} |
tasks/options/exec.js
0 → 100644
tasks/options/tslint.js
deleted
100644 → 0
tasks/options/typescript.js
deleted
100644 → 0
tsd.json
deleted
100644 → 0
Please
register
or
sign in
to comment