Commit graph

5739 commits

Author SHA1 Message Date
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
5ac7f479d3 Added some spacing between icons and text on challenge/guild buttons 2014-12-07 21:03:09 -06:00
Blade Barringer
05c01ebd3c Made glyphicons white on for challenge/guild join/leave buttons 2014-12-07 21:01:40 -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
Blade Barringer
d0cf285468 Merge pull request #4358 from andymantell/feature/linking-timetravellers-names
Link for Tyler and Vicky's names
2014-12-06 16:48:09 -06:00
Blade Barringer
8ba6bcddde Merge pull request #4354 from crookedneighbor/markdown-lists-in-tasks
Adjusted margin for markdown list in task-text.
2014-12-06 16:42:31 -06:00
Blade Barringer
60f3e0032e Adjusted margin for markdown list in tast-text. Closes #2721 2014-12-06 16:41:59 -06:00
Tyler Renelle
cb9083d9ba fix(webhooks): don't send webhooks if not valid url (also if not
enabled), fixes #4357
2014-12-06 10:25:41 -07:00
Andy Mantell
58359f1e89 Link for Tyler and Vicky's names #4351 2014-12-06 15:42:12 +00:00
Blade Barringer
66f913e833 closes #4353. If time on chat would break onto new line, just puts whole
time statment on new line
2014-12-05 23:51:07 -06: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
Tyler Renelle
7ab5456c2a Merge pull request #4352 from crookedneighbor/show-gem-purchases-with-customer-id
Converted planId to customerId as test for whether or not gems can be purchased.
2014-12-05 14:56:41 -07: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
6380584f46 Merge pull request #4343 from HabitRPG/revert-4342-revert-4329-tranlsate-mystic-items
Revert "Revert "Tranlsate mystic items""
2014-12-05 16:07:33 +01:00
Matteo Pagliazzi
0450e2b924 Revert "Revert "Tranlsate mystic items"" 2014-12-05 16:07:27 +01:00
Matteo Pagliazzi
6ad4f5004d Merge pull request #4342 from HabitRPG/revert-4329-tranlsate-mystic-items
Revert "Tranlsate mystic items"
2014-12-05 16:03:50 +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
aa346c9271 Merge pull request #4328 from SabreCat/gems
Add available Gems counter to Market
2014-12-04 20:30:46 -06: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
Tyler Renelle
f3fc6644b8 refactor(paypal): some plan debugging cleanup 2014-12-04 16:16:53 -07:00
Sabe Jones
c9b0898499 fix(style): help emoji line up with task text
Adds a `vertical-align` property to `span.emoji` so adding an emoji to a task doesn't cause it to bounce out of alignment with the rest of the task's text.
2014-12-04 16:32:00 -06:00
Blade Barringer
6b8a4f966b Merge pull request #4321 from sbreiler/develop
Fix #2879 (Check-Icons)
2014-12-04 08:15:38 -06:00
Sabe Jones
ce8b6d2901 fix(style): Give room for badge 2014-12-03 22:22:21 -06:00
Sabe Jones
b017623621 fix(subscriptions): Fix to Gems badge 2014-12-03 21:39:26 -06:00
Sabe Jones
62e526f8dc feat(subscriptions): Show count of purchasable Gems 2014-12-03 20:55:22 -06:00
Tyler Renelle
3423e9857d fix(gifts): $rootScope => Payments 2014-12-03 19:38:09 -07:00
Tyler Renelle
bd5f8d79ea fix(bailey): mystery 3014 promo 2014-12-03 19:24:42 -07:00
Tyler Renelle
c14af0e855 chore(multi-core): allow "CORES" nconf var, so can just use one core (or
however many) cc @paglias
2014-12-03 19:12:42 -07:00
Tyler Renelle
1a84d01933 fix(gifts): allow gifting 0<gift<1 (cc @Alys @crookedneighbor) 2014-12-03 19:00:49 -07:00
Tyler Renelle
d2e230db1f fix(plans): various bug fixes 2014-12-03 18:34:26 -07:00
Tyler Renelle
e1492809fd bailey(plans): Gifting Subscriptions And Gems, New Subscription
Benefits, Mysterious Time Travelers, Steampunk Item Sets, And Block Subscriptions
2014-12-03 16:31:38 -07:00
Blade Barringer
754fb549ea Merge pull request #4320 from crookedneighbor/show-full-time-on-hover-in-chat
Added tooltip to show chat time in date format with minutes and seconds
2014-12-03 17:03:44 -06:00
Tyler Renelle
a0a576f143 Merge pull request #4323 from HabitRPG/block-subs
Block subscriptions + Gifting
2014-12-03 16:02:09 -07:00
Tyler Renelle
30c1ac4b1e fix(plans): lots of bug fixes & cleanup 2014-12-03 16:01:57 -07:00
Tyler Renelle
0a53a5717e refactor(payments): move payments into it's own service, out of rootCtrl 2014-12-03 14:17:08 -07:00
Tyler Renelle
8c5842eb52 feat(plans): cleanup plans' perks page, rename Time Trinket => Mystic Hourglass 2014-12-03 14:17:08 -07:00
Tyler Renelle
0fffd66588 feat(plans): time travelers tab, 1 trinket to buy 1 set 2014-12-03 14:17:08 -07:00
Tyler Renelle
7f2b6b5cfb feat(plans): allow block subscriptions from paypal/stripe 2014-12-03 14:17:07 -07:00
Tyler Renelle
5fd805db88 feat(plans): consectuive-month subscription perks (gifting) 2014-12-03 14:17:07 -07:00