Blade Barringer
bd76b762e6
Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
...
Negue wip push notifications
2015-05-18 11:14:53 -05:00
Blade Barringer
a270b6d931
Compile shared when changes are made to coffee files
2015-05-18 08:52:28 -05:00
Blade Barringer
54f8f6d387
Merge pull request #5227 from hairlessbear/move_battle_gear_popover
...
Moved battle gear popover from top to right
2015-05-17 10:19:45 -05:00
Blade Barringer
46c426856d
Correct text
2015-05-17 10:06:40 -05:00
Matteo Pagliazzi
dcc48ea7f7
chore(i18n): update locales
2015-05-17 16:07:18 +02:00
Matteo Pagliazzi
d6547682be
chore(i18n): update locales
2015-05-17 15:54:18 +02:00
hairlessbear
86ee687b8b
Moved battle gear popover to right
2015-05-17 09:31:28 -04:00
Blade Barringer
c1097230a9
Merge pull request #5210 from kma3a/fixes-issue-5183
...
Fixes issue #5183 Leave button and edit group button don't line up
2015-05-17 00:02:34 -05:00
Kelsey Ando
69cd5f8490
Merge branch 'develop' into fixes-issue-5183
2015-05-17 00:44:15 -04:00
Blade Barringer
43cb46d83d
Merge pull request #5174 from agentx999/skills_clickontask
...
added "click on task" to necessary skill descriptions
2015-05-16 23:08:11 -05:00
Blade Barringer
da20a493c6
Merge branch 'hairlessbear-level_100_attribute_message' into develop
2015-05-16 22:50:57 -05:00
Blade Barringer
bc967dd850
Adjust wording of attribute points warning
2015-05-16 22:50:24 -05:00
Blade Barringer
9017ba7d7e
Hide attribute points counter if you're over 100 and have 0 left
2015-05-16 17:08:06 -05:00
hairlessbear
52d869b195
Fixed issue #5203
2015-05-16 16:52:58 -04:00
Blade Barringer
074b748c80
Merge pull request #5220 from crookedneighbor/fix-front-page-sharing-issue
...
Fix front page avatar sharing issue
2015-05-15 23:25:43 -05:00
Blade Barringer
3c35b52d27
Hide contributor level if contribText func is not available; put math on scope
2015-05-15 23:08:26 -05:00
Blade Barringer
d6385a94e9
Front page now shows avatar with link
2015-05-15 22:31:47 -05:00
Kelsey Ando
f06e286f64
adding changes that were suggested from crookedneighbor to make the edit and save button be btn-sm
2015-05-15 11:00:26 -04:00
Blade Barringer
2ba1a1fc85
Merge branch 'hairlessbear-challenge-achievement-display-fix-redux' into develop
2015-05-15 07:41:46 -05:00
Blade Barringer
56b6794c66
Correct test string
2015-05-14 22:09:36 -05:00
Blade Barringer
d7ce151500
Add translatable strings
2015-05-14 21:56:16 -05:00
Blade Barringer
547d234b46
Add final test for push notifications
2015-05-14 21:32:28 -05:00
Kelsey Ando
ca70e010ca
Merge branch 'develop' into fixes-issue-5183
2015-05-14 21:33:04 -04:00
Kelsey Ando
0af264ef87
changing padding for the leave button on the party page so it will line up with the edit group button
2015-05-14 21:09:41 -04:00
Blade Barringer
7a2e2fa227
Add tests for invites to guilds or parties
2015-05-14 17:29:33 -05:00
Blade Barringer
84aaeedfff
Add challenges test
2015-05-14 07:32:16 -05:00
Blade Barringer
2fac464160
Remove extranious pushSpy declaration
2015-05-13 19:35:26 -05:00
Blade Barringer
023458b6e5
Add test for getting push notification when gifted a subscription
2015-05-13 19:31:26 -05:00
Blade Barringer
3cbd5fd9ff
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-13 19:11:57 -05:00
Alys
d6e1d765da
adjust Inn message when user is already Resting - https://github.com/HabitRPG/habitrpg/issues/5128#issuecomment-99233779
2015-05-14 08:13:13 +10:00
Sabe Jones
89d1d63b24
Merge pull request #5198 from SabreCat/pet-skins
...
Pet Skins and Ears
2015-05-13 15:44:23 -05:00
Sabe Jones
84b333e5c1
fix(unlocks): Handle undefined/null balance
2015-05-13 15:34:23 -05:00
Sabe Jones
6e27b7af9d
fix(purchases): Handle undefined/null balance
2015-05-13 15:15:40 -05:00
Sabe Jones
68ce9a8457
fix(test): Unlock takes query, not params
2015-05-13 14:34:20 -05:00
Sabe Jones
0cb1d8ec9a
test(purchases): Gem buying tests
...
Also corrects the byline for Inn improvements to credit primary coder @hairlessbear.
2015-05-13 14:21:13 -05:00
Matteo Pagliazzi
05f6e5e14d
fix(flags): correctly send flag reports emails
2015-05-13 20:08:46 +02:00
Matteo Pagliazzi
b639896ae6
chore(i18n): update locales
2015-05-13 19:47:59 +02:00
Sabe Jones
35ff90b4d3
Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins
2015-05-13 12:12:57 -05:00
Sabe Jones
3abec07119
chore(news): Bailey
2015-05-13 11:44:52 -05:00
Sabe Jones
2b8414766b
chore(grunt): compile sprites
2015-05-13 11:19:33 -05:00
Sabe Jones
29109051d7
feat(customize): Animal skins and ears
...
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05:00
hairlessbear
8e5cdbd742
Fixed challenges achievement always displaying (again)
...
Unearned achievements are hidden when viewing others' profiles, but are visible when a user views their own profile. Currently, the challenges achievement is displayed when viewing other users' profiles, even when they have not won any. This PR makes the challenges achievement display to other users' only when one or more challenges have been won.
2015-05-13 12:12:03 -04:00
hairlessbear
5ee6e94190
Merge pull request #3 from HabitRPG/develop
...
Update from original
2015-05-13 12:04:01 -04:00
hairlessbear
93472c8a1e
Merge pull request #2 from HabitRPG/develop
...
Update from original
2015-05-13 12:02:37 -04:00
Blade Barringer
dca45d7845
Enable new inn behavior
2015-05-13 08:44:08 -05:00
Blade Barringer
0629b6af18
Correct bad tests in common suite
2015-05-13 08:37:52 -05:00
Blade Barringer
5cc847857f
Unpend in test, pend failing tests
2015-05-13 07:50:16 -05:00
Blade Barringer
f7f126c352
Add alert box to dailies resting in the inn message
2015-05-13 07:29:17 -05:00
Alys
2ac763cc50
add message about Resting in the Inn to top of Dailies column when preferences.sleep is true
2015-05-13 16:56:52 +10:00
Blade Barringer
4050e9ad0c
Fix guilds not loading ＼(^ω^＼)
2015-05-12 22:28:06 -05:00
