Alys
ee4df15b71
Merge pull request #5247 from hairlessbear/tavern_guidline_button_fix
...
Fixed sync button display before community guildlines are accepted
2015-05-21 20:57:00 +10:00
SabreCat
13faf8d0c7
feat(pets): Sheep Quest
2015-05-20 20:45:18 -07:00
hairlessbear
4ee8a6867d
Fixed sync button before community guildlines are accepted
2015-05-20 10:20:32 -04:00
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
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
hairlessbear
86ee687b8b
Moved battle gear popover to right
2015-05-17 09:31:28 -04:00
Kelsey Ando
69cd5f8490
Merge branch 'develop' into fixes-issue-5183
2015-05-17 00:44:15 -04:00
Blade Barringer
da20a493c6
Merge branch 'hairlessbear-level_100_attribute_message' into develop
2015-05-16 22:50:57 -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
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
d7ce151500
Add translatable strings
2015-05-14 21:56:16 -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
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
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
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
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
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
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
Blade Barringer
8a4abc632f
Refactor push notifications test; Prevent push notification from being sent when buying gems for yourself as a gift
2015-05-12 20:18:06 -05:00
Blade Barringer
9a84503aed
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-12 19:06:34 -05:00
Blade Barringer
ff41a2c240
Refactor group tests
2015-05-12 08:08:55 -05:00
Matteo Pagliazzi
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
Matteo Pagliazzi
ae8b170446
fix(emails): remove base url from server
2015-05-11 20:44:52 +02:00
Matteo Pagliazzi
30fd8e26e6
revert last 2 commits
2015-05-11 17:02:36 +02:00
Matteo Pagliazzi
e966de7bf0
feat(emails): add field to keep track of weekly recap emails
2015-05-11 16:54:44 +02:00
Matteo Pagliazzi
fc1f6ba0b9
fix(emails): always use main site as base url
2015-05-11 15:43:35 +02:00
Blade Barringer
6d025330e9
Clean up spaces; remove console log
2015-05-10 16:48:48 -05:00
Blade Barringer
95a90723c8
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-10 16:27:58 -05:00
Negue
1cc07129f1
Merge branch 'develop' into pushNotifications2
...
Conflicts:
test/api.mocha.coffee
2015-05-10 22:01:41 +02:00
Blade Barringer
8badc7d1a9
Add coupon api tests
2015-05-10 14:54:45 -05:00
Blade Barringer
109ca1b67c
Correct bullet list position; fixes #5181
2015-05-10 14:16:11 -05:00
Blade Barringer
c123ca6a42
Correct casing of translatable string
2015-05-10 09:13:05 -05:00
GihHubSphinx
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
Alys
5123bdb4c4
Merge pull request #5080 from joyclark/develop
...
Fixing the grid view for mounts so that the animals are aligned correctly.
2015-05-10 19:01:56 +10:00
Blade Barringer
71c65c7a73
change coupon route in angular router to promo
2015-05-08 21:24:57 -05:00
Blade Barringer
1bfc82c636
Merge branch 'develop' into NotGonnaGitUs-develop
2015-05-08 21:02:09 -05:00
Negue
90edb7719f
Merge branch 'develop' into pushNotifications2
2015-05-08 23:21:18 +02:00
Tyler Renelle
382add82c3
feat(tutorial): put tut back in, we just need to replace it in near future
2015-05-08 12:58:43 -04:00
NotGonnaGitUs
09a713dbde
Changed menu title to "promo codes" instead of "coupons".
2015-05-08 19:36:14 +05:30
