883d472b94
Merge pull request #4395 from SabreCat/Bailey
...
Wonderland Bailey 1
2014-12-21 15:47:51 -06:00
833ff90a59
chore(news): Wonderland Bailey 1
2014-12-21 15:41:32 -06:00
5979aa3b9a
Merge pull request #4394 from SabreCat/hair
...
Wintery Hair Colors for Wonderland 2015
2014-12-21 15:17:47 -06:00
bb89a10356
feat(event): Wintery Hair Colors
2014-12-21 13:58:47 -06:00
492260d74a
refactor(coupons): coupons cleanup using async.auto
2014-12-20 17:58:00 -07:00
b2bbfdfe09
Merge pull request #4392 from crookedneighbor/fix-moment-in-tests
...
Updated moment calls to use number, period to fix the depreciation error
2014-12-20 17:15:19 +01:00
8b3c6f94bf
fix(loggly): send more infos about cron errors
2014-12-20 16:20:40 +01:00
95951a4706
Updated moment calls to use number, period to fix the deprecation error
2014-12-19 19:41:22 -06:00
739d8885a3
fix(emails): remove unused variable
2014-12-19 19:59:12 +01:00
7c0b25d58a
pass base_url to emails as variable
2014-12-19 19:46:05 +01:00
be37e88dc3
Corrected example for send gift to be correct
2014-12-19 11:06:09 -06:00
d358236f42
Corrected example for show private message so it would result in a valid
...
call
2014-12-19 11:06:09 -06:00
a078636416
Fixed get members so it can be used on static/api page
2014-12-19 11:06:09 -06:00
18288ed016
Merge pull request #4390 from thehindenburg/seasonShop
...
change link in gala page to gala wiki. Closes #4390
Got @thehindenburg 's `uuid` from a previous PR: `5a07a8f6-100c-447f-9272-d5796326fc93`. Would someone log this contribution?
2014-12-19 10:03:49 -06:00
1675bb26b2
change link in gala page to gala wiki
2014-12-19 07:47:28 -08:00
7db273c0be
Merge pull request #3773 from benlind/buttonless_habits_full_space
...
Fixes #3260 : Buttonless habits full width
2014-12-18 13:52:01 -06:00
dc18569e78
fix(phantom): downgrade to node 0.10.22 due to CERT error, see
...
https://github.com/Medium/phantomjs/issues/262 (cc @sabrecat)
2014-12-17 22:16:41 -07:00
c7da56cc00
Merge pull request #4387 from SabreCat/seasonal
...
fix(seasonal): Leslie link
2014-12-17 18:38:16 -06:00
8ff0a4a4a4
fix(seasonal): Leslie link
2014-12-17 18:27:37 -06:00
eadedd5897
Merge pull request #4383 from SabreCat/seasonal
...
Seasonal Shop Basics
2014-12-16 21:51:02 -06:00
dbe608bc3a
fix(news): correct link and awkward image
2014-12-16 20:24:04 -06:00
58957118c0
chore(news): Bailey for Seasonal Shop
2014-12-16 20:18:55 -06:00
d91d9e1eb3
refactor(facebook): use async.auto to collect multiple vars, cleaner
...
than waterfall
2014-12-16 16:30:51 -07:00
2822ce233f
fix(inn): see https://github.com/HabitRPG/habitrpg-shared/pull/231
2014-12-16 14:17:38 -07:00
709fb2b706
Revert "refactor(iap): use env var for google IAP". orders are being
...
left in "Chargeable - Delivered" for some reason.
This reverts commit 43961a5ab9
2014-12-16 13:07:01 -07:00
43961a5ab9
refactor(iap): use env var for google IAP, intead of key file. See
...
https://github.com/voltrue2/in-app-purchase/commit/cb31043281dc1221c61efb2dfbd13687761bceca
cc @negue
2014-12-16 11:44:58 -07:00
d56eb1eeeb
Added last guild link, corrected hall links
2014-12-14 20:10:42 -06:00
63c2248b38
Corrected guild links
2014-12-14 20:07:46 -06:00
9cdbca8c2b
Reverted routing for groups back
2014-12-14 20:05:01 -06:00
d1b1a866ac
Fixed when routing. Closes #4371
2014-12-14 19:01:52 -06:00
071ac02ec2
chore(git): Resolve merge conflict
2014-12-14 14:55:37 -06:00
a9fa8ed038
Merge pull request #4382 from SabreCat/timetravel
...
Translate TT in menu
2014-12-14 14:34:43 -06:00
9f46e14cd6
fix(seasonal): missing bang
2014-12-14 14:18:57 -06:00
867f50b514
fix(seasonal): Add menu item
2014-12-14 14:12:20 -06:00
8cd1ea48db
fix(I18N): Remove more hardcoded text
2014-12-14 14:10:39 -06:00
6dcbd329a5
fix(seasonal): Typo in string resource
2014-12-14 14:05:43 -06:00
7988dfcf82
fix(seasonal): Corrections for Shop
...
Fix Jade indenting, add state control, add menu option
2014-12-14 14:01:25 -06:00
29f693cd24
fix(I18N): Remove hardcoded text
2014-12-14 13:55:40 -06:00
506c396baf
fix(I18N): Translate TT in menu
2014-12-14 13:53:00 -06:00
a98a685971
feat(seasonal): Seasonal Shop
...
Initial commit of frontend for Seasonal Shop feature.
2014-12-14 13:37:32 -06:00
ab7c1996b2
Merge pull request #4381 from SabreCat/timetravel
...
Make Time Travel translatable
2014-12-14 13:28:03 -06:00
35b02cfdd8
fix(I18N): Make Time Travel translatable
2014-12-14 12:59:45 -06:00
c287441cd9
Merge pull request #4378 from SabreCat/purchases
...
Hide "2/locked" as appropriate
2014-12-14 12:42:11 -06:00
dde3f5ffef
Adjusted tooltip wrapping so it would only affect long titles
2014-12-14 12:18:59 -06:00
a961d6b342
Added wrapping rule for user tooltip in chat messages closes #4367
2014-12-14 12:05:36 -06:00
396176f14f
Quest completion screen floats to right on everything but xs
2014-12-14 08:32:05 -06:00
d0df9e46d6
Added helper classes for floats at various screen sizes
2014-12-14 08:31:40 -06:00
41e1f4c75f
Conditionally allow completed quest image to be centered if no
...
completion text is present
2014-12-14 08:13:50 -06:00
195a8a5ca3
Merge pull request #4375 from thehindenburg/questimage
...
Quest image added in the completion screen
2014-12-14 07:39:16 -06:00
e4df3435e1
fix(avatar): Correct "Facial Hair" text
...
Adjusts the text style of "Facial Hair" header in Avatar shop to follow the same scheme as Hair. Before, the text was less header-like than elements under it.
2014-12-13 16:07:58 -06:00
Sabe Jones