From f158852be57917a40111db1473881841b062d2fe Mon Sep 17 00:00:00 2001
From: Jason Mishi Carvalho <jml123carvalho@gmail.com>
Date: Sat, 27 Aug 2022 01:52:04 +0530
Subject: [PATCH 1/5] Grey out skill when insufficient mana fixes #13286
 (#14100)

* disable spell if user doesn't have enough mana

* differenciate insufficient mana and disabled spell

* linting

* reduce opacity, no hover state when insufficient mana

* display that lvl insufficient in spell tooltip

* change spell text color when spell has no effect

change spell-text color to blue-500 when spell has no effect
---
 .../client/src/components/tasks/spells.vue    | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 website/client/src/components/tasks/spells.vue

diff --git a/website/client/src/components/tasks/spells.vue b/website/client/src/components/tasks/spells.vue
old mode 100644
new mode 100755
index 8e690aee94..bcdcfff581
--- a/website/client/src/components/tasks/spells.vue
+++ b/website/client/src/components/tasks/spells.vue
@@ -68,7 +68,8 @@
               </b-popover>
               <div
                 class="spell-border"
-                :class="{ disabled: spellDisabled(key) || user.stats.lvl < skill.lvl }"
+                :class="{ disabled: spellDisabled(key) || user.stats.lvl < skill.lvl,
+                 'insufficient-mana': user.stats.mp < skill.mana }"
               >
                 <div
                   class="spell"
@@ -87,19 +88,6 @@
                       <div>Level {{ skill.lvl }}</div>
                     </div>
                   </div>
-                  <div
-                    v-else-if="spellDisabled(key) === true"
-                    class="mana"
-                  >
-                    <div class="mana-text">
-                      <div
-                        v-once
-                        class="svg-icon"
-                        v-html="icons.mana"
-                      ></div>
-                      <div>{{ skill.mana }}</div>
-                    </div>
-                  </div>
                   <div
                     v-else
                     class="mana"
@@ -200,7 +188,7 @@
     border-radius: 4px;
     margin-bottom: 1rem;
 
-    &:hover:not(.disabled) {
+    &:hover:not(.disabled):not(.insufficient-mana) {
       background-color: $purple-400;
       cursor: pointer;
       box-shadow: 0 4px 4px 0 rgba(26, 24, 29, 0.16),
@@ -216,6 +204,10 @@
           background-color: rgba(26, 24, 29, 0.5);
         }
 
+        .mana-text {
+          color: $blue-500;
+        }
+
         .level {
           color: $white;
           font-weight: normal;
@@ -223,6 +215,10 @@
       }
     }
 
