8c5842eb52
feat(plans): cleanup plans' perks page, rename Time Trinket => Mystic Hourglass
2014-12-03 14:17:08 -07:00
0fffd66588
feat(plans): time travelers tab, 1 trinket to buy 1 set
2014-12-03 14:17:08 -07:00
7f2b6b5cfb
feat(plans): allow block subscriptions from paypal/stripe
2014-12-03 14:17:07 -07:00
5fd805db88
feat(plans): consectuive-month subscription perks (gifting)
2014-12-03 14:17:07 -07:00
5b01fff700
feat(gifts): allow gifting subscriptions
2014-12-03 14:17:07 -07:00
e8dbd5ca1a
feat(gifts): allow gifting gems from paypal/stripe
2014-12-03 14:17:07 -07:00
7e9b92fcad
feat(gifts): allow gifting from balance
2014-12-03 14:17:07 -07:00
57bfee02cf
feat(plans): consecutive months & extra months (like a time-card)
2014-12-03 14:17:07 -07:00
117a424a5d
refactor(members): DRY some members code
2014-12-03 14:17:07 -07:00
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
66b4dae0d9
feat(news): move old news to /static/old-news, better use of content space
2014-12-03 13:49:24 -07:00
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
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
8794adde69
Updated function to go to correct options pane. Closes # 4319
2014-12-03 08:01:23 -06:00
c7c5aee6a0
Added tooltip to show chat time in date format with minutes and seconds
2014-12-03 07:49:06 -06:00
3cf6e84451
chore(Bailey): Outage announcement
2014-12-01 21:05:36 -06:00
985171f856
fix(tavern): jade fix
2014-12-01 17:45:50 -07:00
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
9bc38b0b2e
Merge pull request #4287 from taldin/market-poptop
...
Market poptop fix
2014-12-01 17:58:12 +10:00
f3e2ee33f7
Merge pull request #4306 from SabreCat/develop
...
December Bailey
2014-11-30 23:21:42 -06:00
1713843067
fix(Bailey): correct date
2014-11-30 23:06:00 -06:00
452b459d69
chore(Bailey): Announce December
2014-11-30 23:03:08 -06:00
0c675f704b
Simplified styles for locked and unlocked backgrounds
2014-11-30 18:57:01 -06:00
632d0fdf5d
Merge pull request #4299 from pollockjj/develop
...
Solution for: Differentiate Locked and Unlocked Backgrounds (#4261 )
2014-11-30 18:41:51 -06:00
96f8f2cdd5
refactor(inventory): move all special items into single category
...
"special" (cleaner)
2014-11-30 13:12:28 -07:00
2ee6f0ed61
feat(Bailey): November subscription reminder
2014-11-30 11:50:31 -06:00
9e42c7fb05
Merge pull request #4303 from crookedneighbor/develop
...
Adjusted ng-hide so users cannot block themeselves
2014-11-30 10:54:32 -06:00
44baa822c8
Adjusted ng-hide so users cannot block themeselves
2014-11-30 10:50:39 -06:00
6520caed7d
Modified to 15px border and lock icon based on feedback from dev team
2014-11-29 21:56:10 -06:00
0f3070e334
Allow send messages to yourself - see #4295
2014-11-30 01:52:46 +01:00
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
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
e4b2351b42
Removed extraneous space
2014-11-29 12:53:19 -06:00
223cac838e
Added one time binding to ng-if
2014-11-29 12:52:34 -06:00
3a29eef799
Removed pm symbol if sent by own user
2014-11-29 12:30:15 -06:00
e0f09cd468
Removed option to send private message if it would go to system. Closes
2014-11-29 12:26:28 -06:00
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
3204418af1
Revert #4291
...
This reverts commit a1ea6869b7
2014-11-29 09:16:44 -07:00
5823a25d06
cleanup 20140829_change_headAccessory_to_eyewear.js
2014-11-29 09:05:27 -07:00
e63f2b6d97
Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
...
Conflicts:
database_reports/count_users_who_own_specified_gear.js
2014-11-29 08:33:28 -07:00
391bd76c03
Merge pull request #4294 from crookedneighbor/indentation-error
...
Corrected indentation error
2014-11-29 08:18:36 -07:00
9a1b209da1
Corrected indentation error
2014-11-28 19:41:11 -06:00
607c72049c
Merge pull request #4291 from sbreiler/develop
...
Fix #4259
2014-11-28 20:51:04 +01:00
5011ae63c1
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-11-27 23:47:38 +00:00
0d7b05dbc6
resolve merge conflict
2014-11-27 23:47:28 +00:00
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
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
a1ea6869b7
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.
Fixes health, level and mana bar.
2014-11-27 22:47:52 +01:00
1c70a5bad5
upgrade angular-ui-router
2014-11-27 12:30:13 -07:00
50b1cba0a6
refactor(tasks) improve UI consistency
...
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
Tyler Renelle