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

Author: Awk34

Diff for: CHANGELOG.md

@@ -1,3 +1,30 @@
+<a name="3.1.1"></a>
+## [3.1.1](https://github.com/DaftMonk/generator-angular-fullstack/compare/3.1.0...v3.1.1) (2015-12-15)
+
+
+### Bug Fixes
+
+* client:auth.decorator: fix Auth.isLoggedIn not having a noop arg ([0e9f302](https://github.com/angular-fullstack/generator-angular-fullstack/commit/0e9f3025fbe69c8613435e59d028cf6ce9b0e9e4))
+
+
+<a name="3.1.0"></a>
+## [3.1.0](https://github.com/DaftMonk/generator-angular-fullstack/compare/3.0.2...v3.1.0) (2015-12-13)
+
+
+### Bug Fixes
+
+* **client:auth:** fix auth 'decorator' ([56d12fc](https://github.com/DaftMonk/generator-angular-fullstack/commit/56d12fc)), closes [#1492](https://github.com/DaftMonk/generator-angular-fullstack/issues/1492)
+* **gulp:** 
+  * add babel runtime options ([0a9afa1](https://github.com/DaftMonk/generator-angular-fullstack/commit/0a9afa1))
+  * update gulp.src in build:client ([6f4d3b0](https://github.com/DaftMonk/generator-angular-fullstack/commit/6f4d3b0))
+* **navbar:** fix controller constructor with ng-route + auth ([4b59e1f](https://github.com/DaftMonk/generator-angular-fullstack/commit/4b59e1f)), closes [#1462](https://github.com/DaftMonk/generator-angular-fullstack/issues/1462)
+
+### Features
+
+* **admin:** spruce up the look of the user list ([38bb6b8](https://github.com/DaftMonk/generator-angular-fullstack/commit/38bb6b8))
+* **gulp:** add experimental Gulp support ([c70fd47](https://github.com/DaftMonk/generator-angular-fullstack/commit/c70fd47)) `yo angular-fullstack --gulp`
+
+
 <a name="3.0.2"></a>
 ## [3.0.2](https://github.com/DaftMonk/generator-angular-fullstack/compare/3.0.1...3.0.2) (2015-12-05)
 

Diff for: angular-fullstack-deps

@@ -145,7 +145,7 @@ export default class Generator extends Base {
 
             this.scriptExt = answers.script === 'coffee' ? 'coffee' : 'js';
             this.templateExt = answers.markup;
-            this.styleExt = answers.stylesheet;
+            this.styleExt = answers.stylesheet === 'sass' ? 'scss' : answers.stylesheet;
 
             cb();
           }.bind(this));

Diff for: app/generator.js

@@ -160,8 +160,9 @@
     "npm": "^2.14.7"
   },
   "scripts": {
-    "start": "node server",
-    "test": "<%= filters.grunt ? 'grunt' : 'gulp' %> test",
+    "start": "node server",<% if(filters.gulp) { %>
+    "test": "gulp test",<% } else { %>
+    "test": "grunt test",<% } %>
     "update-webdriver": "node node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update"
   },
   "private": true

Diff for: app/templates/_package.json

@@ -17,7 +17,7 @@ angular.module('<%= scriptAppName %>.auth')
           }
 
           event.preventDefault();
-          return Auth.isLoggedIn().then(is => {<% if (filters.ngroute) { %>
+          return Auth.isLoggedIn(_.noop).then(is => {<% if (filters.ngroute) { %>
             $location.path(is ? '/' : '/login');<% } if (filters.uirouter) { %>
             $state.go(is ? 'main' : 'login');<% } %>
           });

Diff for: app/templates/client/components/auth(auth)/router.decorator.js

@@ -1,6 +1,6 @@
 {
   "name": "generator-angular-fullstack",
-  "version": "3.0.2",
+  "version": "3.1.1",
   "description": "Yeoman generator for creating MEAN stack applications, using MongoDB, Express, AngularJS, and Node",
   "keywords": [
     "yeoman-generator",