Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.24.2",
+  "version": "4.24.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.24.2",
+  "version": "4.24.5",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",

website/common/script/libs/shops-seasonal.config.js

@@ -11,10 +11,6 @@ module.exports = {
   ],
 
   pinnedSets: {
-    warrior: 'winter2018GiftWrappedSet',
-    wizard: 'winter2018ConfettiSet',
-    rogue: 'winter2018ReindeerSet',
-    healer: 'winter2018MistletoeSet',
   },
 
   availableSpells: [

website/server/models/userNotification.js

@@ -38,14 +38,22 @@ export let schema = new Schema({
     type: String,
     default: uuid,
     validate: [validator.isUUID, 'Invalid uuid.'],
-    required: true,
+    // required: true, // @TODO: Add these back once we figure out the issue with notifications
+  },
+  type: {
+    type: String,
+    // required: true,
+    enum: NOTIFICATION_TYPES,
   },
-  type: {type: String, required: true, enum: NOTIFICATION_TYPES},
   data: {type: Schema.Types.Mixed, default: () => {
     return {};
   }},
   // A field to mark the notification as seen without deleting it, optional use
-  seen: {type: Boolean, required: true, default: () => false},
+  seen: {
+    type: Boolean,
+    // required: true,
+    default: () => false,
+  },
 }, {
   strict: true,
   minimize: false, // So empty objects are returned