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

9707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 7ee1899807 Refactore analytics service and tests 2015-06-21 16:39:32 -05:00
Blade Barringer 1be73011eb Merge branch 'develop' into add-user-to-analyticsService 2015-06-21 14:04:17 -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 11ba5ad368 Merge branch 'develop' into add-user-to-analyticsService 2015-06-20 16:56:29 -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 d96b362531 Add additional tests for updateUser 2015-06-20 16:37:30 -05:00
Blade Barringer 9008a31c4a Add user to analytics service, rewrite updateUser to match test 2015-06-20 16:04:34 -05:00
Blade Barringer 21b8fc35ba Merge branch 'play-in-the-sandbox' into sabrecat/analytics-service 2015-06-20 16:01:02 -05:00
Blade Barringer 9fea2b5a90 Merge pull request #5435 from gisikw/sabrecat/analytics-service 
Repaired specs (stubbing issues)
 2015-06-20 16:00:11 -05:00
Blade Barringer 71fad8ca97 Provide user for anaylitcs service test 2015-06-20 15:50:06 -05:00
Blade Barringer ab53391fee Convert analytics service to use sinon.sandbox 2015-06-20 15:00:30 -05:00
Blade Barringer c7615e1cbd Merge branch 'develop' into gisikw-sabrecat/analytics-service 2015-06-20 14:52:28 -05:00
Blade Barringer 944cef4d44 Switch over to using sinon.sandbox in karma specs 2015-06-20 14:48:38 -05:00
Kevin Gisi 266122567d Repaired specs (stubbing issues) 2015-06-20 14:25:34 -04: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
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
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
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
Sabe Jones 86d711bb5e WIP(analytics): Remove Mixpanel 2015-06-18 20:33:54 -05:00
Sabe Jones 3c5ae80e0b WIP(analytics): Move client tracking to service 2015-06-18 15:43:57 -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
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
Alys 30a091e14e Revert "new GSalvadi audio theme, created by NomindTR" 2015-06-18 07:39:38 +10:00
hairlessbear 3046bbb0d7 Added quest rewards to pending quest display 2015-06-17 13:21:17 -04:00
Blade Barringer 4da3018ad9 Simplify editTask 2015-06-17 07:51:07 -05:00
Alys 910fc2f213 Merge pull request #5407 from Alys/GSalvadi-audio-NOMINDTR-2015-06-15 
new GSalvadi audio theme, created by NomindTR
 2015-06-17 21:39:39 +10:00
Blade Barringer e422ea065f Reword tests 2015-06-16 23:16:11 -05:00