Merge branch 'develop' into Hus274-7688

.ebextensions/01-increase-timeout.config

@@ -1,7 +0,0 @@
-option_settings:
-  - namespace: aws:elasticbeanstalk:command
-    option_name: Timeout
-    value: 1800
-  - namespace: aws:elb:policies
-    option_name: ConnectionSettingIdleTimeout
-    value: 900

.ebextensions/deploy.config

@@ -1,6 +1,20 @@
+option_settings:
+  - namespace: aws:elasticbeanstalk:command
+    option_name: Timeout
+    value: 1800
+  - namespace: aws:elb:policies
+    option_name: ConnectionSettingIdleTimeout
+    value: 900
 commands:
-  01_sym:
+  01_sym_node:
     command: "ln -sf $(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/node /bin/node"
+files:
+  "/opt/elasticbeanstalk/hooks/appdeploy/pre/41update_npm.sh" :
+    mode: "000775"
+    owner: root
+    group: users
+    content: |
+      $(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/npm install -g npm@3
 container_commands:
   01_makeBabel:
     command: "touch /tmp/.babel.json"

.eslintignore

@@ -13,13 +13,6 @@ website/client/
 
 # Temporarilly disabled. These should be removed when the linting errors are fixed
 common/script/content/index.js
-common/script/public/**/*.js
-
-website/server/**/api-v2/**/*.js
-website/server/routes/payments.js
-website/server/routes/pages.js
-website/server/middlewares/apiThrottle.js
-website/server/middlewares/forceRefresh.js
 
 debug-scripts/*
 scripts/*

.nodemonignore

@@ -5,6 +5,7 @@ node_modules/**
 website/client/**
 website/views/**
 website/build/**
+test/**
 .git/**
 Gruntfile.js
 CHANGELOG.md

Gruntfile.js

@@ -131,7 +131,7 @@ module.exports = function(grunt) {
   grunt.registerTask('build:test', ['test:prepare:translations', 'build:dev']);
 
   grunt.registerTask('test:prepare:translations', function() {
-    var i18n  = require('./website/server/libs/api-v3/i18n'),
+    var i18n  = require('./website/server/libs/i18n'),
         fs    = require('fs');
     fs.writeFileSync('test/spec/mocks/translations.js',
       "if(!window.env) window.env = {};\n" +

bower.json

@@ -30,7 +30,7 @@
     "bootstrap-tour": "0.10.1",
     "css-social-buttons": "samcollins/css-social-buttons#v1.1.1 ",
     "github-buttons": "mdo/github-buttons#v3.0.0",
-    "hello": "1.5.0",
+    "hello": "1.13.4",
     "jquery": "2.1.0",
     "jquery-colorbox": "1.4.36",
     "jquery-ui": "1.10.3",
@@ -38,10 +38,12 @@
     "js-emoji": "snicker/js-emoji#f25d8a303f",
     "ngInfiniteScroll": "1.0.0",
     "pnotify": "1.3.1",
-    "sticky": "*",
+    "sticky": "1.0.3",
     "swagger-ui": "wordnik/swagger-ui#v2.0.24",
     "smart-app-banner": "78ef9c0679723b25be1a0ae04f7b4aef7cbced4f",
-    "habitica-markdown": "^1.1.0"
+    "habitica-markdown": "1.2.2",
+    "pusher-js-auth": "^2.0.0",
+    "pusher-websocket-iso": "pusher#^3.1.0"
   },
   "devDependencies": {
     "angular-mocks": "1.3.9"

common/css/index.css

@@ -1,9 +1,9 @@
 /* Comment out for holiday events */
-/* .npc_ian {
+.npc_ian {
   background: url("/common/img/sprites/npc_ian.gif") no-repeat;
   width: 78px;
   height: 135px;
-} */
+}
 
 .quest_burnout {
   background: url("/common/img/sprites/quest_burnout.gif") no-repeat;

common/dist/sprites/spritesmith-largeSprites-0.css

@@ -1,150 +1,162 @@
 .2014_Fall_HealerPROMO2 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -855px -1310px;
+  background-position: -1092px -1378px;
   width: 90px;
   height: 90px;
 }
 .2014_Fall_Mage_PROMO9 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1201px -775px;
+  background-position: -1355px -1011px;
   width: 120px;
   height: 90px;
 }
 .2014_Fall_RoguePROMO3 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -109px -1310px;
