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
4ded747b88
fix(purchases): Correct hair path
...
Fixes https://github.com/HabitRPG/habitrpg/issues/4312 .
2014-12-13 15:53:39 -06:00
4adf95feb6
fix(purchases): Hide "2/locked" as appropriate
2014-12-13 12:05:17 -06:00
61ae5c7420
fix(loggly): enable only manually
2014-12-13 15:01:38 +01:00
012e579cfe
fix(loggly): typo
2014-12-13 14:57:05 +01:00
dac2fc682d
feat(loggly): change tag based on base_url, logs internal server errors
2014-12-13 14:48:14 +01:00
9d6caaa138
feat(iap): ignore keys/ directory. upload any keys/iap-sandbox iap-live
...
etc on a private branch
2014-12-12 16:19:13 -07:00
e98243e3d8
refactor(env): small cleanup
2014-12-12 21:07:38 +01:00
8935538b53
feat(loggly): enable json loggin and start loggin errors during cron
2014-12-12 20:05:37 +01:00
7c6d8d4dc2
Update quests.styl
...
further white space cleanup
2014-12-12 11:02:55 -08:00
670542f3ce
cleaning up white space
2014-12-12 10:44:06 -08:00
e1ea1a24c8
feat(challenges): optional checkbox on group create/edit:
...
restrict challenge-creation to leader. Commented-out code for similar
setup for member invites, shouldn't be hard
2014-12-12 11:37:00 -07:00
2db80c6841
changed to style sheet
2014-12-12 10:26:55 -08:00
45d30ffef5
fix(footerCtrl.js): disable addThis hover
...
Activate addThis dropdown on click/tap not on hover.
2014-12-12 17:41:45 +00:00
0943a229ec
fix(avatar.styl): improve label layout
...
Fixes #4349
* Tweak position of labels to align better with background border.
* Increase z-index of share button to prevent it being obscured by
avatar.
* Move share button to bottom left corner to prevent it obscuring
avatar name.
2014-12-12 17:41:45 +00:00
375253fb84
changing the reward text to clear the image
2014-12-12 09:38:13 -08:00
b10d4606f5
fix(loggly): typo and remove testing
2014-12-12 13:09:21 +01:00
af1ff6d740
feat(loggly): add test log, use only in production and add sample config
2014-12-12 12:17:48 +01:00
7356e0bafe
feat(loggly): add loggly
2014-12-12 12:11:26 +01:00
d70de5972e
added the image to the end screen and made adjustments to the line
2014-12-11 22:28:07 -08:00
Sabe Jones