Commit graph

785 commits

Author SHA1 Message Date
Blade Barringer
c90ea166d4 Corrected tooltip name 2014-12-07 13:50:46 +01:00
Blade Barringer
5e1e1b2c13 Flag icon opens blank modal 2014-12-07 13:50:46 +01: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
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
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
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
e8dbd5ca1a feat(gifts): allow gifting gems from paypal/stripe 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
Blade Barringer
c7c5aee6a0 Added tooltip to show chat time in date format with minutes and seconds 2014-12-03 07:49:06 -06:00
Tyler Renelle
985171f856 fix(tavern): jade fix 2014-12-01 17:45:50 -07:00
Alice Harris
9bc38b0b2e Merge pull request #4287 from taldin/market-poptop
Market poptop fix
2014-12-01 17:58:12 +10:00
Blade Barringer
632d0fdf5d Merge pull request #4299 from pollockjj/develop
Solution for: Differentiate Locked and Unlocked Backgrounds (#4261)
2014-11-30 18:41:51 -06:00
Tyler Renelle
96f8f2cdd5 refactor(inventory): move all special items into single category
"special" (cleaner)
2014-11-30 13:12:28 -07:00
pollockjj
6520caed7d Modified to 15px border and lock icon based on feedback from dev team 2014-11-29 21:56:10 -06:00
negue
0f3070e334 Allow send messages to yourself - see #4295 2014-11-30 01:52:46 +01:00
pollockjj
9abaedc7c5 Modified two-line solution for ticket #4261 to one-line based on feedback/solution from B. Barringer 2014-11-29 13:17:54 -06:00
Blade Barringer
e4b2351b42 Removed extraneous space 2014-11-29 12:53:19 -06:00
Blade Barringer
223cac838e Added one time binding to ng-if 2014-11-29 12:52:34 -06:00
Blade Barringer
3a29eef799 Removed pm symbol if sent by own user 2014-11-29 12:30:15 -06:00
Blade Barringer
e0f09cd468 Removed option to send private message if it would go to system. Closes 2014-11-29 12:26:28 -06:00
pollockjj
1a567ce82f Changes to address github ticket: Differentiate Locked and Unlocked Backgrounds (#4261). Added two new background-specific styles to customizer.styl and utilized them in profile.jade by checking for ownership of the asset and displaying a border or not, as appropriate 2014-11-29 12:25:21 -06:00
Tyler Renelle
3204418af1 Revert #4291
This reverts commit a1ea6869b7.
2014-11-29 09:16:44 -07:00
Steffen Breiler
28b25c6b89 Fix #4259 (always 100% long bars in IE11)
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
2014-11-27 22:55:01 +01:00
Steffen Breiler
64a76566a0 Fix #4259 (always 100% long bars in IE11)
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
2014-11-27 22:52:03 +01:00
Taldin
212868010c bugfix: all-market-poptop breaks on the left side
Right side popovers have been switched to 'top', but left side popovers
need to remain 'right'.
2014-11-26 14:17:42 -08:00
Taldin
4a6cd9c2f3 Fixes market to have popover-placement="top'
Market fixed to have popover-placement="top' instead of 'left', which
was causing some problems, and 'right' for consistency.
2014-11-26 14:03:31 -08:00
Tyler Renelle
1e5b7e6f2d fix(#4282): refactor for DRY unlock/hide paths 2014-11-26 10:49:49 -07:00
Tyler Renelle
0278caca76 fix(#4282): fix $parse errors in avatar customize screens 2014-11-26 10:49:49 -07:00
Matteo Pagliazzi
c0a3fc887a fix(costume): better fix for #4274 2014-11-26 12:26:41 +01:00
Matteo Pagliazzi
43fa461a67 fix(costume): fixes #4274 2014-11-26 12:19:33 +01:00
Tyler Renelle
d24ece973b fix(food): popover-placement='top' in foodtray, fixes #4278 2014-11-25 15:26:42 -07:00