8e5cdbd742
Fixed challenges achievement always displaying (again)
...
Unearned achievements are hidden when viewing others' profiles, but are visible when a user views their own profile. Currently, the challenges achievement is displayed when viewing other users' profiles, even when they have not won any. This PR makes the challenges achievement display to other users' only when one or more challenges have been won.
2015-05-13 12:12:03 -04:00
5ee6e94190
Merge pull request #3 from HabitRPG/develop
...
Update from original
2015-05-13 12:04:01 -04:00
4050e9ad0c
Fix guilds not loading ＼(^ω^＼)
2015-05-12 22:28:06 -05:00
ff41a2c240
Refactor group tests
2015-05-12 08:08:55 -05:00
faa897e4ae
Re-enable skipped test
2015-05-11 17:29:46 -05:00
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
3c61b8dc4f
Add todo about re-enabling test
2015-05-11 14:41:35 -05:00
b663ff7101
Skipping group tests while we sort out join issue
2015-05-11 14:40:45 -05:00
ae8b170446
fix(emails): remove base url from server
2015-05-11 20:44:52 +02:00
c3bb6b88fa
fix(tests): temporarily skip test
2015-05-11 17:21:57 +02:00
30fd8e26e6
revert last 2 commits
2015-05-11 17:02:36 +02:00
e966de7bf0
feat(emails): add field to keep track of weekly recap emails
2015-05-11 16:54:44 +02:00
fc1f6ba0b9
fix(emails): always use main site as base url
2015-05-11 15:43:35 +02:00
c444f54e42
Remove unnecessary global declarations
2015-05-11 08:17:46 -05:00
ed8a4ef651
Use chai expect instead of expect.js
2015-05-11 08:13:23 -05:00
8badc7d1a9
Add coupon api tests
2015-05-10 14:54:45 -05:00
109ca1b67c
Correct bullet list position; fixes #5181
2015-05-10 14:16:11 -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
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
49595adad9
Merge branch 'develop' into crookedneighbor-separate_mocha_tests
2015-05-08 21:41:34 -05: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
5c00bde701
remove changelog
2015-05-08 20:46:54 -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
efa193b262
Refactor test
2015-05-08 08:44:50 -05:00
81da53be6d
Merge pull request #5165 from git-afsantos/patch-1
...
fix(stats) removed extraneous class bonus
2015-05-08 07:45:54 -05:00
ef0b96e5e4
Changed promo code text.
2015-05-08 10:33:26 +05:30
bb42acacdb
Change format of testing commands in readme
2015-05-07 21:52:56 -05:00
d1d319f57e
Clarify matter in readme
2015-05-07 21:50:22 -05:00
17c248e970
Add readme. Adjust api-helper.coffee
2015-05-07 21:33:59 -05:00
2ca5956cee
Adjust namespace of api tests
2015-05-07 21:22:30 -05:00
9525c5c528
move guild tests into api groups test
2015-05-07 21:16:53 -05:00
ece37c01db
Merge branch 'develop' into separate_mocha_tests
2015-05-07 21:11:30 -05:00
c41fe9929f
Add todo
2015-05-07 18:19:05 -05:00
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
3dc7567c53
Clean up test code
2015-05-07 17:49:46 -05:00
180279f2f6
clean up cruft from api tests
2015-05-07 17:37:07 -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
a60f7f68af
empty commit to rebuild heroku
2015-05-07 18:12:20 +02:00
hairlessbear