krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,920 Commits 64 Branches 1,225 Tags
b7cd46a6fe02b1ce1db910b8e5549ff39b2bc0a2
Commit Graph

710 Commits

Author SHA1 Message Date
Blade Barringer
8881dbc034 Remove uneeded blank spaces 2015-09-16 20:01:42 -05:00
Sabe Jones
98cd8364c6 feat(hourglass): Individual filter functions 2015-09-16 16:35:04 -04:00
Sabe Jones
2bde07fa1c fix(test): Call hasAll correctly 2015-09-16 16:12:29 -04:00
Sabe Jones
7cc29810f3 fix(test): inject Content 
Also refactors to remove lodash where it's overkill.
 2015-09-16 16:01:13 -04:00
Sabe Jones
3bfeb15715 test(hourglass): TDD for Time Travel filtering 2015-09-16 15:27:19 -04:00
Sabe Jones
25b133c562 Merge branch 'develop' into sabrecat/timetravel-stable 2015-09-16 12:48:12 -04:00
Blade Barringer
c9c169a0fb Merge pull request #5912 from TheHollidayInn/group-remove-party-invites-when-last-member-leaves 
Removed user's party invites when last user leaves party
 2015-09-16 07:59:32 -05:00
Blade Barringer
4c84728873 Removes quest from group if quest leader is booted 2015-09-15 18:10:31 -05:00
Blade Barringer
a655242c49 Correct test assertion 2015-09-15 17:38:22 -05:00
Blade Barringer
9abe67b0ad Prevent quest leaders from leaving party 
(cherry picked from commit dc43aa5902)
 2015-09-15 16:41:50 -05:00
Blade Barringer
f8850755d0 Correct leave call to prevent leaving if quest is in progress 
(cherry picked from commit eddea562f4)
 2015-09-15 16:41:25 -05:00
Blade Barringer
78fe1073d4 Add user sync to sendAction 2015-09-15 16:39:08 -05:00
Sabe Jones
2ce52e980d feat(hourglass): Buy pets/mounts 2015-09-15 14:55:38 -04:00
Sabe Jones
66a8be526b WIP(hourglass): Error catches 2015-09-15 12:40:01 -05:00
Sabe Jones
bc16ec1729 Merge branch 'develop' into sabrecat/timetravel-stable 2015-09-15 11:32:28 -05:00
Blade Barringer
b32e521c56 Pull in client side changes for quest routes 2015-09-15 09:35:17 -05:00
Blade Barringer
5553d74334 Create method to calculate whether or not user has attained all mystery equipment 2015-09-13 16:26:29 -05:00
Blade Barringer
50b709045d Remove only from test 2015-09-13 16:24:46 -05:00
Blade Barringer
e554309822 Add route to add a hourglass 2015-09-13 15:09:41 -05:00
Blade Barringer
33c51a77d9 Add unit test for addTenGems route 2015-09-13 14:42:10 -05:00
Blade Barringer
5e9b74a2b9 Add test for addHourglass 2015-09-13 10:01:14 -05:00
Blade Barringer
7e97b73e8b Add test for addTenGems 2015-09-13 09:59:46 -05:00
Blade Barringer
edbdab5912 Add test shells for debug mode functions 2015-09-13 09:47:34 -05:00
TheHollidayInn
5c8c5a9ed3 Removed user's party invites when last user leaves party 2015-09-10 23:29:32 -05:00
Matteo Pagliazzi
c292d7b438 Merge pull request #5888 from TheHollidayInn/groups-delete-when-last-member-leaves 
Groups delete when last member leaves
 2015-09-09 11:26:04 +02:00
Blade Barringer
d02f2d34e3 Merge pull request #5893 from crookedneighbor/content-faq 
Content FAQ for iOS
 2015-09-06 16:38:18 -05:00
TheHollidayInn
700a6ddd9e Remove users inviations when guild is deleted 2015-09-06 15:31:40 -05:00
TheHollidayInn
e68e29db8f Delete private guilds or parties when last member leaves. 2015-09-06 15:31:40 -05:00
Blade Barringer
b9bbc3f1ea Move content to own directory 2015-09-06 15:31:08 -05:00
Matteo Pagliazzi
bfd6d055b0 merge into develop 2015-09-06 21:21:39 +02:00
Blade Barringer
4177202cee Merge pull request #5855 from HabitRPG/sabrecat/party-page 
Party Page Revamp
 2015-09-06 13:28:14 -05:00
Blade Barringer
f1224bc6be Use select instead of an input for cds 2015-09-06 09:36:29 -05:00
Blade Barringer
9ce6144fa4 Adjustments to custom day start 2015-09-05 15:32:49 -05:00
Matteo Pagliazzi
ec45a87dce fix tests 2015-09-05 15:44:45 +02:00
Blade Barringer
37b230b940 Add in @thehollidayinn's test from #5885 2015-09-05 15:44:44 +02:00
Blade Barringer
c141ee6d1c Fix test 2015-09-05 08:14:55 -05:00
Blade Barringer
807e6eb7cf Merge branch 'develop' into sabrecat/party-page 2015-09-04 19:00:48 -05:00
Blade Barringer
1b7e9c9290 Add tests for group.invite 2015-09-04 18:40:12 -05:00
Blade Barringer
0d78c01de3 Merge pull request #5877 from TheHollidayInn/guilds-user-becomes-lead-when-joins-empty-group 
Groups now make joining user the leader when they are empty
 2015-09-04 09:43:26 -05:00
Sabe Jones
c370344164 test(time-travel): TDD for pets/mounts 2015-09-02 15:03:57 -04:00
Sabe Jones
9eaa35ba2f test(time-travel): Rename test 2015-09-02 13:47:37 -04:00
TheHollidayInn
0adfcc3415 Groups now make joining user the leader when they are empty 2015-09-02 12:36:13 -05:00
Sabe Jones
7765f9ca04 test(mystery): Time Travelers test WIP 2015-09-01 17:37:39 -04:00
Sabe Jones
6f85fcfde2 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
 2015-09-01 13:40:20 -05:00
Matteo Pagliazzi
7acec14e6b do not allow leaders to kick themselves from group 2015-09-01 16:33:24 +02:00
Blade Barringer
41c38c6e63 Merge branch 'TheHollidayInn-directives-test-task-focus' into develop 2015-08-31 20:36:07 -05:00
Blade Barringer
1d8b10dc99 Adjust formatting 2015-08-31 20:35:23 -05:00
Blade Barringer
f4ca8bb78d Rename task-focus focus-element 2015-08-31 20:31:03 -05:00
Blade Barringer
d5bd5f281c Rename file names 2015-08-31 20:21:01 -05:00
Blade Barringer
c65ab56641 Remove focus-me directive 2015-08-31 20:17:30 -05:00