Commit graph

2386 commits

Author SHA1 Message Date
Sabe Jones
dbe608bc3a fix(news): correct link and awkward image 2014-12-16 20:24:04 -06:00
Sabe Jones
58957118c0 chore(news): Bailey for Seasonal Shop 2014-12-16 20:18:55 -06:00
Sabe Jones
071ac02ec2 chore(git): Resolve merge conflict 2014-12-14 14:55:37 -06:00
Sabe Jones
9f46e14cd6 fix(seasonal): missing bang 2014-12-14 14:18:57 -06:00
Sabe Jones
867f50b514 fix(seasonal): Add menu item 2014-12-14 14:12:20 -06:00
Sabe Jones
8cd1ea48db fix(I18N): Remove more hardcoded text 2014-12-14 14:10:39 -06:00
Sabe Jones
6dcbd329a5 fix(seasonal): Typo in string resource 2014-12-14 14:05:43 -06:00
Sabe Jones
7988dfcf82 fix(seasonal): Corrections for Shop
Fix Jade indenting, add state control, add menu option
2014-12-14 14:01:25 -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
Sabe Jones
a98a685971 feat(seasonal): Seasonal Shop
Initial commit of frontend for Seasonal Shop feature.
2014-12-14 13:37:32 -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
396176f14f Quest completion screen floats to right on everything but xs 2014-12-14 08:32:05 -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
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
thehindenburg
375253fb84 changing the reward text to clear the image 2014-12-12 09:38:13 -08:00
thehindenburg
d70de5972e added the image to the end screen and made adjustments to the line 2014-12-11 22:28:07 -08: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
thehindenburg
799934c31b added space in Jade to the arrow and opt out text in the inbox 2014-12-10 12:31:09 -08:00
Blade Barringer
7fb1e69927 Changed inbox text to use an env.t var 2014-12-10 10:47:05 -06:00
Blade Barringer
4af70a2a0f Made invite button for guild invitations part of an input-group 2014-12-10 09:47:58 -06:00
Sabe Jones
dc034e4ab5 fix(quest): Add penguin to shop 2014-12-09 20:48:08 -06:00
Sabe Jones
2d9d8fe209 chore(Bailey): Announce Penguin 2014-12-09 20:20:17 -06:00
Blade Barringer
1511002a08 Fixed styling of invitation to guild page 2014-12-08 17:03:11 -06:00
Blade Barringer
5230883015 Adjusted styling of select box used for ordering party 2014-12-08 16:57:37 -06:00
Blade Barringer
2a3bd8a9cb No longer displays an extra popover that says true. Closes #4362 2014-12-08 12:44:37 -06:00
Blade Barringer
72fbe6a8a7 Removed yellow background from join public guild page 2014-12-07 20:58:42 -06:00
Blade Barringer
bd21c93b36 Fixed weirdness on create guild page. Elements were overflowing out of
their boxes
2014-12-07 20:52:49 -06:00
Blade Barringer
46cb38660e Fixed padding on challenges filter box 2014-12-07 20:20:42 -06:00
Andy Mantell
58359f1e89 Link for Tyler and Vicky's names #4351 2014-12-06 15:42:12 +00:00
Blade Barringer
024e606f5c Merge pull request #4348 from crookedneighbor/fix-transparent-challenge-buttons
Adjust transparent class of challenge buttons.
2014-12-05 22:17:38 -06:00
Blade Barringer
ae62a04497 Converted planId to customerId on whether or not gems can be purchased.
Closes #4340
2014-12-05 15:53:53 -06:00
Blade Barringer
ea869a4487 Adjust trasnparent class of challenge buttons. Closes #4346 2014-12-05 15:13:34 -06:00
Matteo Pagliazzi
0450e2b924 Revert "Revert "Tranlsate mystic items"" 2014-12-05 16:07:27 +01:00
Matteo Pagliazzi
1d1de38956 Revert "Tranlsate mystic items" 2014-12-05 16:03:41 +01:00
Matteo Pagliazzi
a1075a5193 Merge pull request #4329 from crookedneighbor/tranlsate-mystic-items
Tranlsate mystic items
2014-12-05 16:02:34 +01:00
Sabe Jones
7dd16a06e6 Revert "fix(style): Make pet key a SPAN"
This reverts commit 63ea851fdb.
2014-12-04 20:26:50 -06:00
Sabe Jones
63ea851fdb fix(style): Make pet key a SPAN 2014-12-04 20:13:26 -06:00
Blade Barringer
5986643f1e Corrected strings so they only use one variable 2014-12-04 20:03:31 -06:00
Blade Barringer
532f5d1c53 Converted strings to be able to use links 2014-12-04 19:49:36 -06:00
Blade Barringer
21ca49345d Moved time travelers and hourglass strings to shared 2014-12-04 19:49:36 -06:00
Sabe Jones
f2c6c07ff8 fix(Gems): Clarify badge count 2014-12-04 19:04:47 -06:00
Blade Barringer
efcf9099f4 Adjusted count for remaining gem count 2014-12-04 18:47:28 -06:00