+  background-position: -649px -1275px;
   width: 105px;
   height: 90px;
 }
 .2014_Fall_Warrior_PROMO {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -309px -1310px;
+  background-position: -1219px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_android {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1095px -508px;
+  background-position: -813px -151px;
   width: 175px;
   height: 175px;
 }
 .promo_backgrounds_armoire_201602 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -220px;
+  background-position: -994px -199px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201603 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -875px -241px;
+  background-position: -1136px -199px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201604 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px 0px;
+  background-position: -281px -525px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201605 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px 0px;
+  background-position: -452px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201606 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px 0px;
+  background-position: -140px -525px;
   width: 140px;
   height: 447px;
 }
+.promo_backgrounds_armoire_201607 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: 0px -525px;
+  width: 139px;
+  height: 588px;
+}
+.promo_backgrounds_armoire_201608 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -452px -442px;
+  width: 140px;
+  height: 439px;
+}
 .promo_backtoschool {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -553px;
+  background-position: -1493px 0px;
   width: 150px;
   height: 150px;
 }
 .promo_burnout {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -875px 0px;
+  background-position: -593px -151px;
   width: 219px;
   height: 240px;
 }
 .promo_chairs_glasses {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1017px -241px;
+  background-position: -452px -882px;
   width: 51px;
   height: 210px;
 }
 .promo_classes_fall_2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -363px -1005px;
+  background-position: -593px -684px;
   width: 321px;
   height: 100px;
 }
 .promo_classes_fall_2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -281px -857px;
+  background-position: -994px -808px;
   width: 377px;
   height: 99px;
 }
 .promo_dilatoryDistress {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1492px -1310px;
+  background-position: -273px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_egg_mounts {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -857px;
+  background-position: -994px -494px;
   width: 280px;
   height: 147px;
 }
 .promo_enchanted_armoire {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -271px -772px;
+  background-position: 0px -1114px;
   width: 374px;
   height: 76px;
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -1091px;
+  background-position: -250px -1275px;
   width: 217px;
   height: 90px;
 }
 .promo_enchanted_armoire_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -875px -536px;
+  background-position: -468px -1275px;
   width: 180px;
   height: 90px;
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1401px;
+  background-position: -455px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_enchanted_armoire_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1201px -684px;
+  background-position: -1357px -908px;
   width: 122px;
   height: 90px;
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -491px -1310px;
+  background-position: -637px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_floral_potions {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1095px -684px;
+  background-position: -593px -785px;
   width: 105px;
   height: 273px;
 }
 .promo_habitica {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1095px -332px;
+  background-position: -1278px -199px;
   width: 175px;
   height: 175px;
 }
@@ -156,313 +168,349 @@
 }
 .promo_haunted_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1483px -704px;
+  background-position: -1493px -1044px;
   width: 100px;
   height: 137px;
 }
 .promo_item_notif {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px 0px;
+  background-position: 0px -1275px;
   width: 249px;
   height: 102px;
 }
 .promo_mystery_201405 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -946px -1310px;
+  background-position: -728px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -251px;
+  background-position: 0px -1378px;
   width: 90px;
   height: 96px;
 }
 .promo_mystery_201407 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -777px -442px;
+  background-position: -1593px -960px;
   width: 42px;
   height: 62px;
 }
 .promo_mystery_201408 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1271px -414px;
+  background-position: -1432px -494px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -400px -1310px;
+  background-position: -910px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1017px -452px;
+  background-position: -919px -573px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -673px -1310px;
+  background-position: -1001px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -442px;
+  background-position: -1596px -819px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1541px -1182px;
+  background-position: -1593px -896px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1219px -1310px;
+  background-position: -1037px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1401px -1310px;
+  background-position: -546px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1271px -508px;
+  background-position: -1432px -566px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -91px -1401px;
+  background-position: -364px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201506 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1271px -578px;
+  background-position: -1596px -749px;
   width: 42px;
   height: 69px;
 }
 .promo_mystery_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1499px -103px;
+  background-position: -306px -417px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -215px -1310px;
+  background-position: -943px -1275px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -582px -1310px;
+  background-position: -91px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -553px;
+  background-position: -849px -1275px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -764px -1310px;
+  background-position: -1310px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201512 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1271px -332px;
+  background-position: -1424px -96px;
   width: 60px;
   height: 81px;
 }
 .promo_mystery_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1201px -866px;
+  background-position: -1372px -808px;
   width: 120px;
   height: 90px;
 }
 .promo_mystery_201602 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1037px -1310px;
