Commit Graph

8321 Commits

Author SHA1 Message Date
Tyler Renelle a62a09d7d2 Merge pull request #376 from HabitRPG/block-subs
Block Subscriptions
2014-12-03 16:02:14 -07: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 bf7e1e66ed feat(plans): time traveler - by full sets 2014-12-03 15:24:08 -07:00
Tyler Renelle d81badde69 feat(plans): add time traveler - buy individual mystery items 2014-12-03 15:24:08 -07:00
Tyler Renelle 76be625f6d feat(plans): add consecutive-month benefits for subscribers 2014-12-03 15:24:08 -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
Sabe Jones f3e2ee33f7 Merge pull request #4306 from SabreCat/develop
December Bailey
2014-11-30 23:21:42 -06:00
Sabe Jones a6944ec072 Merge pull request #375 from SabreCat/develop
December backgrounds
2014-11-30 23:20:22 -06:00
Sabe Jones d7b904efec chore(December): grunt 2014-11-30 23:08:53 -06:00
Sabe Jones 1713843067 fix(Bailey): correct date 2014-11-30 23:06:00 -06:00
Sabe Jones 452b459d69 chore(Bailey): Announce December 2014-11-30 23:03:08 -06:00
Sabe Jones 4d8a9c5287 feat(backgrounds): December purchasables 2014-11-30 22:54:37 -06:00
Blade Barringer 0c675f704b Simplified styles for locked and unlocked backgrounds 2014-11-30 18:57:01 -06: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 703451d452 fix(mystery): typo 2014-11-30 14:11:49 -07:00
Matteo Pagliazzi f7c6e9063b chore(i18n): update locales 2014-11-30 21:59:49 +01:00
Tyler Renelle 96f8f2cdd5 refactor(inventory): move all special items into single category
"special" (cleaner)
2014-11-30 13:12:28 -07:00
Matteo Pagliazzi aa6afcdce8 chore(i18n): update locales 2014-11-30 20:21:59 +01:00
Sabe Jones 2ee6f0ed61 feat(Bailey): November subscription reminder 2014-11-30 11:50:31 -06:00
Blade Barringer 9e42c7fb05 Merge pull request #4303 from crookedneighbor/develop
Adjusted ng-hide so users cannot block themeselves
2014-11-30 10:54:32 -06:00
Blade Barringer 44baa822c8 Adjusted ng-hide so users cannot block themeselves 2014-11-30 10:50:39 -06: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
negue 70c7894354 Merge pull request #4295 from crookedneighbor/do-not-send-private-messages-to-system
Removed option to send private message if it would go to system. Closes #4295
2014-11-29 19:56:02 +01: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