Matt Roberts c78085b73e Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	package.json

2014-02-27 16:16:13 +00:00

..

api.js

Merge remote-tracking branch 'upstream/master'

2014-02-27 16:16:13 +00:00

contact.js

JavaScript style formatting.

2014-02-11 10:46:39 -05:00

forgot.js

Forgot password token changed to hex instead of base64 to avoid having slashes in the url

2014-02-18 03:33:32 -05:00

home.js

Updated jsdoc comments

2014-01-13 04:34:54 -05:00

reset.js

Add success flash notification on successful password reset

2014-02-18 03:46:03 -05:00

user.js

Changed successful login message to "success" flash instead of "info"

2014-02-10 11:04:36 -05:00