sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9287 commits 3 branches 0 tags 1.6 GiB
Commit graph

9287 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
hairlessbear
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
hairlessbear
5ee6e94190 Merge pull request #3 from HabitRPG/develop 
Update from original
 2015-05-13 12:04:01 -04:00
hairlessbear
93472c8a1e Merge pull request #2 from HabitRPG/develop 
Update from original
 2015-05-13 12:02:37 -04: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
8a4abc632f Refactor push notifications test; Prevent push notification from being sent when buying gems for yourself as a gift 2015-05-12 20:18:06 -05:00
Blade Barringer
9a84503aed Merge branch 'develop' into negue-WIP-Push-notifications 2015-05-12 19:06:34 -05:00
Blade Barringer
292b8a6741 Correct comments 2015-05-12 18:58:56 -05:00
Blade Barringer
8f17519cd3 Reduce timeout time 2015-05-12 18:57:35 -05:00
Blade Barringer
e35b24582b Fix push notification tests 2015-05-12 18:26:18 -05:00
Negue
adef6bef7b tried to add a test for purchased gem gift 2015-05-12 21:36:22 +02:00
Blade Barringer
b635c62d16 Add contexts 2015-05-12 09:04:07 -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
Blade Barringer
60857994c3 Add expectation that push notification gets called when sending gems 2015-05-11 17:27:58 -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
3cda9ff820 Update push notification test to use chai expect 2015-05-11 08:19:49 -05:00
Blade Barringer
a7fa8dc9a4 Merge branch 'develop' into negue-WIP-Push-notifications 2015-05-11 08:18:11 -05: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
a906c750eb Correct spy set up 2015-05-10 22:13:53 -05:00
Blade Barringer
d4a296870b Add test for push notification when gems are sent 2015-05-10 20:39:11 -05:00
Blade Barringer
c219df2a9d Set up pended tests for push notifications 2015-05-10 17:10:21 -05:00
Blade Barringer
6d025330e9 Clean up spaces; remove console log 2015-05-10 16:48:48 -05:00
Blade Barringer
bf4ecf244c organized push notifications api test 2015-05-10 16:36:10 -05:00
Blade Barringer
95a90723c8 Merge branch 'develop' into negue-WIP-Push-notifications 2015-05-10 16:27:58 -05:00
Negue
1cc07129f1 Merge branch 'develop' into pushNotifications2 
Conflicts:
	test/api.mocha.coffee
 2015-05-10 22:01:41 +02: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