Resolve merge conflicts using Webstorm's merge integration tool.

2015-04-17 00:11:13 -04:00
parent 56e45ba9dd 9c67d4988f
commit b49d2fd343
23 changed files with 1159 additions and 390 deletions
--- a/controllers/story.js
+++ b/controllers/story.js
@@ -349,8 +349,15 @@ exports.storySubmission = function(req, res, next) {
    originalStoryAuthorEmail: req.user.email
  });

-  req.user.progressTimestamps.push(Date.now());
-  req.user.save();
+    story.save(function(err) {
+        if (err) {
+            return res.status(500);
+        }
+        res.send(JSON.stringify({
+            storyLink: story.storyLink.replace(/\s/g, '-').toLowerCase()
+        }));
+    });
+};

  story.save(function(err) {
    if (err) {