3.39.1

Revert "Disable checkbox"
This reverts commit 82448b2a93.
2026-05-24 11:49:12 -05:00 · 2016-09-07 21:00:46 -05:00 · 2016-09-07 20:45:40 -05:00 · 2016-09-07 20:39:51 +00:00 · 2016-09-07 20:39:30 +00:00 · 2016-09-07 20:19:43 +00:00
884 changed files with 26438 additions and 17516 deletions
@@ -0,0 +1,11 @@
+# top level config
+root = true
+
+# all files
+[*]
+charset = utf-8
+end_of_line = lf # Unix-style
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
@@ -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",
@@ -1,42 +1,42 @@
 .2014_Fall_HealerPROMO2 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1001px -1378px;
+  background-position: -1331px -1275px;
  width: 90px;
  height: 90px;
 }
 .2014_Fall_Mage_PROMO9 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1357px -908px;
+  background-position: -1495px -1011px;
  width: 120px;
  height: 90px;
 }
 .2014_Fall_RoguePROMO3 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -220px;
+  background-position: -758px -1275px;
  width: 105px;
  height: 90px;
 }
 .2014_Fall_Warrior_PROMO {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1295px -1275px;
+  background-position: -726px -1378px;
  width: 90px;
  height: 90px;
 }
 .promo_android {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -813px -151px;
+  background-position: -953px -151px;
  width: 175px;
  height: 175px;
 }
 .promo_backgrounds_armoire_201602 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -994px -199px;
+  background-position: -1276px -199px;
  width: 141px;
  height: 294px;
 }
 .promo_backgrounds_armoire_201603 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1136px -199px;
+  background-position: -1134px -199px;
  width: 141px;
  height: 294px;
 }
@@ -70,45 +70,51 @@
  width: 140px;
  height: 439px;
 }
+.promo_backgrounds_armoire_201609 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -593px 0px;
+  width: 139px;
+  height: 438px;
+}
 .promo_backtoschool {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -151px;
+  background-position: -302px -1378px;
  width: 150px;
  height: 150px;
 }
 .promo_burnout {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px -151px;
+  background-position: -733px -151px;
  width: 219px;
  height: 240px;
 }
 .promo_chairs_glasses {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -882px;
+  background-position: -1633px 0px;
  width: 51px;
  height: 210px;
 }
 .promo_classes_fall_2014 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px -684px;
+  background-position: -733px -684px;
  width: 321px;
  height: 100px;
 }
 .promo_classes_fall_2015 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -994px -808px;
+  background-position: -1134px -808px;
  width: 377px;
  height: 99px;
 }
 .promo_dilatoryDistress {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1113px -1275px;
+  background-position: -999px -1378px;
  width: 90px;
  height: 90px;
 }
 .promo_egg_mounts {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -994px -494px;
+  background-position: -1134px -494px;
  width: 280px;
  height: 147px;
 }
@@ -120,7 +126,7 @@
 }
 .promo_enchanted_armoire_201507 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -699px -967px;
+  background-position: -839px -967px;
  width: 217px;
  height: 90px;
 }
@@ -132,31 +138,31 @@
 }
 .promo_enchanted_armoire_201509 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -182px -1378px;
+  background-position: -1181px -1378px;
  width: 90px;
  height: 90px;
 }
 .promo_enchanted_armoire_201511 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -1140px;
+  background-position: -1497px -908px;
  width: 122px;
  height: 90px;
 }
 .promo_enchanted_armoire_201601 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -364px -1378px;
+  background-position: 0px -1529px;
  width: 90px;
  height: 90px;
 }
 .promo_floral_potions {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px -785px;
+  background-position: -733px -785px;
  width: 105px;
  height: 273px;
 }
 .promo_habitica {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1278px -199px;
+  background-position: -1418px -199px;
  width: 175px;
  height: 175px;
 }
@@ -168,7 +174,7 @@
 }
 .promo_haunted_hair {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -896px;
+  background-position: -593px -734px;
  width: 100px;
  height: 137px;
 }
@@ -180,166 +186,172 @@
 }
 .promo_mystery_201405 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -637px -1378px;
