Merge pull request #104 from marmelab/0.3

[RFR] Add views
marmelab · Nov 13, 2014 · 49c54fb · 49c54fb
2 parents 3adba4d + c3b7c94
commit 49c54fb
Show file tree

Hide file tree

Showing 143 changed files with 3,918 additions and 2,372 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,6 +1,7 @@
-'use strict';
+/*global module*/
 
 module.exports = function (grunt) {
+    'use strict';
 
     // Define the configuration for all the tasks
     grunt.initConfig({
@@ -77,15 +78,15 @@ module.exports = function (grunt) {
         // Watches files for changes and runs tasks based on the changed files
         watch: {
             configFiles: {
-                files: ['Gruntfile.js','grunt/grunt-*.json'],
+                files: ['Gruntfile.js', 'grunt/grunt-*.json'],
                 tasks: ['build:dev'],
                 options: {
                     // reload watchers since configuration may have changed
                     reload: true
                 }
             },
             javascripts: {
-                files: ['src/javascripts/ng-admin/**/*.js', 'src/javascripts/ng-admin/**/*.html'],
+                files: ['src/javascripts/ng-admin/**/**/*.js', 'src/javascripts/ng-admin/**/**/*.html'],
                 tasks: ['requirejs:dev']
             },
             sass: {

diff --git a/Makefile b/Makefile
@@ -1,3 +1,6 @@
 install:
 	bower install
 	npm install
+
+test:
+	@grunt test