Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,561 Commits 64 Branches 1,256 Tags
f3ec5ccb896a4cc7eee314ef953f5c78fac24fab
Commit Graph

627 Commits

Author SHA1 Message Date
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
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
Blade Barringer f4bc208226 Reorganize karma.conf 2015-08-22 21:41:13 -05:00
Blade Barringer b2c4d5c012 Add test for items that are deleted when getting the user 2015-08-22 17:53:49 -05:00
Blade Barringer 9ddf5353d1 Clean up directive tests 2015-08-22 17:21:30 -05:00
Blade Barringer 9643b6e650 Merge branch 'develop' into TheHollidayInn-menu-hide-when-navigate-away 2015-08-22 17:03:26 -05:00
TheHollidayInn 5e510aade0 Added tests for new menu directives 2015-08-22 15:25:51 -05:00
Blade Barringer 0f5f80f910 Unpend preening test 2015-08-19 19:23:23 -05:00
Sabe Jones f306ee6d1d fix(test): Skip preen test 2015-08-19 20:08:39 -04:00
Blade Barringer 00ec16877b Merge pull request #5799 from Alys/challenges-editable-by-admins-2015-08-16 
allow Challenges to be edited, closed, and deleted by staff and moderators
 2015-08-18 17:20:19 -05:00
Blade Barringer be87f69cd4 Actually save copy message modal spec 2015-08-18 08:10:38 -05:00
Blade Barringer fe22f76e30 Move copy message modal controller spec to own file 2015-08-18 08:06:46 -05:00
Blade Barringer 3f48364a4a Move autocomplete controller to own file 2015-08-18 08:05:56 -05:00
Blade Barringer a032c80aaf Move chat controller to own spec file 2015-08-18 08:05:35 -05:00
Blade Barringer a749e2d9f7 Move party controller to own spec 2015-08-18 08:04:17 -05:00
Blade Barringer 9b73c5eab8 Add tests for non-owner permissions 2015-08-16 09:45:01 -05:00
Blade Barringer ab9aab9262 Rework challenge integration test to be more autonomous 2015-08-16 09:44:38 -05:00
Alys 87c81df375 add test for Orb of Rebirth not removing free equipment (zero gold cost gear) 2015-08-16 13:06:48 +10:00
Blade Barringer 25d52bccc5 Use new newUser specHelper syntax 2015-08-15 00:08:41 -05:00
Blade Barringer 53133c6439 Adjust newUser spec helper 2015-08-14 23:55:36 -05:00
Blade Barringer c10a0ad31a Add habits 2015-08-14 23:43:32 -05:00
Alys 7f0889f405 remove commented-out default task code and unused default task locale strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-130619901 (comment by GitHubSphinx) 2015-08-15 13:23:42 +10:00
Sabe Jones ab91a6fba9 Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards 
Greeting and Thank-You Cards
 2015-08-13 22:35:25 -05:00
Blade Barringer 4adc19caf0 Fix test 2015-08-13 19:55:13 -05:00
Blade Barringer b1b4522b4b Fix test 2015-08-13 19:40:25 -05:00
Blade Barringer bf4d690a7c Merge pull request #5775 from HabitRPG/item_store_fix 
Split out potion and armoire out of the itemStore object
 2015-08-12 22:35:54 -05:00
Blade Barringer a5efc2af2b Merge pull request #5762 from crookedneighbor/transifex_test 
Transifex test
 2015-08-12 22:35:38 -05:00
Blade Barringer ceec310e5f Use human readable name 2015-08-12 22:16:30 -05:00
Blade Barringer 9a27b2e8cb Add task numbers to analytics 2015-08-12 21:47:04 -05:00
Blade Barringer bcf7c9712e Split out potion and armoire out of the itemStore object 
Fixes #5743
 2015-08-12 18:53:49 -05:00
Blade Barringer 203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Blade Barringer 1ffad1997e Removed mocha test for translations 2015-08-09 16:52:25 -05:00
Alys 9db46bd999 add test for cron reducing the value of a todo by only one day's worth when multiple days are missed 2015-08-09 16:37:20 +10:00
Alys a53625aafb remove (probably) unused completeDaily code from dailies tests 2015-08-09 14:10:29 +10:00
Alys 696027025b add tests for Dailies under new cron behaviour where multiple missed days are treated as one 2015-08-09 14:04:42 +10:00
Alys c3d65f0bcf initial changes to cause cron to count multiple missed days as one missed day 2015-08-09 13:58:18 +10:00
Blade Barringer 89a351a0d1 Add check for if string exists 2015-08-06 08:58:58 -05:00
Blade Barringer 47681e90bd Reorganize and set stub behavior 2015-08-05 13:02:36 -05:00
Blade Barringer 2598fa1ecb Move ulitmate gear 2015-08-05 12:00:57 -05:00
Blade Barringer 1bcc241c04 Rename common test 2015-08-05 12:00:00 -05:00
Blade Barringer b402df329d Remove unneeded content variable 2015-08-05 09:01:27 -05:00
Blade Barringer c8d957255b Add placeholders for more buy tests to transfer over 2015-08-05 09:00:26 -05:00
Blade Barringer 7f3bfa0dc7 Extract enchanted armoire tests into separate file 2015-08-05 08:57:25 -05:00
Blade Barringer ba2753edc2 Refactor armoire test no longer need to be updated when items are added to the armoire 
Fixes #5739
 2015-08-05 08:16:38 -05:00
Sabe Jones 6b37b0ced6 fix(armoire): Add sprites, pass tests 2015-08-04 13:00:34 -05:00
Blade Barringer 5ed5ca8126 Merge branch 'adjustments-to-challenge-participant-pr' into develop 2015-08-03 08:47:30 -05:00
Blade Barringer 01237df213 Add buttons to challenge participant modal 2015-08-03 08:40:33 -05:00
Blade Barringer 68f5a162fd Merge branch 'Lokeh_webhooks-more-details' into develop 2015-08-02 09:28:49 -05:00
Blade Barringer b567a0d9a6 Refactor webhook and add tests 2015-08-01 14:03:45 -05:00