Merge branch 'develop' into TheHollidayInn-tasks-api-up-checkoff-todo

.gitignore

@@ -27,4 +27,4 @@ coverage
 coverage.html
 common/dist/scripts/habitrpg-shared.js
 
-test/spec/translations.js
+test/spec/mocks/translations.js

Gruntfile.js

@@ -220,7 +220,7 @@ module.exports = function(grunt) {
     require('coffee-script');
     var i18n  = require('./website/src/i18n'),
         fs    = require('fs');
-    fs.writeFileSync('test/spec/translations.js',
+    fs.writeFileSync('test/spec/mocks/translations.js',
       "if(!window.env) window.env = {};\n" +
       "window.env.translations = " + JSON.stringify(i18n.translations['en']) + ';');
   });

common/dist/sprites/spritesmith0.css

@@ -1,216 +1,216 @@
 .achievement-alien {
   background-image: url(spritesmith0.png);
-  background-position: -1403px -1301px;
+  background-position: -1949px -479px;
   width: 24px;
   height: 26px;
 }
 .achievement-alpha {
   background-image: url(spritesmith0.png);
-  background-position: -1833px -1729px;
+  background-position: -1924px -182px;
   width: 24px;
   height: 26px;
 }
 .achievement-armor {
   background-image: url(spritesmith0.png);
-  background-position: -1378px -1301px;
+  background-position: -1924px -479px;
   width: 24px;
   height: 26px;
 }
 .achievement-boot {
   background-image: url(spritesmith0.png);
-  background-position: -1353px -1301px;
+  background-position: -1899px -479px;
   width: 24px;
   height: 26px;
 }
 .achievement-bow {
   background-image: url(spritesmith0.png);
-  background-position: -1403px -1274px;
+  background-position: -1949px -452px;
   width: 24px;
   height: 26px;
 }
 .achievement-cactus {
   background-image: url(spritesmith0.png);
-  background-position: -1378px -1274px;
+  background-position: -1924px -452px;
   width: 24px;
   height: 26px;
 }
 .achievement-cake {
   background-image: url(spritesmith0.png);
-  background-position: -1353px -1274px;
+  background-position: -1899px -452px;
   width: 24px;
   height: 26px;
 }
 .achievement-cave {
   background-image: url(spritesmith0.png);
-  background-position: -1494px -1392px;
+  background-position: -1949px -425px;
   width: 24px;
   height: 26px;
 }
 .achievement-coffin {
   background-image: url(spritesmith0.png);
-  background-position: -1469px -1392px;
+  background-position: -1924px -425px;
   width: 24px;
   height: 26px;
 }
 .achievement-comment {
   background-image: url(spritesmith0.png);
-  background-position: -1444px -1392px;
+  background-position: -1899px -425px;
   width: 24px;
   height: 26px;
 }
 .achievement-costumeContest {
   background-image: url(spritesmith0.png);
-  background-position: -1494px -1365px;
+  background-position: -1949px -398px;
   width: 24px;
   height: 26px;
 }
 .achievement-dilatory {
   background-image: url(spritesmith0.png);
-  background-position: -1469px -1365px;
+  background-position: -1924px -398px;
   width: 24px;
   height: 26px;
 }
 .achievement-firefox {
   background-image: url(spritesmith0.png);
-  background-position: -1444px -1365px;
+  background-position: -1899px -398px;
   width: 24px;
   height: 26px;
 }
 .achievement-habitBirthday {
   background-image: url(spritesmith0.png);
-  background-position: -1585px -1483px;
+  background-position: -1949px -371px;
   width: 24px;
   height: 26px;
 }
 .achievement-heart {
   background-image: url(spritesmith0.png);
-  background-position: -1560px -1483px;
+  background-position: -1924px -371px;
   width: 24px;
   height: 26px;
 }
 .achievement-karaoke {
   background-image: url(spritesmith0.png);
-  background-position: -1535px -1483px;
+  background-position: -1899px -371px;
   width: 24px;
   height: 26px;
 }
 .achievement-ninja {
   background-image: url(spritesmith0.png);
-  background-position: -1585px -1456px;
+  background-position: -1949px -344px;
   width: 24px;
   height: 26px;
 }
 .achievement-nye {
   background-image: url(spritesmith0.png);
-  background-position: -1560px -1456px;
+  background-position: -1924px -344px;
   width: 24px;
   height: 26px;
 }
 .achievement-perfect {
   background-image: url(spritesmith0.png);
-  background-position: -1808px -1729px;
+  background-position: -1899px -182px;
   width: 24px;
   height: 26px;
 }
 .achievement-rat {
   background-image: url(spritesmith0.png);
-  background-position: -1676px -1574px;
+  background-position: -1949px -317px;
   width: 24px;
   height: 26px;
 }
 .achievement-shield {
   background-image: url(spritesmith0.png);
-  background-position: -1651px -1574px;
+  background-position: -1924px -317px;
   width: 24px;
   height: 26px;
 }
 .achievement-shinySeed {
   background-image: url(spritesmith0.png);
-  background-position: -1626px -1574px;
+  background-position: -1899px -317px;
   width: 24px;
   height: 26px;
 }
 .achievement-snowball {
   background-image: url(spritesmith0.png);
-  background-position: -1676px -1547px;
+  background-position: -1949px -290px;
   width: 24px;
   height: 26px;
 }
 .achievement-spookDust {
   background-image: url(spritesmith0.png);
-  background-position: -1651px -1547px;
+  background-position: -1924px -290px;
   width: 24px;
   height: 26px;
 }
 .achievement-stoikalm {
   background-image: url(spritesmith0.png);
-  background-position: -1626px -1547px;
+  background-position: -1899px -290px;
   width: 24px;
   height: 26px;
 }
 .achievement-sun {
   background-image: url(spritesmith0.png);
-  background-position: -1767px -1665px;
+  background-position: -1949px -263px;
   width: 24px;
   height: 26px;
 }
 .achievement-sword {
   background-image: url(spritesmith0.png);
-  background-position: -1742px -1665px;
+  background-position: -1924px -263px;
   width: 24px;
   height: 26px;
 }
 .achievement-thermometer {
   background-image: url(spritesmith0.png);
-  background-position: -1717px -1665px;
+  background-position: -1899px -263px;
   width: 24px;
   height: 26px;
 }
 .achievement-tree {
   background-image: url(spritesmith0.png);
-  background-position: -1767px -1638px;
+  background-position: -1949px -236px;
   width: 24px;
   height: 26px;
 }
 .achievement-triadbingo {
   background-image: url(spritesmith0.png);
-  background-position: -1742px -1638px;
+  background-position: -1924px -236px;
   width: 24px;
   height: 26px;
 }
 .achievement-ultimate-healer {
   background-image: url(spritesmith0.png);
-  background-position: -1717px -1638px;
+  background-position: -1899px -236px;
   width: 24px;
   height: 26px;
 }
 .achievement-ultimate-mage {
   background-image: url(spritesmith0.png);
-  background-position: -1858px -1756px;
+  background-position: -1949px -209px;
   width: 24px;
   height: 26px;
 }
 .achievement-ultimate-rogue {
   background-image: url(spritesmith0.png);
-  background-position: -1833px -1756px;
+  background-position: -1924px -209px;
   width: 24px;
   height: 26px;
 }
 .achievement-ultimate-warrior {
   background-image: url(spritesmith0.png);
-  background-position: -1808px -1756px;
+  background-position: -1899px -209px;
   width: 24px;
   height: 26px;
 }
 .achievement-valentine {
   background-image: url(spritesmith0.png);
-  background-position: -1858px -1729px;
+  background-position: -1949px -182px;
   width: 24px;
   height: 26px;
 }
 .achievement-wolf {
   background-image: url(spritesmith0.png);
-  background-position: -1535px -1456px;
+  background-position: -1899px -344px;
   width: 24px;
   height: 26px;
 }
