Merge remote-tracking branch 'upstream/master'

README.md

@@ -64,7 +64,7 @@ $ npm install
 This command does a few things:
 * First it will install the dependencies needed for the application to run.
 * If you're running in a development environment, it will then also install development dependencies needed for testing and running your application.
-* Finally, when the install process is over, npm will initiate a bower install command to install all the front-end modules needed for the application
+* Finally, when the install process is over, npm will initiate a bower install command to install all the front-end modules needed for the application.
 
 ## Running Your Application
 After the install process is over, you'll be able to run your application using Grunt, just run grunt default task:
@@ -110,7 +110,7 @@ Windows users can follow instructions found [here](http://www.websense.com/suppo
 To generate the key and certificate and place them in the *config/sslcert* folder.
 
 ## Getting Started With MEAN.JS
-You have your application running but there are a lot of stuff to understand, we recommend you'll go over the [Official Documentation](http://meanjs.org/docs.html). 
+You have your application running but there is a lot of stuff to understand, we recommend you'll go over the [Official Documentation](http://meanjs.org/docs.html). 
 In the docs we'll try to explain both general concepts of MEAN components and give you some guidelines to help you improve your development process. We tried covering as many aspects as possible, and will keep update it by your request, you can also help us develop the documentation better by checking out the *gh-pages* branch of this repository.
 
 ## Community

app/controllers/users/users.password.server.controller.js

@@ -12,6 +12,8 @@ var _ = require('lodash'),
 	nodemailer = require('nodemailer'),
 	async = require('async'),
 	crypto = require('crypto');
+
+var smtpTransport = nodemailer.createTransport(config.mailer.options);
 
 /**
  * Forgot for reset password (forgot POST)
@@ -65,7 +67,6 @@ exports.forgot = function(req, res, next) {
 		},
 		// If valid email, send reset email using service
 		function(emailHTML, user, done) {
-			var smtpTransport = nodemailer.createTransport(config.mailer.options);
 			var mailOptions = {
 				to: user.email,
 				from: config.mailer.from,
@@ -77,6 +78,10 @@ exports.forgot = function(req, res, next) {
 					res.send({
 						message: 'An email has been sent to ' + user.email + ' with further instructions.'
 					});
+				} else {
+					return res.status(400).send({
+						message: 'Failure sending email'
+					});
 				}
 
 				done(err);
@@ -167,7 +172,6 @@ exports.reset = function(req, res, next) {
 		},
 		// If valid email, send reset email using service
 		function(emailHTML, user, done) {
-			var smtpTransport = nodemailer.createTransport(config.mailer.options);
 			var mailOptions = {
 				to: user.email,
 				from: config.mailer.from,
@@ -242,4 +246,4 @@ exports.changePassword = function(req, res) {
 			message: 'User is not signed in'
 		});
 	}
-};
+};

app/models/user.server.model.js

@@ -50,7 +50,7 @@ var UserSchema = new Schema({
 	},
 	username: {
 		type: String,
-		unique: 'testing error message',
+		unique: 'Username already exists',
 		required: 'Please fill in a username',
 		trim: true
 	},

bower.json

@@ -9,7 +9,8 @@
 		"angular-animate": "~1.2",
 		"angular-mocks": "~1.2",
 		"angular-bootstrap": "~0.11.2",
+		"angular-bootstrap": "~0.12.0",
 		"angular-ui-utils": "~0.1.1",
 		"angular-ui-router": "~0.2.11" 
 	}
-}
+}

gruntfile.js

@@ -31,7 +31,7 @@ module.exports = function(grunt) {
 			clientViews: {
 				files: watchFiles.clientViews,
 				options: {
-					livereload: true,
+					livereload: true
 				}
 			},
 			clientJS: {
@@ -59,7 +59,7 @@ module.exports = function(grunt) {
 		},
 		csslint: {
 			options: {
-				csslintrc: '.csslintrc',
+				csslintrc: '.csslintrc'
 			},
 			all: {
 				src: watchFiles.clientCSS

karma.conf.js

@@ -16,7 +16,6 @@ module.exports = function(config) {
 
 		// Test results reporter to use
 		// Possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
-		//reporters: ['progress'],
 		reporters: ['progress'],
 
 		// Web server port
@@ -49,4 +48,4 @@ module.exports = function(config) {
 		// If true, it capture browsers, run tests and exit
 		singleRun: true
 	});
-};
+};

public/modules/core/views/header.client.view.html

@@ -11,7 +11,7 @@
 	<nav class="collapse navbar-collapse" collapse="!isCollapsed" role="navigation">
 		<ul class="nav navbar-nav" data-ng-if="menu.shouldRender(authentication.user);">
 			<li data-ng-repeat="item in menu.items | orderBy: 'position'" data-ng-if="item.shouldRender(authentication.user);" ng-switch="item.menuItemType" ui-route="{{item.uiRoute}}" class="{{item.menuItemClass}}" ng-class="{active: ($uiRoute)}" dropdown="item.menuItemType === 'dropdown'">
-				<a ng-switch-when="dropdown" class="dropdown-toggle">
+				<a ng-switch-when="dropdown" class="dropdown-toggle" dropdown-toggle>
 					<span data-ng-bind="item.title"></span>
 					<b class="caret"></b>
 				</a>
@@ -33,8 +33,8 @@
 			</li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right" data-ng-show="authentication.user">
-			<li class="dropdown">
-				<a href="#" class="dropdown-toggle" data-toggle="dropdown">
+			<li class="dropdown" dropdown>
+				<a href="#" class="dropdown-toggle" data-toggle="dropdown" dropdown-toggle>
 					<span data-ng-bind="authentication.user.displayName"></span> <b class="caret"></b>
 				</a>
 				<ul class="dropdown-menu">

public/modules/core/views/home.client.view.html

@@ -54,7 +54,7 @@ <h2>
 			<h2>
 				<strong>E</strong>xpress
 			</h2>
-			<p><a target="_blank" href="http://expressjs.com/"> Express</a> is an app server. Check out <a target="_blank" href="http://expressjs.com/guide/error-handling.html">The ExpressJS guide for general topics</a> or <a target="_blank" href="http://stackoverflow.com/questions/8144214/learning-express-for-node-js">StackOverflow</a> for more info.</p>
+			<p><a target="_blank" href="http://expressjs.com/"> Express</a> is an app server. Check out <a target="_blank" href="http://expressjs.com/4x/api.html">The ExpressJS API reference for more information</a> or <a target="_blank" href="http://stackoverflow.com/questions/8144214/learning-express-for-node-js">StackOverflow</a> for more info.</p>
 		</div>
 		<div class="col-md-3">
 			<h2>
@@ -91,4 +91,4 @@ <h2>MEAN.JS Documentation</h2>
 	</div>
 	<br>Enjoy &amp; Keep Us Updated,
 	<br>The MEAN.JS Team.
-</section>
+</section>