+    &.insufficient-mana:not(.disabled) {
+      opacity: 0.5;
+    }
+
     .spell {
       background: $white;
       border-radius: 4px;
@@ -481,7 +477,9 @@ export default {
     skillNotes (skill) {
       let notes = skill.notes();
 
-      if (skill.key === 'frost' && this.spellDisabled(skill.key)) {
+      if (this.user.stats.lvl < skill.lvl) {
+        notes = this.$t('spellLevelTooHigh', { level: skill.lvl });
+      } else if (skill.key === 'frost' && this.spellDisabled(skill.key)) {
         notes = this.$t('spellAlreadyCast');
       } else if (skill.key === 'stealth' && this.spellDisabled(skill.key)) {
         notes = this.$t('spellAlreadyCast');

From bc4770577adf9bc529a0a3ff70480c2b48c5f0d5 Mon Sep 17 00:00:00 2001
From: theneelshah <theneelshah@gmail.com>
Date: Sat, 27 Aug 2022 02:15:32 +0530
Subject: [PATCH 2/5] Fix prop change handler for guild challenges. (#14169)

Fix props' change handler which is called when guild is changed from
notification.

Tests:

+ Guild challenges updated successfully when guild is changed from
notification center.

Co-authored-by: neel <neel@helpshift.com>
---
 .../client/src/components/challenges/groupChallenges.vue    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/website/client/src/components/challenges/groupChallenges.vue b/website/client/src/components/challenges/groupChallenges.vue
index 6a19e34700..fc370700c8 100644
--- a/website/client/src/components/challenges/groupChallenges.vue
+++ b/website/client/src/components/challenges/groupChallenges.vue
@@ -112,10 +112,8 @@ export default {
     },
   },
   watch: {
-    'group._id': {
-      async groupId () {
-        this.loadChallenges();
-      },
+    'group._id': function groupId () {
+      this.loadChallenges();
     },
   },
   mounted () {

From 509cb0037486b9e541e83ba93021bd09a8ed6e32 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Fri, 26 Aug 2022 16:46:43 -0400
Subject: [PATCH 3/5] fix(api): add API version (#14177)

---
 apidoc/apidoc.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apidoc/apidoc.json b/apidoc/apidoc.json
index 8b2893529d..2b7651614d 100644
--- a/apidoc/apidoc.json
+++ b/apidoc/apidoc.json
@@ -2,6 +2,7 @@
   "name": "Habitica V3 API Documentation",
   "title": "Habitica",
   "url": "https://habitica.com",
+  "version": "3.0.0",
   "sampleUrl": null,
   "header": {
     "title": "Introduction",

From 3664a1ebb1df98dbe63bb1d16ee29855c4eefad4 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Fri, 26 Aug 2022 16:51:21 -0400
Subject: [PATCH 4/5] fix(tavern): update Pause Damage Description, and Staff
 list (#14174)

---
 .../client/src/components/groups/tavern.vue   | 19 ++++++++++++++++---
 website/client/src/libs/staffList.js          |  5 +++++
 website/common/locales/en/npc.json            |  7 +++----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/website/client/src/components/groups/tavern.vue b/website/client/src/components/groups/tavern.vue
index 649f9c6274..2eea992468 100644
--- a/website/client/src/components/groups/tavern.vue
+++ b/website/client/src/components/groups/tavern.vue
@@ -247,9 +247,6 @@
             <li v-once>
               {{ $t('sleepBullet3') }}
             </li>
-            <li v-once>
-              {{ $t('sleepBullet4') }}
-            </li>
           </ul>
           <button
             v-if="!user.preferences.sleep"
@@ -342,6 +339,7 @@
             <li>
               <a
                 href
+                :style="glossary-link"
                 v-html="$t('glossary')"
               ></a>
             </li>
@@ -536,6 +534,21 @@
     margin-left: .5em;
   }
 
+// formats the report a bug link to match the others
+  a:not([href]) {
+  &:not([role=button]) {
+    color: #007bff;
+    text-decoration: none;
+    }
+  }
+
+  a:not([href]):hover {
+  &:not([role=button]) {
+    color: #0056b3;
+    text-decoration: underline;
+    }
+  }
+
   .tier1-icon, .tier2-icon {
     width: 11px;
   }
diff --git a/website/client/src/libs/staffList.js b/website/client/src/libs/staffList.js
index 50513e8a68..8f96e907eb 100644
--- a/website/client/src/libs/staffList.js
+++ b/website/client/src/libs/staffList.js
@@ -29,6 +29,11 @@ export default [
     type: 'Staff',
     uuid: '61b2c855-0a30-444c-bcc6-1cac876460b0',
   },
+  {
+    name: 'heyeilatan',
+    type: 'Staff',
+    uuid: 'f4e5c6da-0617-48bf-b3bd-9f97636774a8',
+  },
   {
     name: 'Alys',
     type: 'Moderator',
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index 5f0ac20e7d..7c173cae02 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -17,10 +17,9 @@
   "mattBochText1": "Welcome to the Stable! I’m Matt, the beastmaster. Every time you complete a task, you'll have a random chance at receiving an Egg or a Hatching Potion to hatch Pets. When you hatch a Pet, it will appear here! Click a Pet's image to add it to your Avatar. Feed them with the Pet Food you find, and they'll grow into hardy Mounts.",
   "welcomeToTavern": "Welcome to The Tavern!",
   "sleepDescription": "Need a break? Check into Daniel's Inn to pause some of Habitica's more difficult game mechanics:",
-  "sleepBullet1": "Missed Dailies won't damage you",
-  "sleepBullet2": "Tasks won't lose streaks",
-  "sleepBullet3": "Bosses won't do damage for your own missed Dailies",
-  "sleepBullet4": "Your boss damage or collection Quest items will stay pending until check-out",
+  "sleepBullet1": "Your missed Dailies won't damage you (bosses will still do damage caused by other Party member's missed Dailies)",
+  "sleepBullet2": "Your Task streaks and Habit counters will not reset",
+  "sleepBullet3": "Your damage to the Quest boss or found collection items will remain pending until you check out of the Inn",
   "pauseDailies": "Pause Damage",
   "unpauseDailies": "Unpause Damage",
   "staffAndModerators": "Staff and Moderators",

From ccb821fd6fc125c83edace7385444c00cea64ddd Mon Sep 17 00:00:00 2001
From: Anton de Regt <antonderegt@pm.me>
Date: Fri, 26 Aug 2022 22:56:58 +0200
Subject: [PATCH 5/5] Fix redirect after register issue (#14182)

---
 website/client/src/components/auth/registerLoginReset.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/website/client/src/components/auth/registerLoginReset.vue b/website/client/src/components/auth/registerLoginReset.vue
index 60a08f3b70..890581ca5f 100644
--- a/website/client/src/components/auth/registerLoginReset.vue
+++ b/website/client/src/components/auth/registerLoginReset.vue
@@ -757,8 +757,7 @@ export default {
     }, 500),
     sanitizeRedirect (redirect) {
       if (!redirect) return '/';
-      let sanitizedString = DOMPurify.sanitize(redirect).replace(/\\|\/\/|\./g, '');
-      sanitizedString = `/${sanitizedString}`;
+      const sanitizedString = DOMPurify.sanitize(redirect).replace(/\\|\/\/|\./g, '');
       return sanitizedString;
     },
     async register () {