@@ -1866,13 +1866,13 @@
 }
 .hair_mustache_1_porange {
   background-image: url(spritesmith0.png);
-  background-position: -708px -592px;
+  background-position: 0px -1434px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_porange {
   background-image: url(spritesmith0.png);
-  background-position: -733px -607px;
+  background-position: -25px -1449px;
   width: 60px;
   height: 60px;
 }
@@ -1890,13 +1890,13 @@
 }
 .hair_mustache_1_ppurple {
   background-image: url(spritesmith0.png);
-  background-position: -182px -1434px;
+  background-position: -708px -592px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_ppurple {
   background-image: url(spritesmith0.png);
-  background-position: -207px -1449px;
+  background-position: -733px -607px;
   width: 60px;
   height: 60px;
 }
@@ -3762,431 +3762,479 @@
 }
 .hair_bangs_3_pumpkin {
   background-image: url(spritesmith0.png);
-  background-position: 0px -1434px;
+  background-position: -1638px -1798px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_pumpkin {
   background-image: url(spritesmith0.png);
-  background-position: -25px -1449px;
+  background-position: -1663px -1813px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_purple {
   background-image: url(spritesmith0.png);
-  background-position: -637px -979px;
+  background-position: -1729px -1798px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_purple {
   background-image: url(spritesmith0.png);
-  background-position: -662px -994px;
+  background-position: -1754px -1813px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_pyellow {
   background-image: url(spritesmith0.png);
-  background-position: -546px -979px;
+  background-position: -1899px 0px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_pyellow {
   background-image: url(spritesmith0.png);
-  background-position: -571px -994px;
+  background-position: -1924px -15px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_pyellow2 {
   background-image: url(spritesmith0.png);
-  background-position: -455px -979px;
+  background-position: -1899px -91px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_pyellow2 {
   background-image: url(spritesmith0.png);
-  background-position: -480px -994px;
+  background-position: -1924px -106px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_rainbow {
   background-image: url(spritesmith0.png);
-  background-position: -364px -979px;
+  background-position: -182px -1434px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_rainbow {
   background-image: url(spritesmith0.png);
-  background-position: -389px -994px;
+  background-position: -207px -1449px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_red {
   background-image: url(spritesmith0.png);
-  background-position: -273px -979px;
+  background-position: -637px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_red {
   background-image: url(spritesmith0.png);
-  background-position: -298px -994px;
+  background-position: -662px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_snowy {
   background-image: url(spritesmith0.png);
-  background-position: -182px -979px;
+  background-position: -546px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_snowy {
   background-image: url(spritesmith0.png);
-  background-position: -207px -994px;
+  background-position: -571px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_white {
   background-image: url(spritesmith0.png);
-  background-position: -91px -979px;
+  background-position: -455px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_white {
   background-image: url(spritesmith0.png);
-  background-position: -116px -994px;
+  background-position: -480px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_winternight {
   background-image: url(spritesmith0.png);
-  background-position: 0px -979px;
+  background-position: -364px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_winternight {
   background-image: url(spritesmith0.png);
-  background-position: -25px -994px;
+  background-position: -389px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_winterstar {
   background-image: url(spritesmith0.png);
-  background-position: -989px -819px;
+  background-position: -273px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_winterstar {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -834px;
+  background-position: -298px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_yellow {
   background-image: url(spritesmith0.png);
-  background-position: -989px -728px;
+  background-position: -182px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_yellow {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -743px;
+  background-position: -207px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_zombie {
   background-image: url(spritesmith0.png);
-  background-position: -989px -637px;
+  background-position: -91px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_zombie {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -652px;
+  background-position: -116px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_TRUred {
   background-image: url(spritesmith0.png);
-  background-position: -989px -546px;
+  background-position: 0px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_TRUred {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -561px;
+  background-position: -25px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_aurora {
   background-image: url(spritesmith0.png);
-  background-position: -989px -455px;
+  background-position: -989px -819px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_aurora {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -470px;
+  background-position: -1014px -834px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_black {
   background-image: url(spritesmith0.png);
-  background-position: -989px -364px;
+  background-position: -989px -728px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_black {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -379px;
+  background-position: -1014px -743px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_blond {
   background-image: url(spritesmith0.png);
-  background-position: -989px -273px;
+  background-position: -989px -637px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_blond {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -288px;
+  background-position: -1014px -652px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_blue {
   background-image: url(spritesmith0.png);
-  background-position: -989px -182px;
+  background-position: -989px -546px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_blue {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -197px;
+  background-position: -1014px -561px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_brown {
   background-image: url(spritesmith0.png);
-  background-position: -989px -91px;
+  background-position: -989px -455px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_brown {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -106px;
+  background-position: -1014px -470px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_candycane {
   background-image: url(spritesmith0.png);
-  background-position: -989px 0px;
+  background-position: -989px -364px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_candycane {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -15px;
+  background-position: -1014px -379px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_candycorn {
   background-image: url(spritesmith0.png);
-  background-position: -819px -888px;
+  background-position: -989px -273px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_candycorn {
   background-image: url(spritesmith0.png);
-  background-position: -844px -903px;
+  background-position: -1014px -288px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_festive {
   background-image: url(spritesmith0.png);
-  background-position: -728px -888px;
+  background-position: -989px -182px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_festive {
   background-image: url(spritesmith0.png);
-  background-position: -753px -903px;
+  background-position: -1014px -197px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_frost {
   background-image: url(spritesmith0.png);
-  background-position: -637px -888px;
+  background-position: -989px -91px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_frost {
   background-image: url(spritesmith0.png);
-  background-position: -662px -903px;
+  background-position: -1014px -106px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ghostwhite {
   background-image: url(spritesmith0.png);
-  background-position: -546px -888px;
+  background-position: -989px 0px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ghostwhite {
   background-image: url(spritesmith0.png);
-  background-position: -571px -903px;
+  background-position: -1014px -15px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_green {
   background-image: url(spritesmith0.png);
-  background-position: -455px -888px;
+  background-position: -819px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_green {
   background-image: url(spritesmith0.png);
-  background-position: -480px -903px;
+  background-position: -844px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_halloween {
   background-image: url(spritesmith0.png);
-  background-position: -364px -888px;
+  background-position: -728px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_halloween {
   background-image: url(spritesmith0.png);
-  background-position: -389px -903px;
+  background-position: -753px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_holly {
   background-image: url(spritesmith0.png);
-  background-position: -273px -888px;
+  background-position: -637px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_holly {
   background-image: url(spritesmith0.png);
-  background-position: -298px -903px;
+  background-position: -662px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_hollygreen {
   background-image: url(spritesmith0.png);
-  background-position: -182px -888px;
+  background-position: -546px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_hollygreen {
   background-image: url(spritesmith0.png);
-  background-position: -207px -903px;
+  background-position: -571px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_midnight {
   background-image: url(spritesmith0.png);
-  background-position: -91px -888px;
+  background-position: -455px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_midnight {
   background-image: url(spritesmith0.png);
-  background-position: -116px -903px;
+  background-position: -480px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pblue {
   background-image: url(spritesmith0.png);
-  background-position: 0px -888px;
+  background-position: -364px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pblue {
   background-image: url(spritesmith0.png);
-  background-position: -25px -903px;
+  background-position: -389px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pblue2 {
   background-image: url(spritesmith0.png);
-  background-position: -889px -740px;
+  background-position: -273px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pblue2 {
   background-image: url(spritesmith0.png);
-  background-position: -914px -755px;
+  background-position: -298px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_peppermint {
   background-image: url(spritesmith0.png);
-  background-position: -798px -740px;
+  background-position: -182px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_peppermint {
   background-image: url(spritesmith0.png);
-  background-position: -823px -755px;
+  background-position: -207px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pgreen {
   background-image: url(spritesmith0.png);
-  background-position: -707px -740px;
+  background-position: -91px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pgreen {
   background-image: url(spritesmith0.png);
-  background-position: -732px -755px;
+  background-position: -116px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pgreen2 {
   background-image: url(spritesmith0.png);
-  background-position: -1080px 0px;
+  background-position: 0px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pgreen2 {
   background-image: url(spritesmith0.png);
-  background-position: -1105px -15px;
+  background-position: -25px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_porange {
   background-image: url(spritesmith0.png);
-  background-position: -910px -979px;
+  background-position: -889px -740px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_porange {
   background-image: url(spritesmith0.png);
-  background-position: -935px -994px;
+  background-position: -914px -755px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_porange2 {
   background-image: url(spritesmith0.png);
-  background-position: -819px -979px;
+  background-position: -798px -740px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_porange2 {
   background-image: url(spritesmith0.png);
-  background-position: -844px -994px;
+  background-position: -823px -755px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppink {
   background-image: url(spritesmith0.png);
-  background-position: -728px -979px;
+  background-position: -707px -740px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppink {
+  background-image: url(spritesmith0.png);
+  background-position: -732px -755px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_10_ppink2 {
+  background-image: url(spritesmith0.png);
+  background-position: -1080px 0px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_10_ppink2 {
+  background-image: url(spritesmith0.png);
+  background-position: -1105px -15px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_10_ppurple {
+  background-image: url(spritesmith0.png);
+  background-position: -910px -979px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_10_ppurple {
+  background-image: url(spritesmith0.png);
+  background-position: -935px -994px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_10_ppurple2 {
+  background-image: url(spritesmith0.png);
+  background-position: -819px -979px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_10_ppurple2 {
+  background-image: url(spritesmith0.png);
+  background-position: -844px -994px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_10_pumpkin {
+  background-image: url(spritesmith0.png);
+  background-position: -728px -979px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_10_pumpkin {
   background-image: url(spritesmith0.png);
   background-position: -753px -994px;
   width: 60px;