Blade Barringer
120872ffd2
Merge in develop
2015-05-24 15:46:57 -05:00
Blade Barringer
165dd3a4a6
Fixes for minor visual inconsistencies with popovers and toolbars
...
Closes #5274 , closes #5272 , closes #5271
2015-05-24 15:34:12 -05:00
Matteo Pagliazzi
047ce0141f
chore(i18n): update locales
2015-05-24 11:27:17 +02:00
Alys
68c4547c0a
change $push to $addToSet for monthly mystery items so that we can't get duplicates being added. Ref: https://gist.github.com/lefnire/a0a93c52211f44a2c087 and http://stackoverflow.com/questions/27248556/mongodb-difference-between-push-addtoset
2015-05-23 20:03:36 +10:00
Blade Barringer
a07f8572b0
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-05-22 23:35:19 -05:00
Blade Barringer
ed56f51611
Merge branch 'hairlessbear-avatar_indicate_equipped' into develop
2015-05-22 23:35:01 -05:00
Blade Barringer
1f0dbef3c7
Merge pull request #5234 from hairlessbear/ethereal_surge_split_fix
...
Fixed Ethereal Surge notification split
2015-05-22 23:23:34 -05:00
Blade Barringer
9ec14c1ac6
Merge pull request #5251 from GitHubSphinx/Sphinx-i18n-db1
...
Made two lines translatable
2015-05-22 23:20:13 -05:00
Blade Barringer
1e757cc087
Adjust disabled button look
2015-05-22 23:12:09 -05:00
GihHubSphinx
fe2e0618b8
Make Invite-friends-to-group dialog translatable
...
UI strings of the dialog of invitation to the group made translatable
2015-05-23 02:44:32 +05:00
Jaiden Mispy
eab2dbfa86
Disable chat textarea and buttons while sending
2015-05-22 12:14:10 -07:00
negue
4e8918818a
fix(pushNotifications): user null check
...
#5252
2015-05-21 23:24:10 +02:00
GihHubSphinx
2440b312a2
Made two lines translatable
...
Addressing #10 and #11 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522
* "Send gift" (in the form that pops up when you click on username
label)
* "Invite Friends" button (in "Members" section in guilds and party)
2015-05-21 17:12:16 +05:00
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
Sabe Jones
f436852535
Merge pull request #5249 from HabitRPG/may-pet
...
Sheep Quest
2015-05-20 21:00:21 -07:00
SabreCat
13faf8d0c7
feat(pets): Sheep Quest
2015-05-20 20:45:18 -07:00
SabreCat
2b72050827
fix(accessories): Buyback for ears
...
Fixes #5236 .
2015-05-20 13:10:05 -07:00
hairlessbear
4ee8a6867d
Fixed sync button before community guildlines are accepted
2015-05-20 10:20:32 -04:00
Blade Barringer
2900c53b84
Fix and unpend dailies test
2015-05-19 20:22:43 -05: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
a270b6d931
Compile shared when changes are made to coffee files
2015-05-18 08:52:28 -05:00
hairlessbear
fd8fabad43
Fixed Ethereal Surge notification split
2015-05-18 00:45:44 -04:00
hairlessbear
b912dcaf6a
Added selectableInventory logic to animal ears
2015-05-17 22:01:54 -04:00
hairlessbear
9c205e600a
Merge branch 'avatar_indicate_equipped' of https://github.com/hairlessbear/habitrpg into develop
2015-05-17 17:19:17 -04:00
hairlessbear
456dd37f41
Added selectableInventory to two buttons I missed the first time
2015-05-17 16:51:59 -04:00
hairlessbear
c47c555a21
Added indication of currently equipped preferences to avatar customization page
2015-05-17 16:30:22 -04: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
