resolve merge conflict

2015-03-21 17:04:31 +09:00
parent 6ad7c22313 ec5b3e4b84
commit 9cdb2588b4
2 changed files with 9 additions and 6 deletions
--- a/controllers/story.js
+++ b/controllers/story.js
@ -19,7 +19,7 @@ function hotRank(timeValue, rank) {
     */
    var hotness;
    var z = Math.log(rank) / Math.log(10);
-    hotness = z + (timeValue / 45000000);
+    hotness = z + (timeValue / 172800000);
    return hotness;

 }
--- a/controllers/user.js
+++ b/controllers/user.js
@ -94,6 +94,9 @@ exports.getEmailSignup = function(req, res) {
 */

 exports.postEmailSignup = function(req, res, next) {
+
+
+    req.assert('email', 'valid email required').isEmail();
    var errors = req.validationErrors();
    
    if (errors) {