Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "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.6.1",
+  "version": "4.6.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",

website/client/app.vue

@@ -214,19 +214,15 @@ export default {
       }
 
       // Verify the client is updated
-      // const serverAppVersion = response.data.appVersion;
-      // let serverAppVersionState = this.$store.state.serverAppVersion;
-      // let deniedUpdate = this.$store.state.deniedUpdate;
-      // if (isApiCall && !serverAppVersionState) {
-      //   this.$store.state.serverAppVersion = serverAppVersion;
-      // } else if (isApiCall && serverAppVersionState !== serverAppVersion && !deniedUpdate || isCron) {
-      //   // For reload on cron
-      //   if (isCron || confirm(this.$t('habiticaHasUpdated'))) {
-      //     location.reload(true);
-      //   } else {
-      //     this.$store.state.deniedUpdate = true;
-      //   }
-      // }
+      const serverAppVersion = response.data.appVersion;
+      let serverAppVersionState = this.$store.state.serverAppVersion;
+      if (isApiCall && !serverAppVersionState) {
+        this.$store.state.serverAppVersion = serverAppVersion;
+      } else if (isApiCall && serverAppVersionState !== serverAppVersion) {
+        if (document.activeElement.tagName !== 'INPUT' || confirm(this.$t('habiticaHasUpdated'))) {
+          location.reload(true);
+        }
+      }
 
       return response;
     });

website/client/assets/css/sprites/spritesmith-largeSprites-0.css

@@ -1,12 +1,6 @@
-.promo_mystery_201710 {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -244px;
-  width: 93px;
-  height: 90px;
-}
-.scene_positivity {
+.npc_joyful_reaper {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
   background-position: 0px 0px;
-  width: 531px;
-  height: 243px;
+  width: 282px;
+  height: 147px;
 }

website/client/components/static/newStuff.vue

@@ -4,24 +4,14 @@
       .align-self-center.right-margin(:class='baileyClass')
       .media-body
         h1.align-self-center(v-markdown='$t("newStuff")')
-    h2 10/24/2017 - OCTOBER SUBSCRIBER ITEMS, BATCH BUYING, COSTUME CONTEST REMINDER, AND GUILD SPOTLIGHT
+    h2 10/26/2017 - BEHIND THE SCENES: THE JOYFUL REAPER
     hr
     .media
       .media-body
-        h3 October Subscriber Item Set Revealed!
-        p(v-markdown='"The October Subscriber Item Set has been revealed: [the Imperious Imp Item Set](/user/settings/subscription)! You only have seven days to receive the item set when you subscribe. If you\'re already an active subscriber, reload the site and then head to Inventory > Equipment to claim your gear!"')
-      .promo_mystery_201710
-    p Subscribers also receive the ability to buy gems for gold -- the longer you subscribe, the more gems you can buy per month! There are other perks as well, such as longer access to uncompressed data and a cute Jackalope pet. Best of all, subscriptions let us keep Habitica running. Thank you very much for your support -- it means a lot to us.
-    .small by Lemoness
-    h3 Batch Buying
-    p We've added the ability to buy multiple quests, potions, eggs, food items, and saddles at once! Plus, if you're a subscriber, you can also buy multiple gems with gold. Batch buying is available in the shops as well as through your pinned Rewards. We hope this makes buying rewards and items even more motivating!
-    .small by TheHollidayInn and Apollo
-    h3 Community Costume Challenge Reminder
-    p(v-markdown='"There\'s just one week left to enter and complete the [Community Costume Challenge!](/challenges/76c69212-4f33-4198-81a8-ffeb51b16b8c) If you\'d like, you can also share your entry with fellow Habiticans on social media by using the hashtag #HabitoweenCostume. Join in the fun now for a chance to win the coveted Costume Contestant Badge!"')
-    .scene_positivity.center-block
-    h3 Guild Spotlight: Gatherings of Good Cheer
-    p(v-markdown='"There\'s a new [Guild Spotlight on the blog](https://habitica.wordpress.com/2017/10/24/gatherings-of-good-cheer-guilds-for-cultivating-positivity/) that highlights the Guilds that can help you as you work toward a more optimistic outlook! Check it out now to find Habitica\'s best communities for Cultivating Positivity."')
-    .small by Beffymaroo
+        h3 Behind the Scenes Blog Post: The Joyful Reaper
+        p(v-markdown='"Have you ever wanted to know more about the Joyful Reaper, the Master of Healers? [Today\'s blog post](https://habitica.wordpress.com/2017/10/26/behind-the-scenes-spotlight-on-the-joyful-reaper/) features a spotlight on the guardian of the Flourishing Fields! Check it out now to learn about her masterful healer skills, as well as an explanation of some of Habitica\'s quirks."')
+        .small by Lemoness
+      .npc_joyful_reaper
     br
 </template>
 

website/client/store/index.js

@@ -56,7 +56,6 @@ export default function () {
     getters,
     state: {
       serverAppVersion: '',
-      deniedUpdate: false,
       title: 'Habitica',
       isUserLoggedIn,
       isUserLoaded: false, // Means the user and the user's tasks are ready

website/common/locales/en/generic.json

@@ -282,5 +282,5 @@
   "letsgo": "Let's Go!",
   "selected": "Selected",
   "howManyToBuy": "How many would you like to buy?",
-  "habiticaHasUpdated": "There is a new version of Habitica. Would you like to refresh to get the latest updates?"
+  "habiticaHasUpdated": "There is a new Habitica update. Refresh to get the latest version!"
 }