Merge branch 'master' into canary

Author: DaftMonk

Diff for: CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v2.0.13"></a>
+### v2.0.13 (2014-08-29)
+
+
+#### Bug Fixes
+
+* **gen:**
+  * use bool for bootstrap filters ([a5decbc3](http://github.com/DaftMonk/generator-angular-fullstack/commit/a5decbc36e933f94c69d9e9bb58bd8e07148c34d), closes [#496](http://github.com/DaftMonk/generator-angular-fullstack/issues/496))
+  * fix build when not selecting socket.io ([fdf063c6](http://github.com/DaftMonk/generator-angular-fullstack/commit/fdf063c6cc2ec4eeef252f13b2e0d301931fa83c))
+
 <a name="v2.0.12"></a>
 ### v2.0.12 (2014-08-25)
 

Diff for: Gruntfile.js

@@ -136,6 +136,8 @@ module.exports = function (grunt) {
         markup: 'html',
         stylesheet: 'sass',
         router: 'uirouter',
+        bootstrap: true,
+        uibootstrap: true,
         mongoose: true,
         auth: true,
         oauth: ['googleAuth', 'twitterAuth'],

Diff for: app/index.js

@@ -114,8 +114,8 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
         this.filters[answers.markup] = true;
         this.filters[answers.stylesheet] = true;
         this.filters[answers.router] = true;
-        this.filters.bootstrap = answers.bootstrap;
-        this.filters.uibootstrap =  answers.uibootstrap;
+        this.filters.bootstrap = !!answers.bootstrap;
+        this.filters.uibootstrap =  !!answers.uibootstrap;
       cb();
       }.bind(this));
   },

Diff for: app/templates/client/index.html

@@ -44,10 +44,10 @@
     <script src="bower_components/es5-shim/es5-shim.js"></script>
     <script src="bower_components/json3/lib/json3.min.js"></script>
     <![endif]-->
-    <!-- build:js({client<% if(filters.socketio) { %>,node_modules<% } %>}) app/vendor.js -->
+    <!-- build:js({client,node_modules}) app/vendor.js -->
       <!-- bower:js -->
-      <!-- endbower -->
-      <% if(filters.socketio) { %><script src="socket.io-client/socket.io.js"></script><% } %>
+      <!-- endbower --><% if(filters.socketio) { %>
+      <script src="socket.io-client/socket.io.js"></script><% } %>
     <!-- endbuild -->
 
         <!-- build:js({.tmp,client}) app/app.js -->

Diff for: package.json

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

Diff for: test/test-file-creation.js

@@ -14,6 +14,8 @@ describe('angular-fullstack generator', function () {
     markup: 'html',
     stylesheet: 'sass',
     router: 'uirouter',
+    bootstrap: true,
+    uibootstrap: true,
     mongoose: true,
     auth: true,
     oauth: [],