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

9713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer f5647ecd76 Wrap task service in anon function 2015-06-21 20:35:45 -05:00
Blade Barringer 10c709a9f2 Merge branch 'develop' into TheHollidayInn-challenges-clone 2015-06-21 20:05:20 -05:00
Blade Barringer b4c4b891a1 Moved sandbox.js to mocks directory 2015-06-21 20:02:48 -05:00
Blade Barringer 7064871557 Create Vagrantfile.example 2015-06-21 19:28:19 -05:00
Blade Barringer 4574501e07 Set base stats lower for vagrantfile 2015-06-21 19:10:36 -05:00
Blade Barringer d98e6081e6 Merge branch 'develop' into kusold-vagrant-more-power 2015-06-21 19:02:43 -05:00
Blade Barringer 38e24571da Merge branch 'develop' into TheHollidayInn-challenges-clone 
Take specHelper off of global scope
 2015-06-21 18:59:11 -05:00
Blade Barringer 5ab3a80b57 Closes #5360 2015-06-21 17:49:59 -05:00
Blade Barringer 54509d234c Clean up groups controller 
* Put nullifying variables back in per https://github.com/HabitRPG/habitrpg/pull/5437/files#r32896108
* converted questStart to a hoisted function
 2015-06-21 14:02:40 -05:00
Alys c6256d7fa1 fix https://github.com/HabitRPG/habitrpg/issues/5439 for the other darned gear types that I freaking forgot about 2015-06-21 17:32:46 +10:00
Alys fc9f511542 allow Body Accessory equipment to be purchased from Seasonal Shop - fixes https://github.com/HabitRPG/habitrpg/issues/5439 2015-06-21 16:37:56 +10:00
Sabe Jones c3b4950314 Merge branch 'sabrecat/summer-splash' into develop 2015-06-20 23:08:03 -05:00
Sabe Jones 3641bea441 feat(event): Summer Splash 2015 
Summer seasonal event for 2015, including festive NPC graphics, the summer edition of the Seasonal Shop, and new class equipment available in Rewards.
 2015-06-20 23:07:14 -05:00
Blade Barringer 96162b37bd Merge pull request #5433 from gisikw/ultimate-gear-fix 
Ultimate gear fix
 2015-06-20 17:34:47 -05:00
Blade Barringer 95f1c01b01 Removed more variable assignments that were never getting set 2015-06-20 16:54:33 -05:00
Blade Barringer 68f764bca6 Removed var assignment that is never reached 2015-06-20 16:50:48 -05:00
Blade Barringer 944cef4d44 Switch over to using sinon.sandbox in karma specs 2015-06-20 14:48:38 -05:00
Blade Barringer 970b8d4061 Merge branch 'update-node-version' into develop 2015-06-20 10:51:39 -05:00
Blade Barringer 837c26415d Update node version 2015-06-20 10:02:46 -05:00
Blade Barringer f4ae2b98ff Merge pull request #5432 from hairlessbear/remove_armorSet 
Removed unused 'armorSet' attribute in user model
 2015-06-20 08:38:31 -05:00
Alys 6eac1174a2 sort eligibleEquipment before choosing random item from Enchaned Armoire - possible partial fix for https://github.com/HabitRPG/habitrpg/issues/5376#issuecomment-111799217 2015-06-20 20:22:27 +10:00
Keith Holliday 824ba3b932 Merge pull request #2 from crookedneighbor/refactor-clone-challenges 
Refactor clone challenges
 2015-06-19 23:32:41 -07:00
Kevin Gisi f32305458a Fix armoire edge case 2015-06-20 01:58:54 -04:00
Kevin Gisi 951d5417bc Add failing spec for armoire edge case 2015-06-20 01:58:05 -04:00
hairlessbear 02acad9dfc Removed unused 'armorSet' attribute in user model 2015-06-20 01:38:47 -04:00
Blade Barringer a44d760b8f Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-06-19 23:52:20 -05:00
Blade Barringer 2acf7eb71e Move score tests to separate file 2015-06-19 23:51:37 -05:00
Blade Barringer ddc8508816 Merge branch 'develop' into TheHollidayInn-tasks-api-up-checkoff-todo 2015-06-19 23:00:18 -05:00
Blade Barringer 86f18e9a5a Refactor clone challenges PR 2015-06-19 20:49:24 -05:00
Alys 83089720c8 Update migration script that sets Ultimate Gear object in user accounts to ensure true OR false values for all classes. Ref https://github.com/HabitRPG/habitrpg/issues/5427 2015-06-20 09:17:32 +10:00
Sabe Jones f6fafc5b6d WIP(event): Summer Splash 2015 2015-06-19 10:42:20 -05:00
Blade Barringer deff0d4da2 Merge branch 'develop' into TheHollidayInn-challenges-clone 2015-06-19 07:41:21 -05:00
TheHollidayInn 925cc81425 Removed complete param from creating todos with up and down url and added test for overriding complete parameter 2015-06-18 23:10:50 -05:00
Alys 07b41d16b6 Revert "Revert "new GSalvadi audio theme, created by NomindTR"" 
This reverts commit 30a091e14e.
 2015-06-18 22:19:35 +10:00
TheHollidayInn caec2d8476 Added editTask function back 2015-06-17 23:04:42 -05:00
TheHollidayInn 838c912906 Moved clone tasks function to task service 2015-06-17 22:22:55 -05:00
TheHollidayInn e9269d332c Removed dateCreated from being cloned in tasks 2015-06-17 21:08:33 -05:00
TheHollidayInn b81024bdd6 Fixed task clone functionality and updated code organization/semantics 2015-06-17 21:08:33 -05:00
TheHollidayInn 9ed3fbf613 Clone gems, all task info, and spacing. 2015-06-17 21:08:33 -05:00
TheHollidayInn c3307dd684 Added clone challenge test 2015-06-17 21:08:33 -05:00
TheHollidayInn 7890abe31a Added clone ability to challenges. 2015-06-17 21:08:03 -05:00
Blade Barringer bcc99791dd Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop 2015-06-17 19:13:13 -05:00
Blade Barringer c1b429c8bf Adjust spacing; remove comment 2015-06-17 19:12:49 -05:00
Blade Barringer 4042c1ce7a Merge branch 'GitHubSphinx-Sphinx-entry1' into develop 2015-06-17 19:06:56 -05:00
Blade Barringer 03c1476840 Change location of sellFor strings 2015-06-17 19:06:28 -05:00
Blade Barringer 3ff310294b Hide row if not part of reward; add one-time bindings 2015-06-17 18:57:15 -05:00
Blade Barringer e150a4d4f6 Merge branch 'develop' into hairlessbear-add_quest_rewards_to_pending_quest 2015-06-17 18:51:30 -05:00
Blade Barringer 685c09aa0d Merge branch 'task_service_refactoring_v2' into develop 2015-06-17 18:46:13 -05:00
Sabe Jones ad7e5a6dc9 feat(pets): Cuttlefishies v1.1.0 2015-06-17 17:26:36 -05:00
Alys c404e5ca5e Merge pull request #5420 from HabitRPG/revert-5407-GSalvadi-audio-NOMINDTR-2015-06-15 
Temporarily revert "new GSalvadi audio theme, created by NomindTR"
 2015-06-18 08:04:35 +10:00