958068c2b0
Rebased to resolve merge conflicts
2015-05-26 00:19:35 -04:00
5d93f364c1
Merge branch 'blade-hairlessbear_markdown_help_table' into develop
2015-05-24 22:47:02 -05:00
abbfdaeda5
Adjust NotGonnaGitUs's PR
...
* move challenge test to separate file
* adjust wording of popover text
* prevent refunding gems for tavern challenges
* adjust ui of challenge creation page
* fix bug in cancel function
* adjust wording of delete confirmation message
2015-05-24 21:22:40 -05:00
681668f131
Tweak @hairlessbear's pr
...
* Simplify chat button stylings
* Add formatting help to send gift modal
* Clean up formatting of table
* Add example for unordered lists
* Remove ! from `env.t` that do not have html characters
* Use https instead of http in link
* Format markdown blurb
* Use ng-if instead of ng-show
* Collapse show help link into single element
2015-05-24 09:20:12 -05:00
a07f8572b0
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-05-22 23:35:19 -05:00
ed56f51611
Merge branch 'hairlessbear-avatar_indicate_equipped' into develop
2015-05-22 23:35:01 -05:00
9ec14c1ac6
Merge pull request #5251 from GitHubSphinx/Sphinx-i18n-db1
...
Made two lines translatable
2015-05-22 23:20:13 -05:00
1e757cc087
Adjust disabled button look
2015-05-22 23:12:09 -05:00
eab2dbfa86
Disable chat textarea and buttons while sending
2015-05-22 12:14:10 -07:00
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
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
13faf8d0c7
feat(pets): Sheep Quest
2015-05-20 20:45:18 -07:00
4ee8a6867d
Fixed sync button before community guildlines are accepted
2015-05-20 10:20:32 -04:00
b912dcaf6a
Added selectableInventory logic to animal ears
2015-05-17 22:01:54 -04:00
9c205e600a
Merge branch 'avatar_indicate_equipped' of https://github.com/hairlessbear/habitrpg into develop
2015-05-17 17:19:17 -04:00
456dd37f41
Added selectableInventory to two buttons I missed the first time
2015-05-17 16:51:59 -04:00
c47c555a21
Added indication of currently equipped preferences to avatar customization page
2015-05-17 16:30:22 -04:00
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
86ee687b8b
Moved battle gear popover to right
2015-05-17 09:31:28 -04:00
69cd5f8490
Merge branch 'develop' into fixes-issue-5183
2015-05-17 00:44:15 -04:00
da20a493c6
Merge branch 'hairlessbear-level_100_attribute_message' into develop
2015-05-16 22:50:57 -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
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
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
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
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
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
71c65c7a73
change coupon route in angular router to promo
2015-05-08 21:24:57 -05:00
1bfc82c636
Merge branch 'develop' into NotGonnaGitUs-develop
2015-05-08 21:02:09 -05:00
09a713dbde
Changed menu title to "promo codes" instead of "coupons".
2015-05-08 19:36:14 +05:30
8569f7b749
Merge branch 'joyclark-autocomplete-click-behavior' into develop
2015-05-08 08:45:06 -05:00
ef0b96e5e4
Changed promo code text.
2015-05-08 10:33:26 +05:30
e628dba5e8
Merge pull request #5087 from negue/copyMessageTodo
...
copy chat messages as todo
2015-05-07 22:21:42 +02:00
84a4c36c7e
Merge branch 'NotGonnaGitUs-RestingatInnText' into develop
2015-05-05 19:45:42 -05:00
d482fdcea5
Refactor tavern view
2015-05-05 19:45:05 -05:00
d2198c7572
remove invite friends from settings page
2015-05-05 19:52:06 +02:00
25b63cfacd
Made daniel's text in the inn based on current rest status of the user.
2015-05-04 23:37:54 +05:30
a45390321e
Patched translation fixes and added a few phrases to locales.
2015-05-03 23:41:42 +05:30
4450a5d7c3
Fixes #5094 Now show list based on whether or not a search query is defined. The autocomplete function from the directive is encapsulated so that it can be called and then the query can be set to null.
2015-05-03 18:14:28 +02:00
b2bad4d77f
Update todo preview in dialog
2015-05-03 17:12:08 +02:00
6685e93554
fix(Spring): WHO IS LESLIE
2015-05-01 19:19:23 -05:00
d50d4ad8bb
feat(Spring): Flung
2015-05-01 19:09:28 -05:00
e4b21ac325
Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo
2015-04-29 17:19:24 -05:00
75579a7c36
add previewMarkdown / click as popover-trigger / misc changes
2015-04-27 19:23:56 +02:00
e8da13b9be
Merge branch 'joyclark-chat_match_users' into develop
2015-04-26 20:43:55 -05:00
dcd4be71ba
Merge pull request #5095 from hairlessbear/settings_button_name_change
...
Changed button title to match dropdown settings menu titles
2015-04-26 19:32:58 -05:00
2f33fe6e38
Changed button title to match menu titles
2015-04-26 19:53:35 -04:00
hairlessbear