Commit graph

276 commits

Author SHA1 Message Date
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
NotGonnaGitUs
09a713dbde Changed menu title to "promo codes" instead of "coupons". 2015-05-08 19:36:14 +05:30
Blade Barringer
4ccfaa974f Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-05-08 08:45:24 -05:00
Blade Barringer
8569f7b749 Merge branch 'joyclark-autocomplete-click-behavior' into develop 2015-05-08 08:45:06 -05:00
NotGonnaGitUs
ef0b96e5e4 Changed promo code text. 2015-05-08 10:33:26 +05:30
git-afsantos
38056a4837 fix(stats) removed extraneous class bonus
Even leveled users below level 100 were showing an extra 0.5 stat class bonus. This was due to the level bonus being a float, instead of an integer. Used `Math.ceil` to fix the level bonus, thus removing the extraneous 0.5 class bonus.
2015-05-08 00:05:44 +01:00
negue
e628dba5e8 Merge pull request #5087 from negue/copyMessageTodo
copy chat messages as todo
2015-05-07 22:21:42 +02:00
Tyler Renelle
4f7c9cd445 feat(guide): temporarily remove current tutorial, add simple ? to expand help 2015-05-07 14:31:53 -04:00
Sabe Jones
2a375a120c feat(backgrounds): prettify news 2015-05-06 19:48:47 -05:00
Sabe Jones
00db42b6c0 feat(backgrounds): May BGs 2015-05-06 19:41:54 -05:00
Matteo Pagliazzi
8066589268 disable registration while request in progress 2015-05-06 15:43:30 +02:00
Blade Barringer
84a4c36c7e Merge branch 'NotGonnaGitUs-RestingatInnText' into develop 2015-05-05 19:45:42 -05:00
Blade Barringer
d482fdcea5 Refactor tavern view 2015-05-05 19:45:05 -05:00
Matteo Pagliazzi
d2198c7572 remove invite friends from settings page 2015-05-05 19:52:06 +02:00
Matteo Pagliazzi
ca90de7a55 Merge pull request #5144 from NotGonnaGitUs/FrontPageLinkFix
Fixed broken business link
2015-05-05 17:34:53 +02:00
Tyler Renelle
a090fed10b feat(analytics): "motivate yourself" 3 variants @lemoness 2015-05-04 15:31:00 -04:00
NotGonnaGitUs
25b63cfacd Made daniel's text in the inn based on current rest status of the user. 2015-05-04 23:37:54 +05:30
NotGonnaGitUs
076cc76e5d Fixed broken link 2015-05-04 21:26:45 +05:30
NotGonnaGitUs
78e8499c5f Fixed missing space. 2015-05-04 01:12:43 +05:30
NotGonnaGitUs
a45390321e Patched translation fixes and added a few phrases to locales. 2015-05-03 23:41:42 +05:30
Joy Clark
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
Negue
b2bad4d77f Update todo preview in dialog 2015-05-03 17:12:08 +02:00
Blade Barringer
b408f016fd Merge pull request #5119 from NotGonnaGitUs/develop
Made front page translatable
2015-05-03 09:43:43 -05:00
Blade Barringer
62f7eae5d5 Fixes #5132 2015-05-03 09:01:12 -05:00
Blade Barringer
1f85b5bf67 add hack to have both mouseover and persisten click behavior 2015-05-01 22:12:00 -05:00
Sabe Jones
6685e93554 fix(Spring): WHO IS LESLIE 2015-05-01 19:19:23 -05:00
Sabe Jones
d50d4ad8bb feat(Spring): Flung 2015-05-01 19:09:28 -05:00
Blade Barringer
e334ce7684 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-05-01 12:36:07 -05:00
Blade Barringer
954f9baeec chore(bailey) - skills rebalancing 2015-05-01 12:29:59 -05:00
NotGonnaGitUs
124df58644 Made front page translatable. 2015-05-01 21:18:25 +05:30
NotGonnaGitUs
02e7b52fbf Adding environment variables to the static front page for translation. - Halfway done. 2015-05-01 20:14:19 +05:30
Sabe Jones
b6955db39c chore(news): Spring Fling warning 2015-04-30 17:23:26 -05:00
Blade Barringer
e4b21ac325 Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo 2015-04-29 17:19:24 -05:00
Negue
189423b0db markdown preview - code "inherit white-space" / hide links for 'system' 2015-04-27 19:47:42 +02:00
Negue
75579a7c36 add previewMarkdown / click as popover-trigger / misc changes 2015-04-27 19:23:56 +02:00
Blade Barringer
e8da13b9be Merge branch 'joyclark-chat_match_users' into develop 2015-04-26 20:43:55 -05:00
Blade Barringer
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
hairlessbear
2f33fe6e38 Changed button title to match menu titles 2015-04-26 19:53:35 -04:00
Joy Clark
f214428411 Improved filter function as described in #5085 and added unit tests. 2015-04-26 17:50:53 +02:00
Blade Barringer
c324ea3e03 Merge branch 'hairlessbear-hide_challenge_achievement' into develop 2015-04-25 22:15:37 -05:00
Blade Barringer
5cde0495a8 Add parenthesis back in so boolean will render correctly 2015-04-25 22:15:04 -05:00
Blade Barringer
7494cb1438 Make gem popover consistent with gold and silver. Closes #5088 2015-04-25 21:53:00 -05:00
hairlessbear
831af01db6 Made fixes suggested by crookedneighbor 2015-04-25 22:38:16 -04:00
hairlessbear
4d8310296b Added another one-time binding 2015-04-25 22:14:16 -04:00
hairlessbear
2d748e22e6 Removed unnecessary one-time bindings 2015-04-25 22:05:19 -04:00
hairlessbear
4f340940ed Added another one time binding 2015-04-25 21:10:14 -04:00