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
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
2018cc84ab
fix(gem-cap) use customerId in gem purchase
2014-12-05 15:11:27 -07:00
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
ae62a04497
Converted planId to customerId on whether or not gems can be purchased.
...
Closes #4340
2014-12-05 15:53:53 -06:00
ea869a4487
Adjust trasnparent class of challenge buttons. Closes #4346
2014-12-05 15:13:34 -06:00
f010bd7ad9
chore(i18n): update locales
2014-12-05 16:21:13 +01:00
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
0450e2b924
Revert "Revert "Tranlsate mystic items""
2014-12-05 16:07:27 +01:00
09aeaf2812
Merge branch 'crookedneighbor-translate-mystic-items' into develop
2014-12-05 16:06:51 +01:00
198d41d5e8
fix(pr): conflicts
2014-12-05 16:06:15 +01:00
6ad4f5004d
Merge pull request #4342 from HabitRPG/revert-4329-tranlsate-mystic-items
...
Revert "Tranlsate mystic items"
2014-12-05 16:03:50 +01:00
1d1de38956
Revert "Tranlsate mystic items"
2014-12-05 16:03:41 +01:00
a1075a5193
Merge pull request #4329 from crookedneighbor/tranlsate-mystic-items
...
Tranlsate mystic items
2014-12-05 16:02:34 +01:00
4aacc103db
Merge pull request #377 from SabreCat/gems
...
Prettify Market Gem
2014-12-04 20:31:45 -06:00
aa346c9271
Merge pull request #4328 from SabreCat/gems
...
Add available Gems counter to Market
2014-12-04 20:30:46 -06:00
7dd16a06e6
Revert "fix(style): Make pet key a SPAN"
...
This reverts commit 63ea851fdb
2014-12-04 20:26:50 -06:00
a0434e67a6
Revert "fix(style): Pet key margins like sub gems"
...
This reverts commit d584e998ba
2014-12-04 20:26:27 -06:00
d584e998ba
fix(style): Pet key margins like sub gems
2014-12-04 20:14:16 -06:00
63ea851fdb
fix(style): Make pet key a SPAN
2014-12-04 20:13:26 -06:00
5986643f1e
Corrected strings so they only use one variable
2014-12-04 20:03:31 -06:00
6dac81f850
Corrected strings so they only used on variable
2014-12-04 20:03:17 -06:00
532f5d1c53
Converted strings to be able to use links
2014-12-04 19:49:36 -06:00
21ca49345d
Moved time travelers and hourglass strings to shared
2014-12-04 19:49:36 -06:00
f2c6c07ff8
fix(Gems): Clarify badge count
2014-12-04 19:04:47 -06:00
6369934ca3
feat(Gems): Add strings for Market gem
2014-12-04 19:04:07 -06:00
efcf9099f4
Adjusted count for remaining gem count
2014-12-04 18:47:28 -06:00
f3fc6644b8
refactor(paypal): some plan debugging cleanup
2014-12-04 16:16:53 -07:00
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
6b8a4f966b
Merge pull request #4321 from sbreiler/develop
...
Fix #2879 (Check-Icons)
2014-12-04 08:15:38 -06:00
a55fa37412
Converted strings to be able to use links
2014-12-03 22:46:41 -06:00
2e2faa6117
Moved pre-subscription time travelers title and popover to shared
2014-12-03 22:24:43 -06:00
ce8b6d2901
fix(style): Give room for badge
2014-12-03 22:22:21 -06:00
87092e8109
Added mystic hourglass and time travelers screens
2014-12-03 22:19:33 -06:00
cc32369497
fix(style): Prettify Market Gem
2014-12-03 22:10:35 -06:00
b017623621
fix(subscriptions): Fix to Gems badge
2014-12-03 21:39:26 -06:00
6ac6f4d476
fix(plans): fix conversion cap
2014-12-03 20:24:35 -07:00
9e64bc3788
fix(plans): move plan reset up for people in inn
2014-12-03 20:16:33 -07:00
9d3e6c71fe
fix(plans): possible safe-check of gemcapextra cc @Sabrecat
2014-12-03 20:03:40 -07:00
62e526f8dc
feat(subscriptions): Show count of purchasable Gems
2014-12-03 20:55:22 -06:00
3423e9857d
fix(gifts): $rootScope => Payments
2014-12-03 19:38:09 -07:00
bd5f8d79ea
fix(bailey): mystery 3014 promo
2014-12-03 19:24:42 -07:00
cb8c1359c4
fix(plans): mystery 3014 promo
2014-12-03 19:24:26 -07:00
78a4edb38a
i18n(plans): update wording cc @Alys
2014-12-03 19:14:27 -07:00
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
3dd775235d
fix(): remove some logs
2014-12-03 19:05:54 -07:00
1a84d01933
fix(gifts): allow gifting 0<gift<1 (cc @Alys @crookedneighbor)
2014-12-03 19:00:49 -07:00
d2e230db1f
fix(plans): various bug fixes
2014-12-03 18:34:26 -07:00
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
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
Blade Barringer