+  background-position: -91px -1529px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201406 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1378px;
+  background-position: -635px -1378px;
  width: 90px;
  height: 96px;
 }
 .promo_mystery_201407 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1594px -960px;
+  background-position: -1633px -412px;
  width: 42px;
  height: 62px;
 }
 .promo_mystery_201408 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1432px -494px;
+  background-position: -1572px -494px;
  width: 60px;
  height: 71px;
 }
 .promo_mystery_201409 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -819px -1378px;
+  background-position: -273px -1529px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201410 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -813px -327px;
+  background-position: -1059px -573px;
  width: 72px;
  height: 63px;
 }
 .promo_mystery_201411 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -910px -1378px;
+  background-position: -182px -1529px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201412 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1596px -819px;
+  background-position: -1633px -345px;
  width: 42px;
  height: 66px;
 }
 .promo_mystery_201501 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1594px -896px;
+  background-position: -1633px -211px;
  width: 48px;
  height: 63px;
 }
 .promo_mystery_201502 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -931px -1275px;
+  background-position: -1363px -1378px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201503 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -455px -1378px;
+  background-position: -1272px -1378px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201504 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1432px -566px;
+  background-position: -1572px -566px;
  width: 60px;
  height: 69px;
 }
 .promo_mystery_201505 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -273px -1378px;
+  background-position: -1240px -1275px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201506 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1596px -749px;
+  background-position: -1633px -275px;
  width: 42px;
  height: 69px;
 }
 .promo_mystery_201507 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -417px;
+  background-position: -544px -1378px;
  width: 90px;
  height: 105px;
 }
 .promo_mystery_201508 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -837px -1275px;
+  background-position: -1146px -1275px;
  width: 93px;
  height: 90px;
 }
 .promo_mystery_201509 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1386px -1275px;
+  background-position: -908px -1378px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201510 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -743px -1275px;
+  background-position: -1052px -1275px;
  width: 93px;
  height: 90px;
 }
 .promo_mystery_201511 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1204px -1275px;
+  background-position: -817px -1378px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201512 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1424px -96px;
+  background-position: -1564px -96px;
  width: 60px;
  height: 81px;
 }
 .promo_mystery_201601 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1372px -808px;
+  background-position: -1512px -808px;
  width: 120px;
  height: 90px;
 }
 .promo_mystery_201602 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1022px -1275px;
+  background-position: -1513px -1275px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201603 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -728px -1378px;
+  background-position: -1422px -1275px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201604 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -649px -1275px;
+  background-position: -864px -1275px;
  width: 93px;
  height: 90px;
 }
 .promo_mystery_201605 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -546px -1378px;
+  background-position: -1090px -1378px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201606 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -311px;
+  background-position: -453px -1378px;
  width: 90px;
  height: 105px;
 }
 .promo_mystery_201607 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -91px -1378px;
+  background-position: -1454px -1378px;
  width: 90px;
  height: 90px;
 }
+.promo_mystery_201608 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -958px -1275px;
+  width: 93px;
+  height: 90px;
+}
 .promo_mystery_3014 {
  background-image: url(spritesmith-largeSprites-0.png);
  background-position: -250px -1275px;
@@ -348,91 +360,103 @@
 }
 .promo_orca {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -1034px;
+  background-position: -593px -872px;
  width: 105px;
  height: 105px;
 }
 .promo_partyhats {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -1307px;
+  background-position: -953px -327px;
  width: 115px;
  height: 47px;
 }
 .promo_pastel_skin {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -331px -1191px;
+  background-position: 0px -1191px;
  width: 330px;
  height: 83px;
 }
 .customize-option.promo_pastel_skin {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -356px -1206px;
+  background-position: -25px -1206px;
  width: 60px;
  height: 60px;
 }
 .promo_peppermint_flame {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -453px;
+  background-position: -306px -220px;
  width: 140px;
  height: 147px;
 }
 .promo_pet_skins {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -601px;
+  background-position: -452px -882px;
  width: 140px;
  height: 147px;
 }
 .customize-option.promo_pet_skins {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1518px -616px;
+  background-position: -477px -897px;
  width: 60px;
  height: 60px;
 }
 .promo_shimmer_hair {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1191px;
+  background-position: -331px -1191px;
  width: 330px;
  height: 83px;
 }
 .promo_splashyskins {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1278px -375px;
+  background-position: -1418px -375px;
  width: 198px;
  height: 91px;
 }
 .customize-option.promo_splashyskins {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1303px -390px;
+  background-position: -1443px -390px;
  width: 60px;
  height: 60px;
 }
 .promo_spring_classes_2016 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -994px -908px;
