Merge branch 'develop' into release

test/api/v3/integration/challenges/GET-challenges_challengeId_members.test.js

@@ -142,4 +142,22 @@ describe('GET /challenges/:challengeId/members', () => {
     let resIds = res.concat(res2).map(member => member._id);
     expect(resIds).to.eql(expectedIds.sort());
   });
+
+  it('supports using req.query.search to get search members', async () => {
+    let group = await generateGroup(user, {type: 'party', name: generateUUID()});
+    let challenge = await generateChallenge(user, group);
+
+    let usersToGenerate = [];
+    for (let i = 0; i < 3; i++) {
+      usersToGenerate.push(generateUser({challenges: [challenge._id]}));
+    }
+    let generatedUsers = await Promise.all(usersToGenerate);
+    let profileNames = generatedUsers.map(generatedUser => generatedUser.profile.name);
+
+    let firstProfileName = profileNames[0];
+    let nameToSearch = firstProfileName.substring(0, 4);
+
+    let response = await user.get(`/challenges/${challenge._id}/members?search=${nameToSearch}`);
+    expect(response[0].profile.name).to.eql(firstProfileName);
+  });
 });

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

@@ -1,12 +1,24 @@
-.promo_login_screen {
+.promo_armoire_backgrounds_201710 {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -142px 0px;
+  width: 141px;
+  height: 438px;
+}
+.promo_farm_friends {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
   background-position: 0px 0px;
-  width: 524px;
-  height: 274px;
+  width: 141px;
+  height: 441px;
 }
-.promo_spooky_sparkles {
+.promo_mystery_201709 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -275px;
-  width: 140px;
-  height: 294px;
+  background-position: -284px 0px;
+  width: 114px;
+  height: 90px;
+}
+.promo_takeThis_gear {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -284px -91px;
+  width: 114px;
+  height: 87px;
 }

website/assets/sprites/dist/spritesmith-main-9.css

@@ -1,372 +1,450 @@
+.weapon_rogue_0 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -1373px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_rogue_1 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -1100px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_rogue_2 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -736px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_rogue_3 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -827px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_rogue_4 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -918px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_rogue_5 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -1009px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_rogue_6 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -1191px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_1 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -1366px -1290px;
+  width: 102px;
+  height: 90px;
+}
+.weapon_special_2 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -1464px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_3 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: 0px -1613px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_bardInstrument {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -182px -1613px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_fencingFoil {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -273px -1613px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_lunarScythe {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -364px -1613px;
+  width: 90px;
+  height: 90px;
+}
 .weapon_special_mammothRiderSpear {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1045px -1486px;
+  background-position: -455px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_nomadsScimitar {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -954px -1486px;
+  background-position: -546px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_pageBanner {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1136px -1486px;
+  background-position: -637px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_roguishRainbowMessage {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1227px -1486px;
+  background-position: -728px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_skeletonKey {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1318px -1486px;
+  background-position: -819px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_tachi {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1409px -1486px;
+  background-position: -910px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_taskwoodsLantern {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1591px -1486px;
+  background-position: -1001px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_tridentOfCrashingTides {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px 0px;
+  background-position: -1183px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_0 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -91px;
+  background-position: -1274px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -273px;
+  background-position: -1456px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -364px;
+  background-position: -1547px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -546px;
+  background-position: -1712px 0px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_4 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -637px;
+  background-position: -1712px -91px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_5 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -728px;
+  background-position: -1712px -182px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_6 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -819px;
+  background-position: -1712px -273px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_0 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -910px;
+  background-position: -1712px -364px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1001px;
+  background-position: -190px -1471px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1092px;
+  background-position: -281px -1471px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1183px;
+  background-position: -372px -1471px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_4 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1274px;
+  background-position: -463px -1471px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_5 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1365px;
+  background-position: -554px -1471px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_6 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -772px -1486px;
+  background-position: -645px -1471px;
   width: 90px;
   height: 90px;
 }
 .Pet_Currency_Gem {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -621px -1670px;
+  background-position: -1712px -1228px;
   width: 68px;
   height: 68px;
 }
 .Pet_Currency_Gem1x {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1840px -73px;
+  background-position: -1772px -482px;
   width: 15px;
   height: 13px;
 }
 .Pet_Currency_Gem2x {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -1084px;
+  background-position: -1772px -455px;
   width: 30px;
   height: 26px;
 }
 .PixelPaw-Gold {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -170px;
+  background-position: -1656px -1265px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -222px;
+  background-position: -1656px -1317px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw002 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -274px;
+  background-position: -1646px -1471px;
   width: 51px;
   height: 51px;
 }
 .avatar_floral_healer {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -581px -1486px;
+  background-position: -1066px -1290px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_rogue {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -381px -1486px;
+  background-position: -966px -1290px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_warrior {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1385px -1299px;
+  background-position: -1166px -1290px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_wizard {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -481px -1486px;
+  background-position: -1266px -1290px;
   width: 99px;
   height: 99px;
 }
 .empty_bottles {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1608px;
+  background-position: -1712px -1642px;
   width: 64px;
   height: 54px;
 }
 .ghost {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1500px -1486px;
+  background-position: -1282px -1471px;
   width: 90px;
   height: 90px;
 }
 .inventory_present {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -326px;
+  background-position: -138px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_01 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -950px;
+  background-position: -1488px -1112px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_02 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -898px;
+  background-position: -285px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_03 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -846px;
+  background-position: -628px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_04 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -794px;
+  background-position: -579px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_05 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -742px;
+  background-position: -530px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_06 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -690px;
+  background-position: -481px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_07 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -638px;
+  background-position: -432px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_08 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -586px;
+  background-position: -383px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_09 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -534px;
+  background-position: -334px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_10 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -482px;
+  background-position: -1488px -1164px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_11 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -430px;
+  background-position: -236px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_12 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -378px;
+  background-position: -187px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_special_birthday {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1539px;
+  background-position: -1712px -538px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_congrats {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -1670px;
+  background-position: -1712px -607px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_fortify {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -207px -1670px;
+  background-position: -1712px -676px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_getwell {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -276px -1670px;
+  background-position: -1712px -883px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_goodluck {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -345px -1670px;
+  background-position: -1712px -952px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_greeting {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -483px -1670px;
+  background-position: -1712px -1021px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_nye {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -690px -1670px;
+  background-position: -69px -1704px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_opaquePotion {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -552px -1670px;
+  background-position: -1712px -1090px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_seafoam {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1173px -1670px;
+  background-position: -1712px -1159px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_shinySeed {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1104px -1670px;
+  background-position: 0px -1704px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_snowball {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1035px -1670px;
+  background-position: -1638px -1613px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_spookySparkles {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -966px -1670px;
+  background-position: -1712px -1573px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_thankyou {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -897px -1670px;
+  background-position: -1712px -1504px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_trinket {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -828px -1670px;
+  background-position: -1712px -1435px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_valentine {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -759px -1670px;
+  background-position: -1712px -1366px;
   width: 68px;
   height: 68px;
 }
@@ -378,43 +456,43 @@
 }
 .pet_key {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -414px -1670px;
+  background-position: -1712px -1297px;
   width: 68px;
   height: 68px;
 }
 .rebirth_orb {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -138px -1670px;
+  background-position: -1712px -814px;
   width: 68px;
   height: 68px;
 }
 .seafoam_star {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -681px -1486px;
+  background-position: -1555px -1471px;
   width: 90px;
   height: 90px;
 }
 .shop_armoire {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -69px -1670px;
+  background-position: -1712px -745px;
   width: 68px;
   height: 68px;
 }
 .snowman {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -863px -1486px;
+  background-position: -91px -1613px;
   width: 90px;
   height: 90px;
 }
 .zzz {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -1043px;
+  background-position: -1658px -1397px;
   width: 40px;
   height: 40px;
 }
 .zzz_light {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -1002px;
+  background-position: -1320px -1064px;
   width: 40px;
   height: 40px;
 }
@@ -426,13 +504,13 @@
 }
 .npc_aprilFool {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1379px -1112px;
+  background-position: -1367px -1112px;
   width: 120px;
   height: 120px;
 }
 .npc_bailey {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px 0px;
+  background-position: -1469px -1290px;
   width: 60px;
   height: 72px;
 }
@@ -444,115 +522,115 @@
 }
 .npc_ian {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1224px -1299px;
+  background-position: -805px -1290px;
   width: 75px;
   height: 135px;
 }
 .npc_justin {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1300px -1299px;
+  background-position: -881px -1290px;
   width: 84px;
   height: 120px;
 }
 .npc_justin_head {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -73px;
+  background-position: -1673px -1141px;
   width: 36px;
   height: 96px;
 }
 .npc_matt {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1028px -1299px;
+  background-position: -217px -1290px;
   width: 195px;
   height: 138px;
 }
 .npc_sabe {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -182px;
+  background-position: -1092px -1613px;
   width: 90px;
   height: 90px;
 }
 .npc_timetravelers {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -832px -1299px;
+  background-position: -413px -1290px;
   width: 195px;
   height: 138px;
 }
 .npc_timetravelers_active {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -636px -1299px;
+  background-position: -609px -1290px;
   width: 195px;
   height: 138px;
 }
 .npc_tyler {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -455px;
+  background-position: -1365px -1613px;
   width: 90px;
   height: 90px;
 }
 .npc_vicky {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1456px;
+  background-position: -1712px -455px;
   width: 59px;
   height: 82px;
 }
 .seasonalshop_closed {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1537px -863px;
+  background-position: -1537px -1002px;
   width: 162px;
   height: 138px;
 }
 .seasonalshop_open {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1537px -1002px;
+  background-position: -1537px -863px;
   width: 162px;
   height: 138px;
 }
 .quest_armadillo {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -440px 0px;
+  background-position: -880px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_atom1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1128px -1112px;
+  background-position: -657px -1112px;
   width: 250px;
   height: 150px;
 }
 .quest_atom2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -428px -1299px;
+  background-position: -1159px -1112px;
   width: 207px;
   height: 138px;
 }
 .quest_atom3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -211px -1299px;
+  background-position: 0px -1290px;
   width: 216px;
   height: 180px;
 }
 .quest_axolotl {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -880px -440px;
+  background-position: -440px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_basilist {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -191px -1486px;
+  background-position: 0px -1471px;
   width: 189px;
   height: 141px;
 }
 .quest_beetle {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1102px -892px;
+  background-position: -1320px -862px;
   width: 204px;
   height: 201px;
 }
 .quest_bunny {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -1299px;
+  background-position: -1102px -892px;
   width: 210px;
   height: 186px;
 }
@@ -564,7 +642,7 @@
 }
 .quest_cheetah {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -440px -232px;
+  background-position: -220px -232px;
   width: 219px;
   height: 219px;
 }
@@ -576,37 +654,37 @@
 }
 .quest_dilatory {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -220px -672px;
+  background-position: 0px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatoryDistress1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1320px -868px;
+  background-position: -1320px -651px;
   width: 210px;
   height: 210px;
 }
 .quest_dilatoryDistress2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1537px -573px;
+  background-position: -1537px -422px;
   width: 150px;
   height: 150px;
 }
 .quest_dilatoryDistress3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -440px -672px;
+  background-position: -220px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatory_derby {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -660px -220px;
+  background-position: -660px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_dustbunnies {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1100px 0px;
+  background-position: -880px -672px;
   width: 219px;
   height: 219px;
 }
@@ -624,43 +702,43 @@
 }
 .quest_evilsanta2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1100px -660px;
+  background-position: -1100px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_falcon {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -220px -892px;
+  background-position: 0px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_ferret {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -892px;
+  background-position: -1100px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_frog {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -880px -892px;
+  background-position: -660px -892px;
   width: 221px;
   height: 213px;
 }
 .quest_ghost_stag {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -660px -892px;
+  background-position: -440px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -440px -892px;
+  background-position: -220px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -877px -1112px;
+  background-position: -908px -1112px;
   width: 250px;
   height: 150px;
 }
@@ -672,145 +750,127 @@
 }
 .quest_gryphon {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -660px -1112px;
+  background-position: -440px -1112px;
   width: 216px;
   height: 177px;
 }
 .quest_guineapig {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1100px -440px;
+  background-position: -1100px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_harpy {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1100px -220px;
+  background-position: -1100px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_hedgehog {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -1112px;
+  background-position: -882px -892px;
   width: 219px;
   height: 186px;
 }
 .quest_hippo {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -880px -672px;
+  background-position: -660px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_horse {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -660px -672px;
+  background-position: -440px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_kraken {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -443px -1112px;
+  background-position: -223px -1112px;
   width: 216px;
   height: 177px;
 }
 .quest_mayhemMistiflying1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1537px -422px;
+  background-position: -1537px -573px;
   width: 150px;
   height: 150px;
 }
 .quest_mayhemMistiflying2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -672px;
+  background-position: -220px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -220px 0px;
+  background-position: -880px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_monkey {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -880px -220px;
+  background-position: -880px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_moon1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1320px -651px;
+  background-position: -1320px -217px;
   width: 216px;
   height: 216px;
 }
 .quest_moon2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -880px 0px;
+  background-position: -660px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_moon3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -660px -452px;
+  background-position: -440px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -440px -452px;
+  background-position: -220px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -220px -452px;
+  background-position: 0px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -452px;
+  background-position: -660px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_nudibranch {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1320px 0px;
+  background-position: -1320px -434px;
   width: 216px;
   height: 216px;
 }
 .quest_octopus {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -220px -1112px;
+  background-position: 0px -1112px;
   width: 222px;
   height: 177px;
 }
 .quest_owl {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -660px 0px;
+  background-position: -440px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_peacock {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1320px -434px;
-  width: 216px;
-  height: 216px;
-}
-.quest_penguin {
-  background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -1486px;
-  width: 190px;
-  height: 183px;
-}
-.quest_rat {
-  background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -220px -232px;
-  width: 219px;
-  height: 219px;
-}
-.quest_rock {
-  background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1320px -217px;
+  background-position: -1320px 0px;
   width: 216px;
   height: 216px;
 }

website/client/app.vue

@@ -56,7 +56,8 @@
 </style>
 
 <style>
-  .modal {
+  /* @TODO: The modal-open class is not being removed. Let's try this for now */
+  .modal, .modal-open {
     overflow-y: scroll !important;
   }
 

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

@@ -1,12 +1,24 @@
-.promo_login_screen {
+.promo_armoire_backgrounds_201710 {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -142px 0px;
+  width: 141px;
+  height: 438px;
+}
+.promo_farm_friends {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
   background-position: 0px 0px;
-  width: 524px;
-  height: 274px;
+  width: 141px;
+  height: 441px;
 }
-.promo_spooky_sparkles {
+.promo_mystery_201709 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -275px;
-  width: 140px;
-  height: 294px;
+  background-position: -284px 0px;
+  width: 114px;
+  height: 90px;
+}
+.promo_takeThis_gear {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -284px -91px;
+  width: 114px;
+  height: 87px;
 }

website/client/assets/css/sprites/spritesmith-main-9.css

@@ -1,372 +1,450 @@
+.weapon_rogue_0 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -1373px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_rogue_1 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -1100px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_rogue_2 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -736px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_rogue_3 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -827px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_rogue_4 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -918px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_rogue_5 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -1009px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_rogue_6 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -1191px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_1 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -1366px -1290px;
+  width: 102px;
+  height: 90px;
+}
+.weapon_special_2 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -1464px -1471px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_3 {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: 0px -1613px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_bardInstrument {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -182px -1613px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_fencingFoil {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -273px -1613px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_lunarScythe {
+  background-image: url(/static/sprites/spritesmith-main-9.png);
+  background-position: -364px -1613px;
+  width: 90px;
+  height: 90px;
+}
 .weapon_special_mammothRiderSpear {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1045px -1486px;
+  background-position: -455px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_nomadsScimitar {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -954px -1486px;
+  background-position: -546px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_pageBanner {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1136px -1486px;
+  background-position: -637px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_roguishRainbowMessage {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1227px -1486px;
+  background-position: -728px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_skeletonKey {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1318px -1486px;
+  background-position: -819px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_tachi {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1409px -1486px;
+  background-position: -910px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_taskwoodsLantern {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1591px -1486px;
+  background-position: -1001px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_tridentOfCrashingTides {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px 0px;
+  background-position: -1183px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_0 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -91px;
+  background-position: -1274px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -273px;
+  background-position: -1456px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -364px;
+  background-position: -1547px -1613px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -546px;
+  background-position: -1712px 0px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_4 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -637px;
+  background-position: -1712px -91px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_5 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -728px;
+  background-position: -1712px -182px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_6 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -819px;
+  background-position: -1712px -273px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_0 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -910px;
+  background-position: -1712px -364px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1001px;
+  background-position: -190px -1471px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1092px;
+  background-position: -281px -1471px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1183px;
+  background-position: -372px -1471px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_4 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1274px;
+  background-position: -463px -1471px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_5 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1365px;
+  background-position: -554px -1471px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_6 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -772px -1486px;
+  background-position: -645px -1471px;
   width: 90px;
   height: 90px;
 }
 .Pet_Currency_Gem {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -621px -1670px;
+  background-position: -1712px -1228px;
   width: 68px;
   height: 68px;
 }
 .Pet_Currency_Gem1x {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1840px -73px;
+  background-position: -1772px -482px;
   width: 15px;
   height: 13px;
 }
 .Pet_Currency_Gem2x {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -1084px;
+  background-position: -1772px -455px;
   width: 30px;
   height: 26px;
 }
 .PixelPaw-Gold {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -170px;
+  background-position: -1656px -1265px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -222px;
+  background-position: -1656px -1317px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw002 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -274px;
+  background-position: -1646px -1471px;
   width: 51px;
   height: 51px;
 }
 .avatar_floral_healer {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -581px -1486px;
+  background-position: -1066px -1290px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_rogue {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -381px -1486px;
+  background-position: -966px -1290px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_warrior {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1385px -1299px;
+  background-position: -1166px -1290px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_wizard {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -481px -1486px;
+  background-position: -1266px -1290px;
   width: 99px;
   height: 99px;
 }
 .empty_bottles {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1608px;
+  background-position: -1712px -1642px;
   width: 64px;
   height: 54px;
 }
 .ghost {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1500px -1486px;
+  background-position: -1282px -1471px;
   width: 90px;
   height: 90px;
 }
 .inventory_present {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -326px;
+  background-position: -138px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_01 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -950px;
+  background-position: -1488px -1112px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_02 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -898px;
+  background-position: -285px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_03 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -846px;
+  background-position: -628px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_04 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -794px;
+  background-position: -579px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_05 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -742px;
+  background-position: -530px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_06 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -690px;
+  background-position: -481px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_07 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -638px;
+  background-position: -432px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_08 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -586px;
+  background-position: -383px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_09 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -534px;
+  background-position: -334px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_10 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -482px;
+  background-position: -1488px -1164px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_11 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -430px;
+  background-position: -236px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_12 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -378px;
+  background-position: -187px -1704px;
   width: 48px;
   height: 51px;
 }
 .inventory_special_birthday {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1539px;
+  background-position: -1712px -538px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_congrats {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -1670px;
+  background-position: -1712px -607px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_fortify {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -207px -1670px;
+  background-position: -1712px -676px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_getwell {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -276px -1670px;
+  background-position: -1712px -883px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_goodluck {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -345px -1670px;
+  background-position: -1712px -952px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_greeting {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -483px -1670px;
+  background-position: -1712px -1021px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_nye {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -690px -1670px;
+  background-position: -69px -1704px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_opaquePotion {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -552px -1670px;
+  background-position: -1712px -1090px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_seafoam {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1173px -1670px;
+  background-position: -1712px -1159px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_shinySeed {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1104px -1670px;
+  background-position: 0px -1704px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_snowball {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1035px -1670px;
+  background-position: -1638px -1613px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_spookySparkles {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -966px -1670px;
+  background-position: -1712px -1573px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_thankyou {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -897px -1670px;
+  background-position: -1712px -1504px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_trinket {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -828px -1670px;
+  background-position: -1712px -1435px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_valentine {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -759px -1670px;
+  background-position: -1712px -1366px;
   width: 68px;
   height: 68px;
 }
@@ -378,43 +456,43 @@
 }
 .pet_key {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -414px -1670px;
+  background-position: -1712px -1297px;
   width: 68px;
   height: 68px;
 }
 .rebirth_orb {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -138px -1670px;
+  background-position: -1712px -814px;
   width: 68px;
   height: 68px;
 }
 .seafoam_star {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -681px -1486px;
+  background-position: -1555px -1471px;
   width: 90px;
   height: 90px;
 }
 .shop_armoire {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -69px -1670px;
+  background-position: -1712px -745px;
   width: 68px;
   height: 68px;
 }
 .snowman {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -863px -1486px;
+  background-position: -91px -1613px;
   width: 90px;
   height: 90px;
 }
 .zzz {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -1043px;
+  background-position: -1658px -1397px;
   width: 40px;
   height: 40px;
 }
 .zzz_light {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -1002px;
+  background-position: -1320px -1064px;
   width: 40px;
   height: 40px;
 }
@@ -426,13 +504,13 @@
 }
 .npc_aprilFool {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1379px -1112px;
+  background-position: -1367px -1112px;
   width: 120px;
   height: 120px;
 }
 .npc_bailey {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px 0px;
+  background-position: -1469px -1290px;
   width: 60px;
   height: 72px;
 }
@@ -444,115 +522,115 @@
 }
 .npc_ian {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1224px -1299px;
+  background-position: -805px -1290px;
   width: 75px;
   height: 135px;
 }
 .npc_justin {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1300px -1299px;
+  background-position: -881px -1290px;
   width: 84px;
   height: 120px;
 }
 .npc_justin_head {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1803px -73px;
+  background-position: -1673px -1141px;
   width: 36px;
   height: 96px;
 }
 .npc_matt {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1028px -1299px;
+  background-position: -217px -1290px;
   width: 195px;
   height: 138px;
 }
 .npc_sabe {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -182px;
+  background-position: -1092px -1613px;
   width: 90px;
   height: 90px;
 }
 .npc_timetravelers {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -832px -1299px;
+  background-position: -413px -1290px;
   width: 195px;
   height: 138px;
 }
 .npc_timetravelers_active {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -636px -1299px;
+  background-position: -609px -1290px;
   width: 195px;
   height: 138px;
 }
 .npc_tyler {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -455px;
+  background-position: -1365px -1613px;
   width: 90px;
   height: 90px;
 }
 .npc_vicky {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1712px -1456px;
+  background-position: -1712px -455px;
   width: 59px;
   height: 82px;
 }
 .seasonalshop_closed {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1537px -863px;
+  background-position: -1537px -1002px;
   width: 162px;
   height: 138px;
 }
 .seasonalshop_open {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1537px -1002px;
+  background-position: -1537px -863px;
   width: 162px;
   height: 138px;
 }
 .quest_armadillo {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -440px 0px;
+  background-position: -880px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_atom1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1128px -1112px;
+  background-position: -657px -1112px;
   width: 250px;
   height: 150px;
 }
 .quest_atom2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -428px -1299px;
+  background-position: -1159px -1112px;
   width: 207px;
   height: 138px;
 }
 .quest_atom3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -211px -1299px;
+  background-position: 0px -1290px;
   width: 216px;
   height: 180px;
 }
 .quest_axolotl {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -880px -440px;
+  background-position: -440px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_basilist {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -191px -1486px;
+  background-position: 0px -1471px;
   width: 189px;
   height: 141px;
 }
 .quest_beetle {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1102px -892px;
+  background-position: -1320px -862px;
   width: 204px;
   height: 201px;
 }
 .quest_bunny {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -1299px;
+  background-position: -1102px -892px;
   width: 210px;
   height: 186px;
 }
@@ -564,7 +642,7 @@
 }
 .quest_cheetah {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -440px -232px;
+  background-position: -220px -232px;
   width: 219px;
   height: 219px;
 }
@@ -576,37 +654,37 @@
 }
 .quest_dilatory {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -220px -672px;
+  background-position: 0px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatoryDistress1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1320px -868px;
+  background-position: -1320px -651px;
   width: 210px;
   height: 210px;
 }
 .quest_dilatoryDistress2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1537px -573px;
+  background-position: -1537px -422px;
   width: 150px;
   height: 150px;
 }
 .quest_dilatoryDistress3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -440px -672px;
+  background-position: -220px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatory_derby {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -660px -220px;
+  background-position: -660px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_dustbunnies {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1100px 0px;
+  background-position: -880px -672px;
   width: 219px;
   height: 219px;
 }
@@ -624,43 +702,43 @@
 }
 .quest_evilsanta2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1100px -660px;
+  background-position: -1100px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_falcon {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -220px -892px;
+  background-position: 0px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_ferret {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -892px;
+  background-position: -1100px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_frog {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -880px -892px;
+  background-position: -660px -892px;
   width: 221px;
   height: 213px;
 }
 .quest_ghost_stag {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -660px -892px;
+  background-position: -440px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -440px -892px;
+  background-position: -220px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -877px -1112px;
+  background-position: -908px -1112px;
   width: 250px;
   height: 150px;
 }
@@ -672,145 +750,127 @@
 }
 .quest_gryphon {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -660px -1112px;
+  background-position: -440px -1112px;
   width: 216px;
   height: 177px;
 }
 .quest_guineapig {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1100px -440px;
+  background-position: -1100px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_harpy {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1100px -220px;
+  background-position: -1100px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_hedgehog {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -1112px;
+  background-position: -882px -892px;
   width: 219px;
   height: 186px;
 }
 .quest_hippo {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -880px -672px;
+  background-position: -660px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_horse {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -660px -672px;
+  background-position: -440px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_kraken {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -443px -1112px;
+  background-position: -223px -1112px;
   width: 216px;
   height: 177px;
 }
 .quest_mayhemMistiflying1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1537px -422px;
+  background-position: -1537px -573px;
   width: 150px;
   height: 150px;
 }
 .quest_mayhemMistiflying2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -672px;
+  background-position: -220px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -220px 0px;
+  background-position: -880px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_monkey {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -880px -220px;
+  background-position: -880px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_moon1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1320px -651px;
+  background-position: -1320px -217px;
   width: 216px;
   height: 216px;
 }
 .quest_moon2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -880px 0px;
+  background-position: -660px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_moon3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -660px -452px;
+  background-position: -440px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone1 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -440px -452px;
+  background-position: -220px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone2 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -220px -452px;
+  background-position: 0px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone3 {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -452px;
+  background-position: -660px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_nudibranch {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1320px 0px;
+  background-position: -1320px -434px;
   width: 216px;
   height: 216px;
 }
 .quest_octopus {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -220px -1112px;
+  background-position: 0px -1112px;
   width: 222px;
   height: 177px;
 }
 .quest_owl {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -660px 0px;
+  background-position: -440px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_peacock {
   background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1320px -434px;
-  width: 216px;
-  height: 216px;
-}
-.quest_penguin {
-  background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: 0px -1486px;
-  width: 190px;
-  height: 183px;
-}
-.quest_rat {
-  background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -220px -232px;
-  width: 219px;
-  height: 219px;
-}
-.quest_rock {
-  background-image: url(/static/sprites/spritesmith-main-9.png);
-  background-position: -1320px -217px;
+  background-position: -1320px 0px;
   width: 216px;
   height: 216px;
 }

website/client/components/challenges/challengeDetail.vue

@@ -74,7 +74,7 @@
         button.btn.btn-secondary(v-once, @click='cloneChallenge()') {{$t('clone')}}
     .description-section
       h2 {{$t('challengeSummary')}}
-      p {{challenge.summary}}
+      p(v-markdown='challenge.summary')
       h2 {{$t('challengeDescription')}}
       p(v-markdown='challenge.description')
 </template>
@@ -301,6 +301,9 @@ export default {
         challengeId: this.searchId,
         tasks: clonedTasks,
       });
+
+      this.$store.state.challengeOptions.cloning = false;
+      this.$store.state.challengeOptions.tasksToClone = [];
     },
     async loadChallenge () {
       this.challenge = await this.$store.dispatch('challenges:getChallenge', {challengeId: this.searchId});

website/client/components/challenges/closeChallengeModal.vue

@@ -10,8 +10,10 @@ div
       .col-12
         strong(v-once) {{$t('selectChallengeWinnersDescription')}}
       .col-12
-        select.form-control(v-model='winnerId')
-          option(v-for='member in members', :value='member._id') {{member.profile.name}}
+        b-dropdown.create-dropdown(:text="winnerText")
+          input.form-control(type='text', v-model='searchTerm')
+          b-dropdown-item(v-for="member in memberResults", :key="member._id", @click="selectMember(member)")
+            | {{ member.profile.name }}
       .col-12
         button.btn.btn-primary(v-once, @click='closeChallenge') {{$t('awardWinners')}}
       .col-12
@@ -72,6 +74,7 @@ div
 </style>
 
 <script>
+import debounce from 'lodash/debounce';
 import bModal from 'bootstrap-vue/lib/components/modal';
 import bDropdown from 'bootstrap-vue/lib/components/dropdown';
 import bDropdownItem from 'bootstrap-vue/lib/components/dropdown-item';
@@ -85,14 +88,39 @@ export default {
   },
   data () {
     return {
-      winnerId: '',
+      winner: {},
+      searchTerm: '',
+      memberResults: [],
     };
   },
+  watch: {
+    searchTerm: debounce(function searchTerm (newSearch) {
+      this.searchChallengeMember(newSearch);
+    }, 500),
+    members () {
+      this.memberResults = this.members;
+    },
+  },
+  computed: {
+    winnerText () {
+      if (!this.winner.profile) return this.$t('selectMember');
+      return this.winner.profile.name;
+    },
+  },
   methods: {
+    async searchChallengeMember (search) {
+      this.memberResults = await this.$store.dispatch('members:getChallengeMembers', {
+        challengeId: this.challengeId,
+        searchTerm: search,
+      });
+    },
+    selectMember (member) {
+      this.winner = member;
+    },
     async closeChallenge () {
       this.challenge = await this.$store.dispatch('challenges:selectChallengeWinner', {
         challengeId: this.challengeId,
-        winnerId: this.winnerId,
+        winnerId: this.winner._id,
       });
       this.$router.push('/challenges/myChallenges');
     },

website/client/components/challenges/groupChallenges.vue

@@ -11,8 +11,8 @@ div
       .row
         .col-9
           router-link.title(:to="{ name: 'challenge', params: { challengeId: challenge._id } }")
-            strong {{challenge.name}}
-          p {{challenge.summary || challenge.name}}
+            strong(v-markdown='challenge.name')
+          p(v-markdown='challenge.summary || challenge.name')
           div
             .svg-icon.member-icon(v-html="icons.memberIcon")
             .member-count {{challenge.memberCount}}
@@ -82,10 +82,11 @@ div
 <script>
 import challengeModal from './challengeModal';
 import { mapState } from 'client/libs/store';
+import markdownDirective from 'client/directives/markdown';
 
+import challengeIcon from 'assets/svg/challenge.svg';
 import gemIcon from 'assets/svg/gem.svg';
 import memberIcon from 'assets/svg/member-icon.svg';
-import challengeIcon from 'assets/svg/challenge.svg';
 
 export default {
   props: ['groupId'],
@@ -106,6 +107,9 @@ export default {
       groupIdForChallenges: '',
     };
   },
+  directives: {
+    markdown: markdownDirective,
+  },
   mounted () {
     this.loadChallenges();
   },

website/client/components/groups/membersModal.vue

@@ -53,9 +53,16 @@ div
           button.btn.btn-secondary(@click='loadMoreMembers()') {{ $t('loadMore') }}
       .row.gradient(v-if='members.length > 3')
     div(v-if='selectedPage === "invites"')
-      .row(v-for='member in invites')
+      .row(v-for='(member, index) in invites')
         .col-11.no-padding-left
           member-details(:member='member')
+        .col-1.actions
+          b-dropdown(right=true)
+            .svg-icon.inline.dots(slot='button-content', v-html="icons.dots")
+            b-dropdown-item(@click='removeInvite(member, index)', v-if='isLeader')
+              span.dropdown-icon-item
+                .svg-icon.inline(v-html="icons.removeIcon", v-if='isLeader')
+                span.text {{$t('removeInvite')}}
     .modal-footer
       button.btn.btn-primary(@click='close()') {{ $t('close') }}
 </template>
@@ -375,6 +382,14 @@ export default {
     viewInvites () {
       this.selectedPage = 'invites';
     },
+    async removeInvite (member, index) {
+      this.invites.splice(index, 1);
+      await this.$store.dispatch('members:removeMember', {
+        memberId: member._id,
+        groupId: this.groupId,
+      });
+      this.viewMembers();
+    },
   },
 };
 </script>

website/client/components/shops/market/index.vue

@@ -64,7 +64,7 @@
 
       .clearfix
         h2.float-left
-          | {{ $t('classEquipment') }}
+          | {{ $t('equipment') }}
 
         div.float-right
           span.dropdown-label {{ $t('class') }}
@@ -148,6 +148,7 @@
             @click="itemSelected(item)"
           )
             span(slot="popoverContent")
+              strong(v-if='item.key === "gem" && gemsLeft === 0') {{ $t('maxBuyGems') }}
               h4.popover-content-title {{ item.text }}
 
             template(slot="itemBadge", scope="ctx")
@@ -156,6 +157,8 @@
                 :show="userItems[item.purchaseType][item.key] != 0",
                 :count="userItems[item.purchaseType][item.key] || 0"
               )
+              .gems-left(v-if='item.key === "gem"')
+                | {{ gemsLeft }}
 
               span.badge.badge-pill.badge-item.badge-svg(
                 :class="{'item-selected-badge': ctx.item.pinned, 'hide': !ctx.item.pinned}",
@@ -163,6 +166,7 @@
               )
                 span.svg-icon.inline.icon-12.color(v-html="icons.pin")
 
+
         div.fill-height
 
       drawer(
@@ -339,6 +343,19 @@
     }
 
   }
+
+  .gems-left {
+    position: absolute;
+    right: -.5em;
+    top: -.5em;
+    color: $white;
+    background: $purple-200;
+    padding: .15em .55em;
+    width: 24px;
+    height: 24px;
+    border-radius: 50%;
+    box-shadow: 0 1px 1px 0 rgba($black, 0.12);
+  }
 </style>
 
 
@@ -374,6 +391,7 @@
   import getItemInfo from 'common/script/libs/getItemInfo';
   import isPinned from 'common/script/libs/isPinned';
   import shops from 'common/script/libs/shops';
+  import planGemLimits from 'common/script/libs/planGemLimits';
 
   import _filter from 'lodash/filter';
   import _sortBy from 'lodash/sortBy';
@@ -553,6 +571,10 @@ export default {
           },
         ];
       },
+      gemsLeft () {
+        if (!this.user.purchased.plan) return 0;
+        return planGemLimits.convCap + this.user.purchased.plan.consecutive.gemCapExtra - this.user.purchased.plan.gemsBought;
+      },
     },
     methods: {
       getClassName (classType) {

website/client/components/shops/market/sellModal.vue

@@ -34,8 +34,6 @@
     div.clearfix(slot="modal-footer")
       span.balance.float-left {{ $t('yourBalance') }}
       balanceInfo.float-right
-
-
 </template>
 <style lang="scss">
 

website/client/components/static/newStuff.vue

@@ -4,55 +4,69 @@
       .align-self-center.right-margin(:class='baileyClass')
       .media-body
         h1.align-self-center(v-markdown='$t("newStuff")')
-    h2 10/2/2017 - SPOOKY SPARKLES, MOBILE UPDATES, AND BUG FIXES
+    h2 10/5/2017 - OCTOBER BACKGROUNDS AND ARMOIRE ITEMS, REDESIGN FIXES AND FEEDBACK, TAKE THIS CHALLENGE, LAST CHANCE FOR SORCERY STUDENT SET AND FARM FRIENDS BUNDLE
     hr
     .media
+      .promo_armoire_backgrounds_201710.right-margin
       .media-body
-        h3 Spooky Sparkles and Seasonal Shop
-        p(v-markdown='"There\'s a new Gold-purchasable item in the Seasonal Shop: [Spooky Sparkles](/shops/seasonal)! Buy some and then cast it on your friends. I wonder what it will do?"')
-        p If you have Spooky Sparkles cast on you, you will receive the "Alarming Friends" badge! Don't worry, any mysterious effects will wear off the next day.... or you can cancel them early by buying an Opaque Potion!
-        p While you're at it, be sure to check out all the other items in the Seasonal Shop! There are lots of equipment items from the previous Fall Festivals. The Seasonal Shop will only be open until October 31st, so stock up now.
-        .small by Lemoness and SabreCat
-      .promo_spooky_sparkles
-    h3 Updates to iOS and Android Apps!
-    p(v-markdown='"There are exciting new updates to our [Android](https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica&hl=en) and [iOS](https://itunes.apple.com/us/app/habitica-gamified-task-manager/id994882113?mt=8) apps! In both, we\'ve updated the design of the Shops and your Rewards column. Plus, now you can pin items you want from Shops to your Rewards column! We hope this makes upgrading your avatar and earning Rewards from your tasks even more motivating."')
-    p Android users can also now reset their accounts via the app!
-    p In the iOS app, we've also added improved VoiceOver support for better accessibility. We welcome your feedback on this feature via the in-app "Send Feedback" option.
-    p We hope you enjoy the updates! Be sure to download them now for a better Habitica experience!
-    p If you like the improvements that we’ve been making to our apps, please consider reviewing these new versions. It really helps us out!
-    .small by viirus and piyorii
-    .promo_login_screen.center-block
-    h3 New Post-Update Bug Fixes!
-    p Hello Habiticans! <3 We’ve released a big batch of bug fixes! Many thanks for your patience, and for taking the time to report these bugs. Some changes:
+        h3 October Backgrounds and Armoire Items!
+        p We’ve added three new backgrounds to the avatar shop! Now your avatar can tiptoe through the Tar Pits, sneak down the hall of a Spooky Hotel, and bask in the glow of Magical Candles.
+        p Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Candlemaker Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
+        .small by jordanzimmerman, nekoatsumelarper, vampitch, reesa3, Chimera Liani, and mewrose
+        h3 Bug Fixes Keep Coming!
+        p Hello Habiticans! <3 We’ve released another batch of bug fixes! Thank you all again for your reports:
+        ul
+          li We've fixed the issue preventing checklists from being collapsible!
+          li We fixed the bug where some users who reached 0 health would get their health bar stuck there without refiling.
+          li You can now upgrade Guilds into Group Plans using Stripe!
+          li We fixed issues with the Bailey announcement refusing to scroll if it coincided with multiple pop-ups.
     ul
-      li Due to concerns about accessibility and usability of the Tasks page, we’ve removed the scrollbars on the different Tasks columns.
-      li Due to concerns about the skills bar being too large, we have released a new, more compact design! It should also now stay minimized once you’ve minimized it before, so that it won’t block your tasks all the time.
-      li Now you no longer need to click “Apply Filters” – they take automatic effect when you check them and uncheck them! The dropdown also closes when you move your mouse away, to further reduce the clicking required.
-      li Clicking “Scheduled” now correctly sorts your To-Dos by date
-      li Creating a task while a filter is selected now defaults to being tagged with that filter!
-      li Your Stables are now correctly configured so that the rows of pets and mounts don’t blend together on smaller screens!
-      li You can now click directly on a Mount to equip it!
-      li We’ve fixed a few bugs that were preventing some people from subscribing or buying gems, but some are remaining. Please be sure to report these in Report a Bug (linked below) and we will help you out ASAP!
-      li You should now be able to remove tasks when you leave a Challenge!
-      li You can edit Challenge Tags again!
-      li We’ve fixed the confusing placement of the “Send” buttons in chat
-      li We’ve fixed some style issues that were causing the Quests to occasionally look strange
-      li When you edit a Guild, it will default to you as the leader
-      li The "Members" label is now called the "Member list" to help clarify that you can click it to see all the members of a Party, Guild, or Challenge!
-      li If you have a pending quest, you can now see which members have accepted before you start your quest.
-      li When you complete a quest, the final reward popups are appearing again!
-      li You can now edit Parties normally!
-      li You can now correctly allocate your Stat points without needing to refresh the page!
-      li If you opted out of choosing a class, it will no longer give you an unnecessary warning about costing 3 Gems.
-      li You can no longer accidentally block yourself from your profile.
-      li Mystic Hourglasses now only show in the header if you have more than one. (Thanks for subscribing!)
-      li Markdown works in Challenge titles again!
-      li You can now Clone Challenges again!
-      li The Bailey news loads on the mobile apps again!
-      li The red User ID notifications in the corner should be gone!
-      li(v-markdown='"Chat performance should be better. (We’re still investigating to make it even better, so please let us know in the [Report a Bug Guild](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) if chat lag is still happening to you!)"')
-    p(v-markdown='"Refresh the page to enjoy these fixes! If you’re still having trouble with them after refreshing the page, please let us know in the [Report a Bug Guild](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) and we will investigate :) If you have feedback about the update that is not related to bugs or immediate accessibility issues, we’re opening a public Trello card for these comments on October 5!"')
-    p Thanks for being such a great community! It means a lot to us <3
+      li We fixed some bugs preventing users from subscribing with Amazon.
+      li We've prevented you from opening someone's profile if their user avatar wasn't fully loaded (resulting in the wrong profile being displayed).
+      li All Quick Inventory bars now remember whether or not you minimized them, and remain in that state even when you navigate away or refresh.
+      li We prevented the filter menu from accidentally closing if you're in edit mode.
+      li Pop-ups no longer interrupt the Record Yesterday's Activity modal.
+      li The loading bar is back when you take an action on the site!
+      li Now when you buy anything in one of the shops, the confirmation popup doesn't return for the rest of your session.
+      li The Group Billing tab has returned to Group Plans!
+      li Users with many To-dos are able to check off the final To-do in their list again.
+      li We fixed the bugs where the Enchanted Armoire sometimes wouldn't correctly report what you had received.
+      li The Enchanted Armoire now tells you how much experience you received.
+      li If you already own the Bat-tle Rogue set, Spooky Sparkles are now the featured item in the Seasonal Shop.
+      li Opaque potions and other transformation item cures are now available in the Rewards column again!
+      li The Enchanted Armoire and Health Potions are now purchased with a single click, not needing a popup.
+      li Brutal Smash and other task-targeting skills can no longer accidentally check off tasks.
+      li Now if you make your screen very small, it does not prevent you from accessing all the navigation items.
+      li We fixed the issue with the limited identifier being cut off on the Rewards column when an item was located in the top row.
+      li We've fixed the bug preventing the number of notifications from displaying!
+      li Transformation items now take effect immediately, without having to refresh the page.
+      li You can now use emoji and other Markdown in Challenge titles again.
+      li Equipment items that don't belong to any specific class can now be found in the Market under Equipment > Class > None.
+    p(v-markdown='"Refresh the page to see these fixes! If you\'re still encountering these issues after a refresh, head to the [Report a Bug Guild](/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) and we will investigate. Thanks for being part of Habitica!"')
+    h3 Redesign Feedback Form Available
+    p(v-markdown='"Now that the new Habitica redesign has been out for a week and we\'ve had some time to fix some of the bugs, we wanted to open up a channel for your feedback. Please note that some pending features (like the ability to add tasks above each column, the sync button, push to top/bottom, and the ability to batch-add tasks) are still being built, and our team is still working hard to fix bugs. To see if your concerns are already being addressed, be sure to check out the [Redesign FAQ](http://habitica.wikia.com/wiki/Habitica_Redesign_FAQ) and the [Known Bugs List](http://habitica.wikia.com/wiki/Habitica_Redesign:_Known_Bugs)!"')
+    p(v-markdown='"Although originally we planned to collect feedback via Trello, we heard some concerns from the community that this would be difficult because it would require people to sign up for additional accounts. For that reason, we\'ve decided to collect feedback via [a Google form](https://docs.google.com/forms/d/e/1FAIpQLScpeCeoTbmNPotBvEWtAFeVlD6g83KEN_YlwD_GHB4yHJbZww/viewform). We hope that this makes it easier to tell us what you think! We\'re eager to get your input so that we can work to make Habitica the best that it can be."')
+    p We are a very small team, and for many of us, Habitica is a labor of love. Thank you all very much for your patience and for your support during this time of transition -- it means the world to us.
+    .media
+      .promo_takeThis_gear.right-margin
+      .media-body
+        h3 New Take This Challenge
+        p(v-markdown='"The next Take This Challenge has launched, [Multiplayer Co-Op Exercise!](/challenges/e577f6bd-59af-4f89-b011-44767527ee92), with a focus on working out with a partner. Be sure to check it out to earn additional pieces of the Take This armor set!"')
+    p(v-markdown='"[Take This](http://www.takethis.org/) is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness."')
+    .media
+      .media-body
+        p(v-markdown='"Congratulations to the winners of the last Take This Challenge, “Hero\'s Triumph!”: grand prize winner David Rule, and runners-up José Barata Gonçalves, Ar_tem, Ziggy, schooler, and Ayano. Plus, all participants in that Challenge have received a piece of the [Take This item set](http://habitica.wikia.com/wiki/Event_Item_Sequences#Take_This_Armor_Set) if they hadn\'t completed the set already. It is located in the [Market](/shops/market) under Class \> None. Enjoy!"')
+        .small by Doctor B, the Take This team, Lemoness, and SabreCat
+        .media
+          .promo_mystery_201709
+          .media-body
+            h3 Last Chance for Sorcery Student Set and Farm Friends Pet Quest Bundle
+            p(v-markdown='"We\'ve extended the availability of the September mystery item set and the Farm Friends Pet Quest Bundle due to our upgrade! You have two days left to [subscribe](user/settings/subscription) and receive the Sorcery Student Set, or to pick up the Cow, Horse, and Sheep quests for a discounted price of 7 Gems!"')
+        p Thanks so much for your support! You help keep Habitica running.
+        .small by Lemoness and SabreCat
+        .small art by UncommonCriminal, Soloana, fuzzytrees, Feralem Tau, Eevachu, Beffymaroo, JessicaChase, starsystemic, nonight, Misceo and Tocath
+        .small writing by schizelle, VikingRunner, Salambander, Leephon, and Lemoness
+      .promo_farm_friends.left-margin
     br
 </template>
 
@@ -62,6 +76,10 @@
     margin: 0 auto 1em auto;
   }
 
+  .left-margin {
+    margin-left: 1em;
+  }
+
   .right-margin {
     margin-right: 1em;
   }

website/client/components/tasks/taskModal.vue

@@ -767,7 +767,7 @@ export default {
 
         await this.$store.dispatch('tasks:unassignTask', {
           taskId: this.task._id,
-          userId: this.user._id,
+          userId: memberId,
         });
         return;
       }
@@ -778,7 +778,7 @@ export default {
 
       await this.$store.dispatch('tasks:assignTask', {
         taskId: this.task._id,
-        userId: this.user._id,
+        userId: memberId,
       });
     },
   },

website/client/store/actions/members.js

@@ -35,6 +35,10 @@ export async function getChallengeMembers (store, payload) {
     url += `&lastId=${payload.lastMemberId}`;
   }
 
+  if (payload.searchTerm) {
+    url += `&search=${payload.searchTerm}`;
+  }
+
   let response = await axios.get(url);
   return response.data.data;
 }

website/common/locales/bg/backgrounds.json

@@ -296,5 +296,12 @@
     "backgroundGardenShedText": "Градинска барака",
     "backgroundGardenShedNotes": "Поработете в градинска барака.",
     "backgroundPixelistsWorkshopText": "Работилница за пиксели",
-    "backgroundPixelistsWorkshopNotes": "Създавайте шедьоври в работилницата за пиксели."
+    "backgroundPixelistsWorkshopNotes": "Създавайте шедьоври в работилницата за пиксели.",
+    "backgrounds102017": "SET 41: Released October 2017",
+    "backgroundMagicalCandlesText": "Magical Candles",
+    "backgroundMagicalCandlesNotes": "Bask in the glow of Magical Candles.",
+    "backgroundSpookyHotelText": "Spooky Hotel",
+    "backgroundSpookyHotelNotes": "Sneak down the hall of a Spooky Hotel.",
+    "backgroundTarPitsText": "Tar Pits",
+    "backgroundTarPitsNotes": "Tiptoe through the Tar Pits."
 }

website/common/locales/bg/challenge.json

@@ -114,7 +114,7 @@
     "shortName": "Кратко име",
     "shortNamePlaceholder": "Какъв кратък етикет трябва да бъде използван за разпознаване на предизвикателството Ви?",
     "updateChallenge": "Обновяване на предизвикателството",
-    "haveNoChallenges": "Нямате никакви предизвикателства",
+    "haveNoChallenges": "This group has no Challenges",
     "loadMore": "Зареждане на още",
     "exportChallengeCsv": "Изнасяне на предизвикателоството",
     "editingChallenge": "Редактиране на предизвикателството",
@@ -125,5 +125,6 @@
     "descriptionRequired": "Описанието е задължително",
     "locationRequired": "Мястото на предизвикателството е задължително („Добавяне в“)",
     "categoiresRequired": "Задължително е да бъде избрана поне една категория",
-    "viewProgressOf": "Преглед на напредъка на"
+    "viewProgressOf": "Преглед на напредъка на",
+    "selectMember": "Select Member"
 }

website/common/locales/bg/character.json

@@ -149,7 +149,7 @@
     "optOutOfPMs": "Отказване",
     "chooseClass": "Изберете клас",
     "chooseClassLearnMarkdown": "[Научете повече относно класовата система на Хабитика](http://habitica.wikia.com/wiki/Class_System)",
-    "optOutOfClassesText": "Не Ви се занимава с класове? Искате да изберете по-късно? Откажете се от тях — ще бъдете воин без специални умения. Можете да прочетете относно класовата система по-късно в уикито, както и да включите класовете по всяко време от Потребител -> Показатели.",
+    "optOutOfClassesText": "Can't be bothered with classes? Want to choose later? Opt out - you'll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time under User Icon > Settings.",
     "selectClass": "Избиране на <%= heroClass %>",
     "select": "Избиране",
     "stealth": "Невидимост",
@@ -196,7 +196,7 @@
     "int": "ИНТ",
     "showQuickAllocation": "Показване на разпределението на показателните точки",
     "hideQuickAllocation": "Скриване на разпределението на показателните точки",
-    "quickAllocationLevelPopover": "Всяко ниво Ви дава една точка, която можете да разпределите на показател по свой избор. Можете да го направите ръчно или да оставите играта да реши вместо Вас, използвайки една възможностите за автоматично разпределяне, които може да намерите в Потребител -> Показатели.",
+    "quickAllocationLevelPopover": "Each level earns you one point to assign to an attribute of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options found in User Icon > Stats.",
     "invalidAttribute": "„<%= attr %>“ не е правилен показател.",
     "notEnoughAttrPoints": "Нямате достатъчно показателни точки.",
     "style": "Стил",

website/common/locales/bg/front.json

@@ -311,5 +311,6 @@
     "signup": "Регистриране",
     "getStarted": "Първи стъпки",
     "mobileApps": "Мобилни приложения",
-    "learnMore": "Научете повече"
+    "learnMore": "Научете повече",
+    "useMobileApps": "Habitica is not optimized for a mobile browser. We recommend downloading our mobile apps."
 }

website/common/locales/bg/gear.json

@@ -4,7 +4,6 @@
     "klass": "Клас",
     "groupBy": "Групиране по <%= type %>",
     "classBonus": "(Този предмет е за Вашия клас, така че показателите му се умножават по 1,5.)",
-    "classEquipment": "Класова екипировка",
     "classArmor": "Класова броня",
     "featuredset": "Препоръчан комплект „<%= name %>“",
     "mysterySets": "Тайнствени комплекти",
@@ -647,6 +646,8 @@
     "armorArmoireYellowPartyDressNotes": "Вие имате концентрация, сила и ум, и сте в крак с модата! Увеличава усета, силата и интелигентността с по <%= attrs %>. Омагьосан гардероб: комплект „Жълта панделка“ (предмет 2 от 2).",
     "armorArmoireFarrierOutfitText": "Облекло на подковач",
     "armorArmoireFarrierOutfitNotes": "Тези здрави работни дрехи могат да издържат и в най-мръсната конюшня. Увеличава интелигентността, якостта и усета с по <%= attrs %>. Омагьосан гардероб: комплект „Подковач“ (предмет 2 от 3).",
+    "armorArmoireCandlestickMakerOutfitText": "Candlestick Maker Outfit",
+    "armorArmoireCandlestickMakerOutfitNotes": "This sturdy set of clothes will protect you from hot wax spills as you ply your craft! Increases Constitution by <%= con %>. Enchanted Armoire: Candlestick Maker Set (Item 1 of 3).",
     "headgear": "шлем",
     "headgearCapitalized": "Защита за главата",
     "headBase0Text": "Няма защита за главата",
@@ -1003,6 +1004,8 @@
     "headArmoireSwanFeatherCrownNotes": "Тази тиара е прекрасна и лека като лебедово перо! Увеличава интелигентността с <%= int %>. Омагьосан гардероб: комплект „Лебедов танцьор“ (предмет 1 от 3).",
     "headArmoireAntiProcrastinationHelmText": "Противо-протакащ шлем",
     "headArmoireAntiProcrastinationHelmNotes": "Този могъщ стоманен шлем ще Ви помогне да спечелите битката за здравето, щастието и продуктивността си! Увеличава усета с <%= per %>. Омагьосан гардероб: Противо-протакащ комплект (предмет 1 от 3).",
+    "headArmoireCandlestickMakerHatText": "Candlestick Maker Hat",
+    "headArmoireCandlestickMakerHatNotes": "A jaunty hat makes every job more fun, and candlemaking is no exception! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Candlestick Maker Set (Item 2 of 3).",
     "offhand": "страничен предмет",
     "offhandCapitalized": "Страничен предмет",
     "shieldBase0Text": "Няма страничен предмет",
@@ -1189,6 +1192,8 @@
     "shieldArmoireAntiProcrastinationShieldNotes": "Този як стоманен щит ще Ви помогне да блокирате всичко, което Ви разсейва, още щом се появи! Увеличава якостта с <%= con %>. Омагьосан гардероб: Противо-протакащ комплект (предмет 3 от 3).",
     "shieldArmoireHorseshoeText": "Подкова",
     "shieldArmoireHorseshoeNotes": "Защитете краката на копитните си превози с тази желязна подкова. Увеличава якостта, усета и силата с по <%= attrs %>. Омагьосан гардероб: комплект „Подковач“ (предмет 3 от 3).",
+    "shieldArmoireHandmadeCandlestickText": "Handmade Candlestick",
+    "shieldArmoireHandmadeCandlestickNotes": "Your fine wax wares provide light and warmth to grateful Habiticans! Increases Strength by <%= str %>. Enchanted Armoire: Candlestick Maker Set (Item 3 of 3).",
     "back": "Аксесоар за гръб",
     "backCapitalized": "Аксесоар за гръб",
     "backBase0Text": "Няма аксесоар за гръб",

website/common/locales/bg/generic.json

@@ -64,6 +64,7 @@
     "subscriberItemText": "Всеки месец абонатите получават тайнствен предмет. Обикновено това става около една седмица преди края на месеца. За повече информация, прегледайте страницата в уикито с името „Mystery Item“ (Тайнствен предмет).",
     "all": "Всички",
     "none": "Никоя",
+    "more": "<%= count %> more",
     "and": "и",
     "loginSuccess": "Влязохте успешно!",
     "youSure": "Сигурен/на ли сте?",
@@ -121,7 +122,7 @@
     "error": "Грешка",
     "menu": "Меню",
     "notifications": "Известия",
-    "noNotifications": "Нямате нови съобщения.",
+    "noNotifications": "You have no notifications.",
     "clear": "Изчистване",
     "endTour": "Край на обиколката",
     "audioTheme": "Звуков комплект",

website/common/locales/bg/groups.json

@@ -355,7 +355,7 @@
     "guildSummaryPlaceholder": "Напишете кратко описание, което да представи гилдията Ви на другите хабитиканци. Каква е основната цел на гилдията Ви и защо хората биха искали да се присъединят? Опитайте се да използвате в резюмето ключови думи, така че хабитиканците да могат лесно да го открият при търсене!",
     "groupDescription": "Описание",
     "guildDescriptionPlaceholder": "Използвайте този раздел, за да добавите повече подробности за всичко, което членовете на гилдията трябва да знаят за нея. Тук можете да добавите и полезни съвети и връзки, както и вдъхновяващи лозунги!",
-    "markdownFormattingHelp": "Помощ за форматирането чрез „Markdown“",
+    "markdownFormattingHelp": "[Markdown formatting help](http://habitica.wikia.com/wiki/Markdown_Cheat_Sheet)",
     "partyDescriptionPlaceholder": "Това е описанието на групата ни. То описва какво правим в тази група. Ако искате да научите повече относно това какво правим в тази група, прочетете описанието.",
     "guildGemCostInfo": "Цената за създаването на гилдия подсигурява качеството на гилдиите, а диамантите се прехвърлят в банката на гилдията.",
     "noGuildsTitle": "Не членувате в нито една гилдия.",
@@ -388,7 +388,10 @@
     "reverseChat": "Обръщане на разговора",
     "invites": "Покани",
     "details": "Подробности",
-    "participantDesc": "След като всички членове са приели или отказали, мисията започва. Само онези, които са натиснали „Приемам“, могат да участват в мисията и да им се падат предмети.",
+    "participantDesc": "Once all members have either accepted or declined, the Quest begins. Only those who clicked 'accept' will be able to participate in the Quest and receive the rewards.",
     "groupGems": "Групови диаманти",
-    "groupGemsDesc": "Диамантите на гилдията могат да бъдат използвани за създаване на предизвикателства! В бъдеще ще можете да добавяте още диаманти в гилдията."
+    "groupGemsDesc": "Диамантите на гилдията могат да бъдат използвани за създаване на предизвикателства! В бъдеще ще можете да добавяте още диаманти в гилдията.",
+    "groupTaskBoard": "Task Board",
+    "groupInformation": "Group Information",
+    "groupBilling": "Group Billing"
 }