krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,867 Commits 64 Branches 1,226 Tags
3459b51cef114f9ee588bc4fe97e421f85167cc1
Commit Graph

994 Commits

Author SHA1 Message Date
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
aab7d5c257 Added test to check that group invites are removed when user cancels account 2015-09-11 12:56:19 -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
Blade Barringer
dc5c35bb17 Merge branch 'develop' into TheHollidayInn-menu-fix-notification-menu-closing 2015-08-31 19:01:11 -05:00
Blade Barringer
0bed76d336 Restructure test 2015-08-31 17:42:33 -05:00
TheHollidayInn
42066be2cf Fixed broken test by change element to a focusable element 2015-08-31 16:49:34 -05:00
Blade Barringer
a0040d736f Merge branch 'develop' into sabrecat/party-page 2015-08-28 23:06:00 -05:00
Blade Barringer
342343d34f Prevent user from leaving party during active quest 2015-08-28 22:41:30 -05:00
Blade Barringer
2e3c166a40 Add test for removing quest data from user 2015-08-28 21:58:00 -05:00
Sabe Jones
9e45017faa Merge branch 'develop' into sabrecat/onboarding-tweaks 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith2.css
	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-08-28 13:24:10 -05:00
Sabe Jones
8d713a53c4 feat(tutorial): Splash screen overhaul complete 2015-08-28 13:58:30 -04:00
Blade Barringer
15a6929b44 Merge branch 'develop' into sabrecat/party-page 2015-08-28 08:41:57 -05:00
TheHollidayInn
6fb29d8766 Added ability to close menu when a child element has closeMenu directive 2015-08-26 15:32:59 -05:00
Alys
049f9280a2 Merge pull request #5798 from Alys/rebirth-keeps-free-gear-2015-08-12 
prevent Orb of Rebirth from removing free gear (equipment that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750
 2015-08-26 22:01:29 +10:00
TheHollidayInn
06f59bed7c Added test for task-focus directive 2015-08-25 16:11:18 -05:00
Blade Barringer
5b583f43d6 Fix api and karma test 2015-08-24 18:07:21 -05:00
Blade Barringer
484609c634 Stub Q 2015-08-24 17:55:20 -05:00
Blade Barringer
ce7d0039f8 Q-ify save functions 2015-08-24 17:36:06 -05:00
Blade Barringer
f584b173c8 Add user scrub quest data back in 2015-08-24 12:58:31 -05:00