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
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
Tyler Renelle
5b01fff700
feat(gifts): allow gifting subscriptions
2014-12-03 14:17:07 -07:00
Tyler Renelle
e8dbd5ca1a
feat(gifts): allow gifting gems from paypal/stripe
2014-12-03 14:17:07 -07:00
Tyler Renelle
7e9b92fcad
feat(gifts): allow gifting from balance
2014-12-03 14:17:07 -07:00
Tyler Renelle
57bfee02cf
feat(plans): consecutive months & extra months (like a time-card)
2014-12-03 14:17:07 -07:00
Tyler Renelle
117a424a5d
refactor(members): DRY some members code
2014-12-03 14:17:07 -07:00
Tyler Renelle
fc3272ddc8
Merge pull request #4322 from HabitRPG/old-news
...
feat(news): move old news to /static/old-news
2014-12-03 14:02:13 -07:00
Tyler Renelle
66b4dae0d9
feat(news): move old news to /static/old-news, better use of content space
2014-12-03 13:49:24 -07:00
Steffen Breiler
ffb073102f
Fix #2879 (Check-Icons)
...
IE11 shows checkmark in wierd position. It seems that IE does size the "checkmark" differently than firefox, which make them appear to be more to the right and bottom. I'm using glyphicons to fix that. The look is constistent in different browser. Though its kind of thicker than the original was.
2014-12-03 18:51:17 +01:00
benmanley
073b338bde
fix(tasks): stop reward values overflowing
...
Fixes #1993
* Restyle reward cost area to fit three digit rewards into default view
* Apply custom styles to rewards with higher values to prevent them
from overflowing
2014-12-03 15:40:08 +00:00
Blade Barringer
8794adde69
Updated function to go to correct options pane. Closes # 4319
2014-12-03 08:01:23 -06:00
Blade Barringer
c7c5aee6a0
Added tooltip to show chat time in date format with minutes and seconds
2014-12-03 07:49:06 -06:00
Sabe Jones
3cf6e84451
chore(Bailey): Outage announcement
2014-12-01 21:05:36 -06:00
Tyler Renelle
985171f856
fix(tavern): jade fix
2014-12-01 17:45:50 -07:00
benmanley
9c2c08c03d
fix(.task-filter): force long words to wrap
...
Fixes #4308 Task tabs cut off long words
Prevents long words from overflowing outside of tab width in button
bars by forcing them to break.
2014-12-01 13:31:15 +00:00
Alice Harris
9bc38b0b2e
Merge pull request #4287 from taldin/market-poptop
...
Market poptop fix
2014-12-01 17:58:12 +10:00