+  background-position: -1128px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201603 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1128px -1310px;
+  background-position: -819px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201604 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -402px;
+  background-position: -755px -1275px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201605 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1310px -1310px;
+  background-position: -1401px -1275px;
+  width: 90px;
+  height: 90px;
+}
+.promo_mystery_201606 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -306px -311px;
+  width: 90px;
+  height: 105px;
+}
+.promo_mystery_201607 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -182px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_3014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -1000px;
+  background-position: -699px -967px;
   width: 217px;
   height: 90px;
 }
 .promo_orca {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1483px -852px;
+  background-position: -1493px -1182px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -875px -627px;
+  background-position: -813px -327px;
   width: 115px;
   height: 47px;
 }
 .promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -685px -1005px;
+  background-position: -331px -1191px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -710px -1020px;
+  background-position: -356px -1206px;
   width: 60px;
   height: 60px;
 }
 .promo_peppermint_flame {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -852px;
+  background-position: -1493px -453px;
   width: 140px;
   height: 147px;
 }
 .promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -704px;
+  background-position: -1493px -601px;
   width: 140px;
   height: 147px;
 }
 .customize-option.promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1367px -719px;
+  background-position: -1518px -616px;
   width: 60px;
   height: 60px;
 }
 .promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -326px -1108px;
+  background-position: 0px -1191px;
   width: 330px;
   height: 83px;
 }
 .promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -1182px;
+  background-position: -1278px -375px;
   width: 198px;
   height: 91px;
 }
 .customize-option.promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1367px -1197px;
+  background-position: -1303px -390px;
   width: 60px;
   height: 60px;
 }
 .promo_spring_classes_2016 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1005px;
+  background-position: -994px -908px;
   width: 362px;
   height: 102px;
 }
 .promo_springclasses2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -289px -1219px;
+  background-position: -699px -876px;
   width: 288px;
   height: 90px;
 }
 .promo_springclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1219px;
+  background-position: -699px -785px;
   width: 288px;
   height: 90px;
 }
+.promo_staff_spotlight_Lemoness {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -1493px -749px;
+  width: 102px;
+  height: 146px;
+}
+.promo_staff_spotlight_paglias {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -1493px -896px;
+  width: 99px;
+  height: 147px;
+}
 .promo_summer_classes_2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -401px -525px;
+  background-position: -994px -96px;
   width: 429px;
   height: 102px;
 }
 .promo_summer_classes_2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -770px -676px;
+  background-position: -140px -973px;
   width: 300px;
   height: 88px;
 }
 .promo_summer_classes_2016 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -525px;
+  background-position: -593px 0px;
   width: 400px;
   height: 150px;
 }
-.promo_takethis_armor {
+.promo_takeThis_gear {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -578px -1219px;
+  background-position: -864px -392px;
   width: 114px;
   height: 87px;
 }
+.promo_takethis_armor {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -864px -480px;
+  width: 114px;
+  height: 87px;
+}
+.promo_unconventional_armor {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -915px -684px;
+  width: 60px;
+  height: 60px;
+}
 .promo_updos {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -103px;
+  background-position: -1275px -494px;
   width: 156px;
   height: 147px;
 }
 .promo_veteran_pets {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -799px -772px;
+  background-position: -1493px -1288px;
   width: 146px;
   height: 75px;
 }
 .promo_winter_classes_2016 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -659px -857px;
+  background-position: -994px -1011px;
   width: 360px;
   height: 90px;
 }
 .promo_winterclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1108px;
+  background-position: -593px -573px;
   width: 325px;
   height: 110px;
 }
 .promo_winteryhair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -646px -772px;
+  background-position: -375px -1114px;
   width: 152px;
   height: 75px;
 }
 .avatar_variety {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -271px -676px;
+  background-position: -994px 0px;
   width: 498px;
   height: 95px;
 }
 .npc_viirus {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1310px;
+  background-position: -306px -220px;
   width: 108px;
   height: 90px;
 }
@@ -474,31 +522,31 @@
 }
 .scene_coding {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -402px;
+  background-position: -1493px -151px;
   width: 150px;
   height: 150px;
 }
 .scene_phone_peek {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -251px;
+  background-position: -1493px -302px;
   width: 150px;
   height: 150px;
 }
 .welcome_basic_avatars {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1095px 0px;
+  background-position: -1241px -642px;
   width: 246px;
   height: 165px;
 }
 .welcome_promo_party {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -676px;
+  background-position: -593px -392px;
   width: 270px;
   height: 180px;
 }
 .welcome_sample_tasks {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1095px -166px;
+  background-position: -994px -642px;
   width: 246px;
   height: 165px;
 }