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
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
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
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
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
96f8f2cdd5
refactor(inventory): move all special items into single category
...
"special" (cleaner)
2014-11-30 13:12:28 -07: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
Tyler Renelle
3204418af1
Revert #4291
...
This reverts commit a1ea6869b7
2014-11-29 09:16:44 -07:00
Tyler Renelle
5823a25d06
cleanup 20140829_change_headAccessory_to_eyewear.js
2014-11-29 09:05:27 -07:00
Tyler Renelle
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
Tyler Renelle
391bd76c03
Merge pull request #4294 from crookedneighbor/indentation-error
...
Corrected indentation error
2014-11-29 08:18:36 -07:00
Blade Barringer
9a1b209da1
Corrected indentation error
2014-11-28 19:41:11 -06:00
Matteo Pagliazzi
607c72049c
Merge pull request #4291 from sbreiler/develop
...
Fix #4259
2014-11-28 20:51:04 +01:00
benmanley
5011ae63c1
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-11-27 23:47:38 +00:00
benmanley
0d7b05dbc6
resolve merge conflict
2014-11-27 23:47:28 +00: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
Steffen Breiler
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
Tyler Renelle
1c70a5bad5
upgrade angular-ui-router
2014-11-27 12:30:13 -07:00
benmanley
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
a8cf102610
feat(thanksgiving): add migration for turkey mounts / pets
2014-11-26 19:12:59 -07:00
Sabe Jones
be3342cb26
feat(event): Thanksgiving Bailey
2014-11-26 19:34:16 -06: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
f5d0b79573
fix(loading bar): possible fix
2014-11-26 12:38:02 +01:00