+  background-position: -1134px -908px;
  width: 362px;
  height: 102px;
 }
 .promo_springclasses2014 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -699px -876px;
+  background-position: -839px -876px;
  width: 288px;
  height: 90px;
 }
 .promo_springclasses2015 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -699px -785px;
+  background-position: -839px -785px;
  width: 288px;
  height: 90px;
 }
 .promo_staff_spotlight_Lemoness {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -749px;
+  background-position: -593px -439px;
  width: 102px;
  height: 146px;
 }
+.promo_staff_spotlight_Viirus {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -1004px -392px;
+  width: 119px;
+  height: 147px;
+}
+.promo_staff_spotlight_paglias {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -593px -586px;
+  width: 99px;
+  height: 147px;
+}
 .promo_summer_classes_2014 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -994px -96px;
+  background-position: -1134px -96px;
  width: 429px;
  height: 102px;
 }
@@ -444,49 +468,49 @@
 }
 .promo_summer_classes_2016 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px 0px;
+  background-position: -733px 0px;
  width: 400px;
  height: 150px;
 }
 .promo_takeThis_gear {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -864px -392px;
+  background-position: -306px -368px;
  width: 114px;
  height: 87px;
 }
 .promo_takethis_armor {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1355px -1011px;
+  background-position: -593px -978px;
  width: 114px;
  height: 87px;
 }
 .promo_unconventional_armor {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -886px -327px;
+  background-position: -1055px -684px;
  width: 60px;
  height: 60px;
 }
 .promo_updos {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1275px -494px;
+  background-position: -1415px -494px;
  width: 156px;
  height: 147px;
 }
 .promo_veteran_pets {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -1231px;
+  background-position: -528px -1114px;
  width: 146px;
  height: 75px;
 }
 .promo_winter_classes_2016 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -994px -1011px;
+  background-position: -1134px -1011px;
  width: 360px;
  height: 90px;
 }
 .promo_winterclasses2015 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px -573px;
+  background-position: -733px -573px;
  width: 325px;
  height: 110px;
 }
@@ -498,13 +522,13 @@
 }
 .avatar_variety {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -994px 0px;
+  background-position: -1134px 0px;
  width: 498px;
  height: 95px;
 }
 .npc_viirus {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -864px -480px;
+  background-position: -649px -1275px;
  width: 108px;
  height: 90px;
 }
