Merge branch 'develop' into mixpanel

Conflicts: config.json.example
2015-05-31 15:40:21 -05:00
parent 6fb100874c d28ed6badf
commit 91f93df7cc
252 changed files with 1545 additions and 807 deletions
@@ -148,6 +148,8 @@ var UserSchema = new Schema({
    recaptureEmailsPhase: {type: Number, 'default': 0},
    // Needed to track the tip to send inside the email
    weeklyRecapEmailsPhase: {type: Number, 'default': 0},
+    // Used to track when the next weekly recap should be sent
+    lastWeeklyRecap: {type: Date, 'default': Date.now},
    communityGuidelinesAccepted: {type: Boolean, 'default': false},
    cronCount: {type:Number, 'default':0}
  },