69cd5f8490
Merge branch 'develop' into fixes-issue-5183
2015-05-17 00:44:15 -04:00
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
da20a493c6
Merge branch 'hairlessbear-level_100_attribute_message' into develop
2015-05-16 22:50:57 -05:00
bc967dd850
Adjust wording of attribute points warning
2015-05-16 22:50:24 -05:00
9017ba7d7e
Hide attribute points counter if you're over 100 and have 0 left
2015-05-16 17:08:06 -05:00
52d869b195
Fixed issue #5203
2015-05-16 16:52:58 -04:00
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
3c35b52d27
Hide contributor level if contribText func is not available; put math on scope
2015-05-15 23:08:26 -05:00
d6385a94e9
Front page now shows avatar with link
2015-05-15 22:31:47 -05:00
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
2ba1a1fc85
Merge branch 'hairlessbear-challenge-achievement-display-fix-redux' into develop
2015-05-15 07:41:46 -05:00
ca70e010ca
Merge branch 'develop' into fixes-issue-5183
2015-05-14 21:33:04 -04:00
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
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
89d1d63b24
Merge pull request #5198 from SabreCat/pet-skins
...
Pet Skins and Ears
2015-05-13 15:44:23 -05:00
84b333e5c1
fix(unlocks): Handle undefined/null balance
2015-05-13 15:34:23 -05:00
6e27b7af9d
fix(purchases): Handle undefined/null balance
2015-05-13 15:15:40 -05:00
68ce9a8457
fix(test): Unlock takes query, not params
2015-05-13 14:34:20 -05:00
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
05f6e5e14d
fix(flags): correctly send flag reports emails
2015-05-13 20:08:46 +02:00
b639896ae6
chore(i18n): update locales
2015-05-13 19:47:59 +02:00
35ff90b4d3
Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins
2015-05-13 12:12:57 -05:00
3abec07119
chore(news): Bailey
2015-05-13 11:44:52 -05:00
2b8414766b
chore(grunt): compile sprites
2015-05-13 11:19:33 -05:00
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
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
5ee6e94190
Merge pull request #3 from HabitRPG/develop
...
Update from original
2015-05-13 12:04:01 -04:00
93472c8a1e
Merge pull request #2 from HabitRPG/develop
...
Update from original
2015-05-13 12:02:37 -04:00
dca45d7845
Enable new inn behavior
2015-05-13 08:44:08 -05:00
0629b6af18
Correct bad tests in common suite
2015-05-13 08:37:52 -05:00
5cc847857f
Unpend in test, pend failing tests
2015-05-13 07:50:16 -05:00
f7f126c352
Add alert box to dailies resting in the inn message
2015-05-13 07:29:17 -05:00
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
4050e9ad0c
Fix guilds not loading ＼(^ω^＼)
2015-05-12 22:28:06 -05:00
ff41a2c240
Refactor group tests
2015-05-12 08:08:55 -05:00
faa897e4ae
Re-enable skipped test
2015-05-11 17:29:46 -05:00
d448ca3ac5
fix(groups): do not try to add members to a party when it does not exists
2015-05-11 22:13:31 +02:00
3c61b8dc4f
Add todo about re-enabling test
2015-05-11 14:41:35 -05:00
b663ff7101
Skipping group tests while we sort out join issue
2015-05-11 14:40:45 -05:00
ae8b170446
fix(emails): remove base url from server
2015-05-11 20:44:52 +02:00
c3bb6b88fa
fix(tests): temporarily skip test
2015-05-11 17:21:57 +02:00
30fd8e26e6
revert last 2 commits
2015-05-11 17:02:36 +02:00
e966de7bf0
feat(emails): add field to keep track of weekly recap emails
2015-05-11 16:54:44 +02:00
fc1f6ba0b9
fix(emails): always use main site as base url
2015-05-11 15:43:35 +02:00
c444f54e42
Remove unnecessary global declarations
2015-05-11 08:17:46 -05:00
ed8a4ef651
Use chai expect instead of expect.js
2015-05-11 08:13:23 -05:00
8badc7d1a9
Add coupon api tests
2015-05-10 14:54:45 -05:00
109ca1b67c
Correct bullet list position; fixes #5181
2015-05-10 14:16:11 -05:00
c123ca6a42
Correct casing of translatable string
2015-05-10 09:13:05 -05:00
6c5d9f3a6c
Tried to make line translatable
...
Tried to make the "Only group leader can create challenges" line in the
guild creation dialog translatable
2015-05-10 08:59:43 -05:00
Kelsey Ando