3.35.0

When blocking a user, make them rest at the inn - fixes #7935

.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/*

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",

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,24 +1,24 @@
 .2014_Fall_HealerPROMO2 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -546px -1378px;
+  background-position: -1116px -1275px;
   width: 90px;
   height: 90px;
 }
 .2014_Fall_Mage_PROMO9 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1372px -808px;
+  background-position: -1355px -1011px;
   width: 120px;
   height: 90px;
 }
 .2014_Fall_RoguePROMO3 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -653px;
+  background-position: -306px -311px;
   width: 105px;
   height: 90px;
 }
 .2014_Fall_Warrior_PROMO {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1104px -1275px;
+  background-position: -1389px -1275px;
   width: 90px;
   height: 90px;
 }
@@ -30,25 +30,25 @@
 }
 .promo_backgrounds_armoire_201602 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1136px -199px;
+  background-position: -994px -199px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201603 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -994px -199px;
+  background-position: -1136px -199px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201604 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -281px -525px;
+  background-position: -452px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201605 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px 0px;
+  background-position: -281px -525px;
   width: 140px;
   height: 441px;
 }
@@ -64,6 +64,12 @@
   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: -1493px -302px;
@@ -78,7 +84,7 @@
 }
 .promo_chairs_glasses {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -442px;
+  background-position: -452px -882px;
   width: 51px;
   height: 210px;
 }
@@ -96,7 +102,7 @@
 }
 .promo_dilatoryDistress {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -273px -1378px;
+  background-position: -364px -1378px;
   width: 90px;
   height: 90px;
 }
@@ -126,19 +132,19 @@
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -455px -1378px;
+  background-position: -546px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_enchanted_armoire_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -1140px;
+  background-position: -1357px -908px;
   width: 122px;
   height: 90px;
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -831px -1275px;
+  background-position: -910px -1378px;
   width: 90px;
   height: 90px;
 }
@@ -162,7 +168,7 @@
 }
 .promo_haunted_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -896px;
+  background-position: -1493px -1044px;
   width: 100px;
   height: 137px;
 }
@@ -174,19 +180,19 @@
 }
 .promo_mystery_201405 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1377px -1275px;
+  background-position: -1001px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -956px;
+  background-position: -91px -1378px;
   width: 90px;
   height: 96px;
 }
 .promo_mystery_201407 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1594px -960px;
+  background-position: -1593px -960px;
   width: 42px;
   height: 62px;
 }
@@ -198,19 +204,19 @@
 }
 .promo_mystery_201409 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -649px -1275px;
+  background-position: -1183px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -813px -327px;
+  background-position: -919px -573px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1013px -1275px;
+  background-position: -1092px -1378px;
   width: 90px;
   height: 90px;
 }
@@ -222,19 +228,19 @@
 }
 .promo_mystery_201501 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1594px -896px;
+  background-position: -1593px -896px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -91px -1378px;
+  background-position: -728px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -182px -1378px;
+  background-position: -637px -1378px;
   width: 90px;
   height: 90px;
 }
@@ -246,7 +252,7 @@
 }
 .promo_mystery_201505 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -364px -1378px;
+  background-position: -1025px -1275px;
   width: 90px;
   height: 90px;
 }
@@ -258,31 +264,31 @@
 }
 .promo_mystery_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -744px;
+  background-position: 0px -1378px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -220px;
+  background-position: -649px -1275px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -740px -1275px;
+  background-position: -273px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -311px;
+  background-position: -931px -1275px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -922px -1275px;
+  background-position: -182px -1378px;
   width: 90px;
   height: 90px;
 }
@@ -294,40 +300,52 @@
 }
 .promo_mystery_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1357px -908px;
+  background-position: -1372px -808px;
   width: 120px;
   height: 90px;
 }
 .promo_mystery_201602 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1195px -1275px;
+  background-position: -1298px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201603 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1286px -1275px;
+  background-position: -1207px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201604 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -402px;
+  background-position: -743px -1275px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201605 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1378px;
+  background-position: -455px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201606 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -850px;
+  background-position: -306px -402px;
   width: 90px;
   height: 105px;
 }
+.promo_mystery_201607 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -819px -1378px;
+  width: 90px;
+  height: 90px;
+}
+.promo_mystery_201608 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -837px -1275px;
+  width: 93px;
+  height: 90px;
+}
 .promo_mystery_3014 {
   background-image: url(spritesmith-largeSprites-0.png);
   background-position: -250px -1275px;
@@ -336,13 +354,13 @@
 }
 .promo_orca {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -1034px;
+  background-position: -1493px -1182px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -1307px;
+  background-position: -813px -327px;
   width: 115px;
   height: 47px;
 }
@@ -360,19 +378,19 @@
 }
 .promo_peppermint_flame {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -601px;
+  background-position: -1493px -453px;
   width: 140px;
   height: 147px;
 }
 .promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -453px;
+  background-position: -1493px -601px;
   width: 140px;
   height: 147px;
 }
 .customize-option.promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1518px -468px;
+  background-position: -1518px -616px;
   width: 60px;
   height: 60px;
 }
@@ -418,6 +436,12 @@
   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: -994px -96px;
@@ -438,16 +462,22 @@
 }
 .promo_takeThis_gear {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -864px -392px;
+  background-position: -864px -480px;
   width: 114px;
   height: 87px;
 }
 .promo_takethis_armor {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1355px -1011px;
+  background-position: -864px -392px;
   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: -1275px -494px;
@@ -456,7 +486,7 @@
 }
 .promo_veteran_pets {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -1231px;
+  background-position: -1493px -1288px;
   width: 146px;
   height: 75px;
 }
@@ -486,7 +516,7 @@
 }
 .npc_viirus {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -864px -480px;
+  background-position: -306px -220px;
   width: 108px;
   height: 90px;
 }
@@ -498,19 +528,19 @@
 }
 .scene_coding {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -151px;
+  background-position: -1493px 0px;
   width: 150px;
   height: 150px;
 }
 .scene_phone_peek {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px 0px;
+  background-position: -1493px -151px;
   width: 150px;
   height: 150px;
 }
 .welcome_basic_avatars {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -994px -642px;
+  background-position: -1241px -642px;
   width: 246px;
   height: 165px;
 }
@@ -522,7 +552,7 @@
 }
 .welcome_sample_tasks {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1241px -642px;
+  background-position: -994px -642px;
   width: 246px;
   height: 165px;
 }