@@ -516,31 +540,31 @@
 }
 .scene_coding {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -302px;
+  background-position: -151px -1378px;
  width: 150px;
  height: 150px;
 }
 .scene_phone_peek {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px 0px;
+  background-position: 0px -1378px;
  width: 150px;
  height: 150px;
 }
 .welcome_basic_avatars {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1241px -642px;
+  background-position: -1381px -642px;
  width: 246px;
  height: 165px;
 }
 .welcome_promo_party {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px -392px;
+  background-position: -733px -392px;
  width: 270px;
  height: 180px;
 }
 .welcome_sample_tasks {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -994px -642px;
+  background-position: -1134px -642px;
  width: 246px;
  height: 165px;
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Blade Barringer	543a9d06c1	3.39.1	2016-09-07 21:00:46 -05:00
Blade Barringer	aff9af7db2	Revert "Disable checkbox" This reverts commit `82448b2a93`.	2016-09-07 20:45:40 -05:00
Sabe Jones	0de3efe942	3.39.0	2016-09-07 20:39:51 +00:00
Sabe Jones	e474dc199b	chore(sprites): compile	2016-09-07 20:39:30 +00:00
Sabe Jones	4844aa5e47	chore(news): misc Bailey	2016-09-07 20:19:43 +00:00
Blade Barringer	ee409174f1	Format files to adhere to editorconfig (#7977 )	2016-09-07 12:58:26 -05:00
Blade Barringer	da8f0373ba	fix: correct api tag tests to not rely on default tags	2016-09-07 12:55:07 -05:00
Blade Barringer	67716ef309	Clean up quest progress logic	2016-09-07 12:48:06 -05:00
Thomas Gamble	db19dbf49c	shows quest progress in menu #7928 fixes #7928 closes #7960	2016-09-07 12:47:50 -05:00
Matteo Pagliazzi	7ea9debe3f	trigger pusher on system messages too	2016-09-07 17:18:48 +02:00
Matteo Pagliazzi	41079a65c6	correctly reconnect to pusher after inactivity	2016-09-07 17:00:43 +02:00
Matteo Pagliazzi	dafae31366	disable limit of 1 tab per browser connected to pusher	2016-09-07 16:50:22 +02:00
AccioBooks	861eaf36d3	Create .editorconfig fixes #4376 closes #7957	2016-09-07 08:44:57 -05:00
Blade Barringer	def2ea0add	Merge branch 'Ozzystrasza-challenge_sample_tasks' into develop	2016-09-07 08:23:55 -05:00
Ozzystrasza	82448b2a93	Disable checkbox fixes #5284 closes #7961	2016-09-07 08:23:17 -05:00
Alys	9fde8b4d48	adjust footer to have relative link for Submit Bug (fixes #7973 ) and "News" link for Old News page (ref. #7976 )	2016-09-07 23:17:21 +10:00
AccioBooks	5f9eb6a72c	Old news (#7976 ) * Update footer.jade * Update front.json * Update front.json	2016-09-07 07:55:33 -05:00
Blade Barringer	e4fcbed769	Merge pull request #7956 from MathWhiz/patch-1 Clear up login button text	2016-09-06 20:57:46 -05:00
Matteo Pagliazzi	4b6af73a1b	add support for brazilian portuguese (#7910 )	2016-09-04 20:00:49 +02:00
Keith Holliday	836cee2531	Groups assign tasks (#7887 ) * Added initial code for creating and reading group tasks * Separated group task routes. Separated shared task functions * Added taskOrder to group * Minor style fixes * Fixed lint issues * Added unit tests for task manager * Updated task helper functions * Fixed history test * Fixed group task query * Removed extra var * Updated with new file structure * Updated noset values * Removed unecessary undefineds, fixed comments, Added apiignore * Separated group task routes. Separated shared task functions * Added unit tests for task manager * Added initial groups assign route and tests * Added sync assigned task to user * Added unassign route and unlink method * Added remove and unlink group task * Updated linking and unlinking. Add test for updating task info * Added delete group task and tests * Added sync on task update and tests * Added multiple users assignment * Updated unassign for multiple users * Added test for delete task with multiple assigend users * Added update task for multiple assigned users * Fixed issue with get tasks * Abstracted syncable attributes and add tests * Fixed merge conflicts * Fixed style issues, limited group query fields, and added await * Fixed group fields needed. Removed api v2 code * Fixed style issues * Moved group field under group sub document. Updated tests. Fixed other broken tests * Renamed linkedTaskId and fixed broken alias tests * Added debug middleware to new routes * Fixed debug middleware import * Added additional user id check for original group tasks * Updated challenge task check to look for challenge id * Added checklist sync fix	2016-09-03 10:54:55 +02:00
Blade Barringer	173b3f3f84	fix: Account for system messages in flag slack alert	2016-09-02 15:23:56 -05:00
Blade Barringer	36d3ac4611	fix: prevent 500 error when unflagging a system message	2016-09-02 15:14:41 -05:00
Blade Barringer	c703517b25	3.38.0	2016-09-02 13:04:27 -05:00
Blade Barringer	b15476be7a	chore(i18n): update locales	2016-09-02 11:39:36 -05:00
Blade Barringer	aa2c941e1a	Merge pull request #7938 from HabitRPG/send_flags_to_slack Send flags to slack	2016-09-02 11:32:42 -05:00
Blade Barringer	87973d7b66	chore: Switch out footer link for HabitRPG version	2016-09-02 11:10:48 -05:00
Blade Barringer	45e4c6867e	chore(test): increase test coverage around logger lib	2016-09-02 11:10:47 -05:00
Blade Barringer	6480602ee6	fix(test): Correct logger test	2016-09-02 11:10:47 -05:00
Blade Barringer	41851afe5f	fix: noop if no slack flagging url is passed in	2016-09-02 11:10:46 -05:00
Blade Barringer	2180cb3d98	feat(api): Send flag notifications to slack	2016-09-02 11:10:46 -05:00
Sabe Jones	bd5471a0e3	3.37.0	2016-09-01 21:01:40 +00:00
Sabe Jones	e5f2bd4fb1	chore(sprites): compile	2016-09-01 21:01:30 +00:00
Sabe Jones	5c761b1237	feat(content): BGs and Armoire comp (#7964 )	2016-09-01 15:56:35 -05:00
Sabe Jones	3649699b8d	3.36.1	2016-09-01 17:57:13 +00:00
Blade Barringer	7702f9dccc	Challenge checklist fix (#7963 ) * fix(challenges): don't wipe user xlists * Add test for challenge checklists not syncing to user	2016-09-01 12:34:02 -05:00
Sabe Jones	95d33a1dff	3.36.0	2016-09-01 16:03:14 +00:00
Sabe Jones	7efde862f1	fix(challenges): temp remove challenge edit	2016-09-01 15:45:36 +00:00
Blade Barringer	ebef5ad60c	chore: Add test for duplicate locale keys	2016-08-31 21:26:05 -05:00
Sabe Jones	e65f27fb69	fix(subscriptions): gift termination date (#7948 )	2016-08-31 17:16:40 -05:00
Sabe Jones	cb1417ea58	Handle empty market category on Drops page (#7959 ) * fix(market): hide category in view * refactor(view): if, not hide * fix(test): allow empty market cat	2016-08-31 17:16:22 -05:00
Sabe Jones	75eb1b11cf	chore(challenge): next Take This migration	2016-08-31 19:41:04 +00:00
Sabe Jones	7e0a860b25	chore(content): disable Thunderpotions Also remove superfluous message about the Quests Shop	2016-08-31 19:14:28 +00:00
AccioBooks	2d28d8ffed	Clear up login button text	2016-08-31 12:14:42 -05:00
Blade Barringer	3cda5d6b38	chore(i18n): update locales	2016-08-31 08:57:19 -05:00
Sabe Jones	57f49d2a7d	feat(content): Armoire and BG strings	2016-08-30 21:09:04 +00:00
Sabe Jones	e69b733f90	3.35.0	2016-08-30 17:36:30 +00:00
Sabe Jones	c726fa78f5	chore(news): misc Bailey	2016-08-30 17:11:29 +00:00
Sabe Jones	2e050be111	fix(contact): s/leslie/admin/g (#7945 )	2016-08-29 19:58:51 -05:00
Blade Barringer	e5f2a06491	Merge pull request #7941 from gambtho/develop When blocking a user, make them rest at the inn - fixes #7935	2016-08-27 10:52:30 -05:00
Blade Barringer	6e5d2ad20a	Merge pull request #7943 from crookedneighbor/update_require-again chore: Update require-again	2016-08-27 10:31:59 -05:00
Thomas Gamble	af088d4b3a	Blocking a user makes them sleep Fixes #7935 Blocking a user will make the user rest at an inn, the user will remain resting when unblocked	2016-08-27 11:17:45 -04:00
Blade Barringer	92bbafeb5d	chore: Update require-again	2016-08-27 09:57:13 -05:00
Alys	9981f450c0	clarify usage of API's block route and remove incorrect info about only admins using it	2016-08-27 06:04:51 -07:00
Blade Barringer	44abfeb013	Merge pull request #7934 from ujjwalgulecha/fix-health-potion-when-health-is-max GP will not be deducted if health is max	2016-08-27 07:56:46 -05:00
Ujjwal Gulecha	03c14859d5	GP will not be deducted if health is max	2016-08-26 11:30:17 -07:00
Alys	320d8cac5f	replace "Tavern Talk" with "Tavern Chat" above Tavern's chat box - fixes https://github.com/HabitRPG/habitrpg/issues/6813	2016-08-26 07:57:16 -07:00
Blade Barringer	33377263d9	feat(api): Admins can unflag private group messages	2016-08-25 15:31:39 -05:00
Blade Barringer	7f50532e8b	Merge pull request #7930 from crookedneighbor/flag_improvements Flag improvements	2016-08-24 22:28:26 -05:00
Blade Barringer	cf804be04e	chore(api): Update flag chat docs	2016-08-24 21:32:48 -05:00
Blade Barringer	65556c0444	feat: Allow admins to flag messages in private groups	2016-08-24 21:32:32 -05:00
Sabe Jones	88d26cd200	fix(news): credit TheHollidayInn	2016-08-24 15:15:43 -05:00
Husman	2308e14d3e	fix: allows leader of challenge to create new challenge tasks even when not a participant of the challenge. fixes #7918 closes #7924	2016-08-24 12:07:54 -05:00
Blade Barringer	5bcc2561ae	feat(client): Show battle with friends button with 3 members fixes #6754 closes #6765	2016-08-24 08:45:39 -05:00
Blade Barringer	e957617386	3.34.1	2016-08-23 22:14:19 -05:00
Blade Barringer	c5ac5b4f2d	Merge pull request #7921 from HabitRPG/revert_task_cancel_pr fix: Revert #7692	2016-08-23 22:00:03 -05:00
Blade Barringer	3d64f2b849	fix: Revert #7692	2016-08-23 21:40:33 -05:00
Blade Barringer	671e954cec	chore(i18n): update locales	2016-08-23 17:33:04 -05:00
Blade Barringer	f148c592f5	Merge pull request #7911 from crookedneighbor/fix_magic_pets_spacing fix(client): Correct logic to show premium pets	2016-08-23 17:20:17 -05:00
Sabe Jones	53254beaaf	3.34.0	2016-08-23 20:48:36 +00:00
Sabe Jones	0e319200f1	chore(sprites): compile	2016-08-23 20:48:23 +00:00
Sabe Jones	6a04ed7392	fix(editing): send user on dblclick	2016-08-23 20:22:27 +00:00
Sabe Jones	71a759c551	feat(content): mystery items 201608 (#7919 )	2016-08-23 14:49:22 -05:00
Alys	80f57d9a44	remove outdated Physical/Mental/Social/Other descriptions for task-based allocation	2016-08-22 21:01:34 -07:00
Alys	3a79ed6cd6	link to new wiki page describing all extensions in a neat table This is for the "Other Extensions" link on the Settings > API page.	2016-08-22 09:16:18 -07:00
Alys	d691704db2	change Report a Bug link and text in website FAQ (#7718 ) * change Report a Bug link in website FAQ * add email address for reporting login problems	2016-08-20 21:33:39 -07:00
Blade Barringer	fca0188172	Merge branch 'task_edit_fix' into develop	2016-08-20 21:23:43 -05:00
Blade Barringer	67187c1b08	fix: show markdown compiled task text while editing	2016-08-20 09:21:52 -04:00
Blade Barringer	b3b7108bd6	Merge branch 'develop' into Hus274-7688	2016-08-20 08:31:22 -04:00
Alys	dd80a2e76e	make Export Data introduction more accurate (it exports more than Habits)	2016-08-19 21:07:07 -07:00
Alys	2fea2d9565	adjust message displayed on Done To-Dos tab to reflect API v3 changes The 30 most recently completed To-Dos are now shown, regardless of how long ago they were completed.	2016-08-19 21:06:45 -07:00
Luveluen	a654369075	Update faq.json - description of mechanic outdated (#7913 ) * Update faq.json line - description of mechanic outdated Changed <---Tap on a Pet, and then select \"Feed Pet\"! --->Click on a type of food, and then select the pet you want to feed! because clicking on the pet first does not work anymore, clicking on the pet first selects it for use. As described by MeikeMertsch here: https://www.transifex.com/habitrpg/habitrpg/translate/#de/faqjson/60117132 * Update faq.json	2016-08-19 15:40:51 -07:00
Blade Barringer	a69ab954f5	fix(client): Correct logic to show premium pets Fixes #7888	2016-08-19 08:41:27 -04:00
Sabe Jones	106bf52915	3.33.1	2016-08-18 20:28:09 +00:00
Sabe Jones	9f0d4fbd65	fix(auth): Facebook on MS Edge	2016-08-18 20:07:14 +00:00
Sabe Jones	3ac5617e57	chore(news): Bailey 20160818	2016-08-18 18:58:37 +00:00
Sabe Jones	f5224282d9	3.33.0	2016-08-18 17:58:49 +00:00
Sabe Jones	53a7f7ba5f	chore(sprites): compile	2016-08-18 17:51:51 +00:00
Sabe Jones	0c11d8fb6d	feat(content): Pets 201608 (#7903 )	2016-08-18 12:40:29 -05:00
Phillip Thelen	7ef2c34177	add route for QR codes (#7902 ) * add route for QR codes * check that passed ID is a UUID * add test for qr code redirect * fix qr code test	2016-08-18 19:37:14 +02:00
Blade Barringer	e68c75c802	chore(i18n): update locales	2016-08-17 10:24:04 -05:00
Blade Barringer	fd70efcb60	Merge pull request #7900 from crookedneighbor/analytics_fix Analytics fix	2016-08-15 22:39:03 -05:00
Jaka Kranjc	408d988341	api: expose user's inbox.optOut for `api/v3/members/:memberId` #7798 (#7893 ) * api: expose user's inbox.optOut for `api/v3/members/:memberId` #7798 * test: fixed chai exist vs exists typos * _getMembersForItem: fixed typo in api docs	2016-08-15 22:21:14 -05:00
Blade Barringer	bd8b1b0ece	chore(tests): Rewrite analytics tests to remove dependency on nock	2016-08-15 22:20:39 -05:00
Travis	1a409848a8	allow flagging the post of a deleted user (#7897 ) * Allowing the flagging of messages that were written by user accounts that have since been deleted * replacing ternary operator with else if, else paradigm * formatting fixes * fixing message in tests	2016-08-15 22:14:52 -05:00
Blade Barringer	9223aecfbe	fix(api): Pass in headers to payments analytics	2016-08-15 08:07:59 -05:00
Blade Barringer	977bafd2d1	fix(api): Set platform and agent to Unknown if headers are not passed in	2016-08-15 08:07:59 -05:00
Camellia Peng	12f1aae2dd	Update email check exist (#7899 ) * throw a 401 error if user tries to update his/her email to an email that exists already * Make error message generic so we don't violate users' privacy. Added test case. * Syntax fixes * select only the _id field when searching for users with the same email. Return found document as javascript object.	2016-08-15 07:52:53 -05:00
Blade Barringer	02545ae439	3.32.0	2016-08-14 14:10:40 -05:00
Blade Barringer	5a47f2a19f	chore(i18n): update locales	2016-08-14 14:08:50 -05:00
Blade Barringer	c7a2b69b32	chore(i18n): update locales	2016-08-13 07:03:50 -05:00
Blade Barringer	b1d06671c8	chore(i18n): update locales	2016-08-12 08:57:45 -05:00
Kaitlin Hipkin	55111a6ddc	New Party Loading Messages (#7862 ) * add basic party loading message code; doesn't work yet * fixup party loading messages, remove rpg-style messages * move party-loading messages back into groups.json * party-loading message logic returns a string instead of a number	2016-08-12 08:53:03 -05:00
Matteo Pagliazzi	7ccbcd7b33	add reorder task step to ios tutorial, mounts and inbox steps for both android and ios	2016-08-12 14:55:55 +02:00
Blade Barringer	8a4109b9d7	chore(i18n): update locales	2016-08-11 13:01:23 -05:00
Phillip Thelen	679378331d	add client and OS info to amplitude events closes #7865	2016-08-11 08:58:13 -05:00
Blade Barringer	e3c40aa142	fix(client): Prevent restore streak from showing up in challenge creation	2016-08-11 08:48:44 -05:00
Husman	725c3b36f3	feat: allowing modification of challenge tasks after challenge creation. fixes #7320 closes #7877	2016-08-11 08:48:39 -05:00
Blade Barringer	89822222fe	Merge pull request #7881 from Hus274/7716 fix: shows user correct challenge when showing won challenge modal	2016-08-11 08:07:16 -05:00
Blade Barringer	fed1eb8c21	fix(client): set state chagne to scroll to top closes #7880 fixes #4326	2016-08-11 07:59:12 -05:00
Blade Barringer	858da4f9c9	Merge pull request #7890 from HabitRPG/sabrecat/prefs-undefined Fix preferences typeError	2016-08-11 07:48:14 -05:00
Josh Holland	cdeb498c0b	Align guild gems box with other page elements (#7829 ) * Align guild gems box with other page elements Fixes #7796. * Fix issues caused by aligning guild gems box * Remove unnecessary comment * Connect gem total box and plus/add gems button When the add gems button is displayed, set border-radius on touching corners between the two buttons to 0, so that they are displayed as a unit rather than two separate buttons.	2016-08-11 07:45:21 -05:00
Sabe Jones	e7a820e28d	fix(editing): preferences typeError	2016-08-10 20:23:14 +00:00
Blade Barringer	395e602cfc	3.31.0	2016-08-10 12:28:32 -05:00
Blade Barringer	d50cedfd31	chore(i18n): update locales	2016-08-10 12:18:55 -05:00
Blade Barringer	a5b2e53914	fix(client): Add client redirect for coupon url	2016-08-10 12:12:56 -05:00
Blade Barringer	0e42d6ba32	Merge pull request #7889 from crookedneighbor/fix_purchase_call_in_view fix: Correct purchase call to use purchaseType, not identifier	2016-08-10 12:00:06 -05:00
Blade Barringer	420cebd93b	fix: Correct purchase call to use purchaseType, not identifier	2016-08-10 08:58:01 -05:00
Blade Barringer	384783567b	chore(tests): Add test to catch bugs when adding invalid types to market	2016-08-10 08:44:21 -05:00
Sabe Jones	64ffa4912d	3.30.2	2016-08-10 05:28:29 +00:00
Sabe Jones	64c8e4d16d	fix(content): item type handling	2016-08-10 05:18:30 +00:00
Sabe Jones	0d1bff5dda	3.30.1	2016-08-10 03:47:30 +00:00
Blade Barringer	06cae45ed9	lint: Correct missing semicolons	2016-08-09 22:29:48 -05:00
Blade Barringer	2d553417b4	fix(api): Correct identifier for magic hatching potions	2016-08-09 22:21:54 -05:00
Alys	4df2b723fa	fix errors in apidocs for coupons/enter/:code and tasks/:taskId	2016-08-10 12:50:07 +10:00
Sabe Jones	f92cba6a40	3.30.0	2016-08-09 23:40:31 +00:00
Sabe Jones	9e16f9dffc	chore(sprites): compile	2016-08-09 23:40:22 +00:00
Sabe Jones	72f1114d85	refactor(content): concatenate notes	2016-08-09 23:19:53 +00:00
Sabe Jones	051763bc49	Thunderstorm Hatching Potions (#7885 ) * feat(premium): Thunderstorm Potions * chore(news): Thunderstorm Bailey * fix(test): allow addlNotes key	2016-08-09 17:37:39 -05:00
Matteo Pagliazzi	689a321a9b	enable pusher for all users	2016-08-09 20:05:04 +02:00
Blade Barringer	bce4f55df5	chore: Fix score test to not be so flaky	2016-08-09 08:58:36 -05:00
Husman	acc9e8ca7f	fix: shows user correct challenge when showing won challenge modal	2016-08-07 16:27:18 -07:00
Matteo Pagliazzi	6dfa93dab2	correct pusher inactivity timeout	2016-08-08 00:08:54 +02:00
Husman	56ad8c62ef	Formatting changes	2016-06-23 19:50:56 -07:00
Husman	352ad783e6	Fixing test names	2016-06-22 20:23:08 -07:00
Husman	997fd569e2	Fixing tests	2016-06-22 17:56:24 -07:00
Husman	e167e41731	Fixing edit task issue according to blade's comments	2016-06-22 17:14:12 -07:00
Husman	874b0d203f	Merge remote-tracking branch 'origin/7688' into 7688	2016-06-22 17:13:32 -07:00
Husman	1a6f08545b	Working with updated _edit model	2016-06-21 20:39:26 -07:00
Husman	db3a8cf7c3	Fixed mispelling	2016-06-18 18:30:31 -07:00
Husman	f35c4df022	Improving cancel task edit functionality. closes #7688	2016-06-18 18:26:01 -07:00