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
9328 commits 3 branches 0 tags 1.6 GiB
Commit graph

9328 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
d7ce151500 Add translatable strings 2015-05-14 21:56:16 -05:00
Blade Barringer
547d234b46 Add final test for push notifications 2015-05-14 21:32:28 -05:00
Kelsey Ando
ca70e010ca Merge branch 'develop' into fixes-issue-5183 2015-05-14 21:33:04 -04:00
Kelsey Ando
0af264ef87 changing padding for the leave button on the party page so it will line up with the edit group button 2015-05-14 21:09:41 -04:00
Blade Barringer
7a2e2fa227 Add tests for invites to guilds or parties 2015-05-14 17:29:33 -05:00
Blade Barringer
84aaeedfff Add challenges test 2015-05-14 07:32:16 -05:00
Blade Barringer
2fac464160 Remove extranious pushSpy declaration 2015-05-13 19:35:26 -05:00
Blade Barringer
023458b6e5 Add test for getting push notification when gifted a subscription 2015-05-13 19:31:26 -05:00
Blade Barringer
3cbd5fd9ff Merge branch 'develop' into negue-WIP-Push-notifications 2015-05-13 19:11:57 -05:00
Alys
d6e1d765da adjust Inn message when user is already Resting - https://github.com/HabitRPG/habitrpg/issues/5128#issuecomment-99233779 2015-05-14 08:13:13 +10:00
Sabe Jones
89d1d63b24 Merge pull request #5198 from SabreCat/pet-skins 
Pet Skins and Ears
 2015-05-13 15:44:23 -05:00
Sabe Jones
84b333e5c1 fix(unlocks): Handle undefined/null balance 2015-05-13 15:34:23 -05:00
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
Matteo Pagliazzi
05f6e5e14d fix(flags): correctly send flag reports emails 2015-05-13 20:08:46 +02:00
Matteo Pagliazzi
b639896ae6 chore(i18n): update locales 2015-05-13 19:47:59 +02: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
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