Commit Graph

10236 Commits

Author SHA1 Message Date
Will f3829c8ce4 code cleanup and commenting 2015-07-29 21:43:13 -07:00
Will a27f8d6705 add profile info and computed stats 2015-07-29 21:43:12 -07:00
Sabe Jones a398fe0af2 Merge pull request #5692 from HabitRPG/sabrecat/habitica-day
Habitica Day
2015-07-29 12:28:09 -07:00
Sabe Jones b4e3efeab7 fix(news): Break before list
For readability
2015-07-29 14:17:32 -05:00
Sabe Jones bbbae27631 chore(naming-day): Bailey and sprites 2015-07-29 14:12:04 -05:00
Sabe Jones 788fba08c2 Merge branch 'develop' into sabrecat/habitica-day 2015-07-29 14:00:58 -05:00
Blade Barringer 661e79d668 Use party variable 2015-07-28 21:27:15 -05:00
Blade Barringer 442c1f358b Use Groups.party() 2015-07-28 21:05:33 -05:00
Kevin Gisi 21020a9e74 Merge pull request #5686 from gisikw/allow-proxy-bypass
Missed a baseUrl instance.
2015-07-28 19:41:19 -04:00
Kevin Gisi 27b2d932ce Missed a baseUrl instance. 2015-07-28 19:40:26 -04:00
Kevin Gisi 39b19636d7 Merge pull request #5685 from gisikw/allow-proxy-bypass
Allow x-habitica-lb: yes suffice to bypass SSL redirect
2015-07-28 19:27:08 -04:00
Kevin Gisi 3be5c2cb96 Allow x-habitica-lb: yes suffice to bypass SSL redirect 2015-07-28 19:12:52 -04:00
Sabe Jones 39a17d933d fix(achievements): Day copypasta 2015-07-28 16:26:46 -05:00
Sabe Jones ceb9cf7817 WIP(event): Habitica Day 2015-07-28 16:20:08 -05:00
Sabe Jones 60d6a479de Merge pull request #5683 from HabitRPG/sabrecat/enable-drops-sooner
Enable pets at Level 3
2015-07-28 13:12:40 -07:00
Sabe Jones ac9244af7c Merge pull request #5675 from HabitRPG/sabrecat/party-analytics
Party analytics properties
2015-07-28 13:12:25 -07:00
Sabe Jones 0f08c2a8b1 test(unlocks): Check Rebirth 2015-07-28 14:35:37 -05:00
Sabe Jones 6dbac3280d test(levelup): Add tests for unlocks 2015-07-28 14:32:16 -05:00
Sabe Jones 8492541636 fix(visuals): Armoire and Seasonal Shop
Cleans up the Enchanted Armoire sprite and fixes bad alignment of Gem prices on the Seasonal Shop page.
2015-07-28 13:35:17 -05:00
Sabe Jones 13ab60cafe feat(drops): Enable pets at Level 3 2015-07-28 13:28:45 -05:00
Sabe Jones 7c56f5e7f6 fix(analytics): Tweaks per code review 2015-07-28 13:26:39 -05:00
Blade Barringer a23b7d23a9 chore(i18n): update locales 2015-07-28 08:00:08 -05:00
Blade Barringer d3bcf57246 chore(i18n): update locales 2015-07-28 07:43:40 -05:00
Blade Barringer 08a4e30b8e chore(i18n): update locales 2015-07-27 23:15:48 -05:00
Sabe Jones 5d5f1d2b1b chore(legal): Update revision date 2015-07-27 16:58:16 -05:00
Sabe Jones 4f36ecb8d1 fix(legal): TOS and privacy tweaks
Also updates the front page daily users brag to account for the 25% growth since the introduction of the joinOthers string.
2015-07-27 15:26:31 -05:00
Sabe Jones f6bbae3beb fix(analytics): Bad comparison
Corrects an error caught via test, where the check for intro tour completion would always fail. Also tweaks the updateUser behavior to save an explicit false if tour completion data is not found, including a test for that behavior.
2015-07-27 15:13:59 -05:00
Sabe Jones e9ed561907 fix(analytics): Add missing ID update
Also make the order of partyID and partySize consistent across updateUser calls.
2015-07-27 14:34:31 -05:00
Sabe Jones 9d7a2a1c24 feat(analytics): Party properties
Adds tracking of the user's party ID and size as user-level analytics properties.
2015-07-27 14:25:11 -05:00
Blade Barringer e72543641c Puts keys of the kennel modal on the inventory ctrl so pet counting variables can be accesssed
Closes #5668
2015-07-25 23:22:35 -05:00
Alys f5c66e51d1 refactor cron process for todos and dailys to give them separate code 2015-07-26 11:27:00 +10:00
Blade Barringer f31d1b4b1b Merge branch 'develop' into TheHollidayInn-tasks-select-with-keys-fix 2015-07-24 22:16:57 -05:00
Blade Barringer f749d1a3cb Make todos selectable with vimium 2015-07-24 22:08:13 -05:00
Blade Barringer 7c43f87858 Add test for discard method 2015-07-24 17:30:48 -05:00
Blade Barringer 60ee0c911f Add test for edit 2015-07-24 17:30:48 -05:00
Blade Barringer 6aae668b8c Rework gem adjustment so it actually makes sense 2015-07-24 17:30:47 -05:00
Blade Barringer 68f9a78aac Write tests for creating challenges 2015-07-24 17:30:47 -05:00
Blade Barringer 9e25c29e04 Correct maxPrize calculation 2015-07-24 17:30:47 -05:00
Blade Barringer 099beb5e8d Add task manipulation tests for challenges 2015-07-24 17:30:46 -05:00
Blade Barringer aea1ceafe5 Move test 2015-07-24 17:30:46 -05:00
Blade Barringer 875f30bece Add tests for filtering groups 2015-07-24 17:30:46 -05:00
Blade Barringer e37c60e0f2 Expand functions to make them readable 2015-07-24 17:30:45 -05:00
Blade Barringer 800c270944 Add tests for leave functions 2015-07-24 17:30:45 -05:00
Blade Barringer d3da391f6e Add challenge join test 2015-07-24 17:30:45 -05:00
Blade Barringer 0b85dc3e27 Correct getChallenges name 2015-07-24 17:30:44 -05:00
Blade Barringer 12e0bda8a2 Use specHelper to create mock challenges 2015-07-24 17:30:44 -05:00
Blade Barringer 32ebc8734e Set default prize for challenge at 0 2015-07-24 17:30:44 -05:00
Blade Barringer f9cc9a87ee Add challenge factory to karma specs 2015-07-24 17:30:44 -05:00
Blade Barringer 2722116b40 Organize challenge controllers specs 2015-07-24 17:30:43 -05:00
Blade Barringer 61d0172567 Add mising semi colons and line breaks 2015-07-24 17:30:43 -05:00