Merge branch 'master' of https://github.com/DaftMonk/generator-angular-fullstack into gulp

Author: Awk34

app/templates/Gruntfile.js

@@ -349,7 +349,7 @@ module.exports = function (grunt) {
         files: [{
           expand: true,
           cwd: '.tmp/concat',
-          src: '*/**.js',
+          src: '**/*.js',
           dest: '.tmp/concat'
         }]
       }

app/templates/_package.json

@@ -15,7 +15,7 @@
     "lodash": "~3.9.3",<% if(filters.jade) { %>
     "jade": "~1.2.0",<% } %><% if(filters.html) { %>
     "ejs": "~0.8.4",<% } %><% if(filters.mongoose) { %>
-    "mongoose": "~3.8.8",<% } %><% if(filters.auth) { %>
+    "mongoose": "~4.0.3",<% } %><% if(filters.auth) { %>
     "jsonwebtoken": "^5.0.0",
     "express-jwt": "^3.0.0",
     "passport": "~0.2.0",
@@ -24,7 +24,7 @@
     "passport-twitter": "latest",<% } %><% if(filters.googleAuth) { %>
     "passport-google-oauth": "latest",<% } %>
     "composable-middleware": "^0.3.0",
-    "connect-mongo": "^0.4.1"<% if(filters.socketio) { %>,
+    "connect-mongo": "^0.8.1"<% if(filters.socketio) { %>,
     "socket.io": "^1.0.6",
     "socket.io-client": "^1.0.6",
     "socketio-jwt": "^3.0.0"<% } %>

app/templates/client/.jshintrc

@@ -7,12 +7,10 @@
   "curly": true,
   "eqeqeq": true,
   "immed": true,
-  "indent": 2,
   "latedef": true,
   "newcap": true,
   "noarg": true,
   "quotmark": "single",
-  "regexp": true,
   "undef": true,
   "unused": true,
   "strict": true,

app/templates/server/.jshintrc

@@ -7,7 +7,6 @@
   "latedef": "nofunc",
   "newcap": true,
   "noarg": true,
-  "regexp": true,
   "undef": true,
   "smarttabs": true,
   "asi": true,

contributing.md

@@ -10,6 +10,12 @@ Additionally for this generator:
 * When submitting a bugfix, write a test that exposes the bug and fails before applying your fix. Submit the test alongside the fix.
 * When submitting a new feature, add tests that cover the feature.
 
+To run the generator:
+1. Clone it and `cd` to its root
+2. `npm install`
+3. `npm link` (tells NPM to look to your own version)
+4. `yo angular-fullstack` as normal. It should run from your cloned version rather than the one downloaded from NPM.
+
 ## Git Commit Guidelines
 
 These rules are adopted from the AngularJS project.

readme.md

@@ -1,4 +1,5 @@
-# AngularJS Full-Stack generator [![Build Status](https://travis-ci.org/DaftMonk/generator-angular-fullstack.svg?branch=master)](http://travis-ci.org/DaftMonk/generator-angular-fullstack) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/DaftMonk/generator-angular-fullstack)
+# AngularJS Full-Stack generator
+[![Build Status](https://travis-ci.org/DaftMonk/generator-angular-fullstack.svg?branch=master)](http://travis-ci.org/DaftMonk/generator-angular-fullstack) ![](https://david-dm.org/daftmonk/generator-angular-fullstack.png) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/DaftMonk/generator-angular-fullstack)
 
 > Yeoman generator for creating MEAN stack applications, using MongoDB, Express, AngularJS, and Node - lets you quickly set up a project following best practices.
 
@@ -57,6 +58,7 @@ A grunt task looks for new files in your `client/app` and `client/components` fo
 * `css` files into `client/index.html`
 * `js` files into `client/index.html`
 * `coffeescript` temp `js` files into `client/index.html`
+* `babel` temp `js` files into `client/index.html`
 
 ## Generators