From 619c7f2642ffe726dcaa61296dcbfe8eafb8bb6e Mon Sep 17 00:00:00 2001 From: Urs Wolfer Date: Thu, 23 Oct 2014 12:34:52 +0200 Subject: [PATCH 1/9] Show error message when sending password request mail fails It used to fail silently (client only displays error when a message is available). --- app/controllers/users/users.password.server.controller.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/users/users.password.server.controller.js b/app/controllers/users/users.password.server.controller.js index 7ffb04e8..0934e64f 100644 --- a/app/controllers/users/users.password.server.controller.js +++ b/app/controllers/users/users.password.server.controller.js @@ -77,6 +77,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); From 86d38df702b81f29ce0b496c4af30b6f2397dfc5 Mon Sep 17 00:00:00 2001 From: Dan Bunker Date: Mon, 3 Nov 2014 12:43:52 -0700 Subject: [PATCH 2/9] typo removed extra comma --- gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gruntfile.js b/gruntfile.js index 9bd7a8c6..9d4a0704 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -31,7 +31,7 @@ module.exports = function(grunt) { clientViews: { files: watchFiles.clientViews, options: { - livereload: true, + livereload: true } }, clientJS: { From d27baeac1fefc93450792e84120757c3dcf05a3d Mon Sep 17 00:00:00 2001 From: Andrew McKinlay Date: Mon, 3 Nov 2014 19:10:37 -0500 Subject: [PATCH 3/9] Remove unecessary comment in karma.conf.js --- karma.conf.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index e85f39b7..0f5ab311 100644 --- a/karma.conf.js +++ b/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 }); -}; \ No newline at end of file +}; From d5cf18a1f54deb322205ad33d2eb579bc587bcc7 Mon Sep 17 00:00:00 2001 From: Lawrence Date: Mon, 10 Nov 2014 17:23:45 +0000 Subject: [PATCH 4/9] Abstract nodemailer createTransport Currently createTransport is unnecessarily called upon every time a password request is made. --- app/controllers/users/users.password.server.controller.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/users/users.password.server.controller.js b/app/controllers/users/users.password.server.controller.js index 1d4ae65e..a80f5553 100644 --- a/app/controllers/users/users.password.server.controller.js +++ b/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, @@ -167,7 +168,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 +242,4 @@ exports.changePassword = function(req, res) { message: 'User is not signed in' }); } -}; \ No newline at end of file +}; From 959d7e7423201c4310467e6fe0ba55532a9ee00b Mon Sep 17 00:00:00 2001 From: Wesley Smith Date: Sat, 15 Nov 2014 18:39:27 -0700 Subject: [PATCH 5/9] Fixed two tiny typos. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6f7d5f4f..5561c4fb 100644 --- a/README.md +++ b/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 From 873e91f9e2505bc06b43d6febbb314fbd70eada4 Mon Sep 17 00:00:00 2001 From: Wesley Smith Date: Sun, 16 Nov 2014 19:14:13 -0700 Subject: [PATCH 6/9] Fixed error message for non-unique username. --- app/models/user.server.model.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.server.model.js b/app/models/user.server.model.js index 9370da01..840464af 100755 --- a/app/models/user.server.model.js +++ b/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 }, From e4519bc40759b1c3ae8a4d45443fcd781d3335f9 Mon Sep 17 00:00:00 2001 From: Wesley Smith Date: Mon, 17 Nov 2014 01:53:51 -0700 Subject: [PATCH 7/9] Removed unneeded comas from gruntfile. --- gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gruntfile.js b/gruntfile.js index 45554857..fd0b02a2 100644 --- a/gruntfile.js +++ b/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 From adf6e0ce65d35e280db85d868e9bca98f2e2d20c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Je=CC=81ro=CC=82me=20Gagnon-Voyer?= Date: Wed, 19 Nov 2014 17:17:55 -0500 Subject: [PATCH 8/9] update to angular-bootstrap 0.12.0 + fix breaking changes details on breaking changes: https://github.com/angular-ui/bootstrap/blob/eec68d81f4f72363d37493c495b 892347bdb9e1b/CHANGELOG.md Conflicts: bower.json --- bower.json | 3 ++- public/modules/core/views/header.client.view.html | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index 3d7a7451..a49e0339 100644 --- a/bower.json +++ b/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" } -} \ No newline at end of file +} diff --git a/public/modules/core/views/header.client.view.html b/public/modules/core/views/header.client.view.html index eb6ac6df..541aa3a8 100644 --- a/public/modules/core/views/header.client.view.html +++ b/public/modules/core/views/header.client.view.html @@ -11,7 +11,7 @@