Commit graph

5797 commits

Author SHA1 Message Date
Blade Barringer
d56eb1eeeb Added last guild link, corrected hall links 2014-12-14 20:10:42 -06:00
Blade Barringer
63c2248b38 Corrected guild links 2014-12-14 20:07:46 -06:00
Blade Barringer
9cdbca8c2b Reverted routing for groups back 2014-12-14 20:05:01 -06:00
Blade Barringer
d1b1a866ac Fixed when routing. Closes #4371 2014-12-14 19:01:52 -06:00
Blade Barringer
a9fa8ed038 Merge pull request #4382 from SabreCat/timetravel
Translate TT in menu
2014-12-14 14:34:43 -06:00
Sabe Jones
8cd1ea48db fix(I18N): Remove more hardcoded text 2014-12-14 14:10:39 -06:00
Sabe Jones
29f693cd24 fix(I18N): Remove hardcoded text 2014-12-14 13:55:40 -06:00
Sabe Jones
506c396baf fix(I18N): Translate TT in menu 2014-12-14 13:53:00 -06:00
Blade Barringer
ab7c1996b2 Merge pull request #4381 from SabreCat/timetravel
Make Time Travel translatable
2014-12-14 13:28:03 -06:00
Sabe Jones
35b02cfdd8 fix(I18N): Make Time Travel translatable 2014-12-14 12:59:45 -06:00
Sabe Jones
c287441cd9 Merge pull request #4378 from SabreCat/purchases
Hide "2/locked" as appropriate
2014-12-14 12:42:11 -06:00
Blade Barringer
dde3f5ffef Adjusted tooltip wrapping so it would only affect long titles 2014-12-14 12:18:59 -06:00
Blade Barringer
a961d6b342 Added wrapping rule for user tooltip in chat messages closes #4367 2014-12-14 12:05:36 -06:00
Blade Barringer
396176f14f Quest completion screen floats to right on everything but xs 2014-12-14 08:32:05 -06:00
Blade Barringer
d0df9e46d6 Added helper classes for floats at various screen sizes 2014-12-14 08:31:40 -06:00
Blade Barringer
41e1f4c75f Conditionally allow completed quest image to be centered if no
completion text is present
2014-12-14 08:13:50 -06:00
Blade Barringer
195a8a5ca3 Merge pull request #4375 from thehindenburg/questimage
Quest image added in the completion screen
2014-12-14 07:39:16 -06:00
Sabe Jones
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
4ded747b88 fix(purchases): Correct hair path
Fixes https://github.com/HabitRPG/habitrpg/issues/4312.
2014-12-13 15:53:39 -06:00
Sabe Jones
4adf95feb6 fix(purchases): Hide "2/locked" as appropriate 2014-12-13 12:05:17 -06:00
Matteo Pagliazzi
61ae5c7420 fix(loggly): enable only manually 2014-12-13 15:01:38 +01:00
Matteo Pagliazzi
012e579cfe fix(loggly): typo 2014-12-13 14:57:05 +01:00
Matteo Pagliazzi
dac2fc682d feat(loggly): change tag based on base_url, logs internal server errors 2014-12-13 14:48:14 +01:00
Tyler Renelle
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
Tyler Renelle
e98243e3d8 refactor(env): small cleanup 2014-12-12 21:07:38 +01:00
Matteo Pagliazzi
8935538b53 feat(loggly): enable json loggin and start loggin errors during cron 2014-12-12 20:05:37 +01:00
thehindenburg
7c6d8d4dc2 Update quests.styl
further white space cleanup
2014-12-12 11:02:55 -08:00
thehindenburg
670542f3ce cleaning up white space 2014-12-12 10:44:06 -08:00
Tyler Renelle
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
thehindenburg
2db80c6841 changed to style sheet 2014-12-12 10:26:55 -08:00
benmanley
45d30ffef5 fix(footerCtrl.js): disable addThis hover
Activate addThis dropdown on click/tap not on hover.
2014-12-12 17:41:45 +00:00
benmanley
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
thehindenburg
375253fb84 changing the reward text to clear the image 2014-12-12 09:38:13 -08:00
Matteo Pagliazzi
b10d4606f5 fix(loggly): typo and remove testing 2014-12-12 13:09:21 +01:00
Matteo Pagliazzi
af1ff6d740 feat(loggly): add test log, use only in production and add sample config 2014-12-12 12:17:48 +01:00
Matteo Pagliazzi
7356e0bafe feat(loggly): add loggly 2014-12-12 12:11:26 +01:00
thehindenburg
d70de5972e added the image to the end screen and made adjustments to the line 2014-12-11 22:28:07 -08:00
Tyler Renelle
ae762837e2 refactor(challenges): cleanup challenge-creation. can use async.auto to
keep variables around, no need to set parent closure vars
2014-12-11 21:35:41 -07:00
Tyler Renelle
3027ccff83 fix(plans): fix fields which are NaN 2014-12-11 21:06:38 -07:00
Tyler Renelle
14a38033f9 Merge branch 'negue-iap_verification' into develop 2014-12-11 14:51:31 -07:00
Matteo Pagliazzi
29382d18f7 fix(reset-password): use array for variables 2014-12-11 17:05:31 +01:00
Matteo Pagliazzi
1761752240 use email server for reset-password 2014-12-11 16:51:39 +01:00
Blade Barringer
e79126bf59 Merge pull request #4372 from thehindenburg/optoutspace
added space in Jade to the arrow and opt out text in the inbox
2014-12-10 15:51:38 -06:00
Tyler Renelle
f9cc2adda5 fix(iap): iap verification fixes 2014-12-10 14:25:00 -07:00
Negue
bb37c163cf fix spacing 2014-12-10 14:21:03 -07:00
Negue
d92832bfb2 Hopefully a working IOS Verification 2014-12-10 14:21:03 -07:00
Negue
ecf20f423c IAP Verification for Android 2014-12-10 14:21:03 -07:00
Negue
b59a70f128 more dummy controller, just for iap data 2014-12-10 14:21:02 -07:00
Negue
cc4812712a dummy iap verify routes 2014-12-10 14:21:02 -07:00
Negue
2ea12d5c71 Add in-app-purchase Package 2014-12-10 14:21:02 -07:00