Commit graph

9214 commits

Author SHA1 Message Date
Sabe Jones
6e27b7af9d fix(purchases): Handle undefined/null balance 2015-05-13 15:15:40 -05:00
Sabe Jones
68ce9a8457 fix(test): Unlock takes query, not params 2015-05-13 14:34:20 -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
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
2b8414766b chore(grunt): compile sprites 2015-05-13 11:19:33 -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
Blade Barringer
dca45d7845 Enable new inn behavior 2015-05-13 08:44:08 -05:00
Blade Barringer
0629b6af18 Correct bad tests in common suite 2015-05-13 08:37:52 -05:00
Blade Barringer
5cc847857f Unpend in test, pend failing tests 2015-05-13 07:50:16 -05: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
ff41a2c240 Refactor group tests 2015-05-12 08:08:55 -05:00
Blade Barringer
faa897e4ae Re-enable skipped test 2015-05-11 17:29:46 -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
Blade Barringer
3c61b8dc4f Add todo about re-enabling test 2015-05-11 14:41:35 -05:00
Blade Barringer
b663ff7101 Skipping group tests while we sort out join issue 2015-05-11 14:40:45 -05:00
Matteo Pagliazzi
ae8b170446 fix(emails): remove base url from server 2015-05-11 20:44:52 +02:00
Matteo Pagliazzi
c3bb6b88fa fix(tests): temporarily skip test 2015-05-11 17:21:57 +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
c444f54e42 Remove unnecessary global declarations 2015-05-11 08:17:46 -05:00
Blade Barringer
ed8a4ef651 Use chai expect instead of expect.js 2015-05-11 08:13:23 -05: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
Alys
1dec4ba7a6 allow MP gained for Habits and Dailies to be increased when a critical hit occurs (crits are triggered in addPoints) 2015-05-10 18:17:17 +10:00
Blade Barringer
49595adad9 Merge branch 'develop' into crookedneighbor-separate_mocha_tests 2015-05-08 21:41:34 -05: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
Blade Barringer
5c00bde701 remove changelog 2015-05-08 20:46:54 -05: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
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
Blade Barringer
efa193b262 Refactor test 2015-05-08 08:44:50 -05:00
Blade Barringer
81da53be6d Merge pull request #5165 from git-afsantos/patch-1
fix(stats) removed extraneous class bonus
2015-05-08 07:45:54 -05:00
NotGonnaGitUs
ef0b96e5e4 Changed promo code text. 2015-05-08 10:33:26 +05:30
Blade Barringer
bb42acacdb Change format of testing commands in readme 2015-05-07 21:52:56 -05:00
Blade Barringer
d1d319f57e Clarify matter in readme 2015-05-07 21:50:22 -05:00
Blade Barringer
17c248e970 Add readme. Adjust api-helper.coffee 2015-05-07 21:33:59 -05:00
Blade Barringer
2ca5956cee Adjust namespace of api tests 2015-05-07 21:22:30 -05:00
Blade Barringer
9525c5c528 move guild tests into api groups test 2015-05-07 21:16:53 -05:00
Blade Barringer
ece37c01db Merge branch 'develop' into separate_mocha_tests 2015-05-07 21:11:30 -05:00
Blade Barringer
c41fe9929f Add todo 2015-05-07 18:19:05 -05:00
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