Commit 54714396 authored by Dylan Weiss's avatar Dylan Weiss
Browse files

Merge branch 'develop'

parents 5c8947f3 32a20d30
......@@ -106,6 +106,7 @@ module.exports = function(grunt) {
}
});
grunt.registerTask('lint', ['jshint', 'jscs']);
grunt.registerTask('default', ['sass', 'cssmin', 'jshint', 'jscs', 'copy', 'uglify']);
grunt.registerTask('e2e-test', ['connect', 'protractor_webdriver', 'protractor']);
};
This diff is collapsed.
......@@ -9,7 +9,7 @@
},
"scripts": {
"build": "grunt ; doctoc ./README.md ; doctoc ./doc/README.md ; doctoc ./doc/CHANGES.md",
"test": "karma start karma.conf.js"
"test": "grunt lint && karma start karma.conf.js"
},
"keywords": [
"gridstack",
......@@ -19,7 +19,9 @@
"jquery"
],
"author": "Pavel Reznikov <pashka.reznikov@gmail.com>",
"contributors": ["Dylan Weiss <dylan.weiss@gmail.com> (https://dylandreams.com)"],
"contributors": [
"Dylan Weiss <dylan.weiss@gmail.com> (https://dylandreams.com)"
],
"license": "MIT",
"bugs": {
"url": "https://github.com/troolee/gridstack.js/issues"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment