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
382add82c3
feat(tutorial): put tut back in, we just need to replace it in near future
2015-05-08 12:58:43 -04:00
09a713dbde
Changed menu title to "promo codes" instead of "coupons".
2015-05-08 19:36:14 +05:30
4ccfaa974f
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-05-08 08:45:24 -05:00
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
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
30546ccf12
remove extraneous comment
2015-05-07 17:51:51 -05:00
9884ed71f8
Merge branch 'develop' into TheHollidayInn-join-button-fix
2015-05-07 17:50:57 -05:00
47121fa70d
Update tests to use get url, added not member tests, and updated logic to prevent users from being added to public guilds
2015-05-07 15:59:21 -05:00
e628dba5e8
Merge pull request #5087 from negue/copyMessageTodo
...
copy chat messages as todo
2015-05-07 22:21:42 +02:00
4f7c9cd445
feat(guide): temporarily remove current tutorial, add simple ? to expand help
2015-05-07 14:31:53 -04:00
cb9738251f
Add isUserInvited to if statement
2015-05-07 13:26:22 -05:00
25fe1d34d6
fix(groups): you should not be able to join a group you are not invited to
2015-05-07 18:56:41 +02:00
2a375a120c
feat(backgrounds): prettify news
2015-05-06 19:48:47 -05:00
00db42b6c0
feat(backgrounds): May BGs
2015-05-06 19:41:54 -05:00
7d08358791
fix(registration) do not re-enable registrations if the first one is successfull
2015-05-06 16:23:15 +02:00
8066589268
disable registration while request in progress
2015-05-06 15:43:30 +02:00
bcb7b75380
Fixed conditional and spacing
2015-05-05 20:13:53 -05: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
ca90de7a55
Merge pull request #5144 from NotGonnaGitUs/FrontPageLinkFix
...
Fixed broken business link
2015-05-05 17:34:53 +02:00
8a4b43905d
Added tests
2015-05-04 19:12:44 -05:00
a090fed10b
feat(analytics): "motivate yourself" 3 variants @lemoness
2015-05-04 15:31:00 -04: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
076cc76e5d
Fixed broken link
2015-05-04 21:26:45 +05:30
0bd39120aa
Updated conditionals
2015-05-03 19:35:47 -05:00
5fe6121495
Added user to group.member if they are a member of the group and not included in the query
2015-05-03 19:35:47 -05:00
65a0ecdd6a
Added query to always include user when populating group members
2015-05-03 19:35:46 -05:00
78e8499c5f
Fixed missing space.
2015-05-04 01:12:43 +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
b408f016fd
Merge pull request #5119 from NotGonnaGitUs/develop
...
Made front page translatable
2015-05-03 09:43:43 -05:00
62f7eae5d5
Fixes #5132
2015-05-03 09:01:12 -05:00
1f85b5bf67
add hack to have both mouseover and persisten click behavior
2015-05-01 22:12:00 -05: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
e334ce7684
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-05-01 12:36:07 -05:00
954f9baeec
chore(bailey) - skills rebalancing
2015-05-01 12:29:59 -05:00
124df58644
Made front page translatable.
2015-05-01 21:18:25 +05:30
02e7b52fbf
Adding environment variables to the static front page for translation. - Halfway done.
2015-05-01 20:14:19 +05:30
e3570e609b
Fixes Issue #5103
...
Altered the error messages that are part of the login and forgotten password processes.
These messages now remind the the user that they may have created an account through facebook.
2015-05-01 13:01:29 +10:00
43936da8ef
Merge pull request #5113 from SabreCat/develop
...
Spring Fling warning
2015-04-30 17:41:23 -05:00
b6955db39c
chore(news): Spring Fling warning
2015-04-30 17:23:26 -05:00
e4b21ac325
Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo
2015-04-29 17:19:24 -05:00
78249122f7
Ignore casing when searching for user name in autocomplete
2015-04-29 08:21:13 -05:00
6e35c45d5f
Merge branch 'develop' of github.com:HabitRPG/habitrpg into joyclark-autocomplete_unit_tests
2015-04-29 07:50:33 -05:00
Blade Barringer