Commit Graph

274 Commits

Author SHA1 Message Date
Blade Barringer 82d2d6507f Add missing space 2015-08-04 18:55:55 -05:00
Blade Barringer e6c1b69cb0 Swap out isHabitrpg for ignoreRedirect 2015-08-04 18:55:26 -05:00
Blade Barringer 93a2d3d660 Use constants for is_prod and base_url 2015-08-04 18:30:27 -05:00
Blade Barringer 675808e54e Catch habitrpg.com specifically 2015-08-04 18:16:36 -05:00
Blade Barringer 5731f00736 Add baseUrl variable 2015-08-04 12:09:54 -05:00
Blade Barringer 0c92c4a048 Switch redirect to baseUrl 2015-08-04 08:42:53 -05:00
Blade Barringer 68f5a162fd Merge branch 'Lokeh_webhooks-more-details' into develop 2015-08-02 09:28:49 -05:00
Blade Barringer a960f5ef72 Revert back to toJSON() 2015-08-01 16:08:54 -05:00
Blade Barringer c7e751d662 Adjsut formatting 2015-08-01 14:04:33 -05:00
Blade Barringer b567a0d9a6 Refactor webhook and add tests 2015-08-01 14:03:45 -05:00
Alys 07bdc89738 habitrpg.wikia.com -> habitica.wikia.com. Also a trello URL change. 2015-07-31 18:53:32 +10:00
Alys 798b2890d0 HabitRPG -> Habitica text changes 2015-07-31 18:05:10 +10:00
Sabe Jones 65f21619ae feat(naming-day): Bailey etc. 2015-07-30 19:46:04 -05:00
Kevin Gisi efcf0a57d4 Change host check to proxy check 2015-07-30 19:27:00 -04:00
Kevin Gisi 339dec3ac0 Emergency fix 2015-07-30 19:10:14 -04:00
Kevin Gisi cfdcadb2bc Added redirects to habitica for non-API urls 2015-07-30 13:20:24 -04:00
Blade Barringer 1001cc8889 Refactor webhook section to be cleaner
Added note to put webhook into own module
2015-07-30 08:19:22 -05:00
Will 7245ffa94a refactor user.toJSON() 2015-07-30 00:21:41 -07:00
Will 4e5d630a87 remove profile object from webhooks 2015-07-29 21:43:13 -07:00
Will b3ae6eef17 maxHEalth uses new shared.maxHealth 2015-07-29 21:43:13 -07:00
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 788fba08c2 Merge branch 'develop' into sabrecat/habitica-day 2015-07-29 14:00:58 -05:00
Kevin Gisi 27b2d932ce Missed a baseUrl instance. 2015-07-28 19:40:26 -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 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 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 fca6f91f13 Merge branch 'develop' into analytics-service-server-side 2015-07-24 15:19:31 -05:00
Blade Barringer c41271e558 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-22 17:39:39 -05:00
Blade Barringer f40cfd2b66 Move all pet counting to shared count scripts 2015-07-22 17:32:12 -05:00
Blade Barringer 65c14b1e3f Refactor inventory ctrl variables 2015-07-20 12:51:10 -05:00
Blade Barringer 3d40da4004 Remove countPets and countMounts from codebase 2015-07-20 08:11:00 -05:00
Blade Barringer 054d884154 Merge branch 'develop' into analytics-service-server-side 2015-07-19 10:13:34 -05:00
Blade Barringer 0ce1183652 Automatically sends item name when item is purchased 2015-07-19 10:06:50 -05:00
Blade Barringer b49995c676 Allow optional value to be passed in 2015-07-19 08:33:44 -05:00
Blade Barringer deac9619bc Refactor to use object method of sending google data 2015-07-19 08:27:16 -05:00
Sabe Jones ffc441ab82 feat(quests): Improve drop notif 2015-07-16 16:22:49 -05:00
Matteo Pagliazzi ecc98411c7 refactor amazon payments and add one time purchases once again 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi bade139b4b wip amazon payments donation 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi de32461787 feat(amazon-payments): WIP add donations 2015-07-15 20:07:17 +02:00
Blade Barringer a01b2756f2 Merge pull request #5605 from hairlessbear/join-party-quest-invite-fix
Invite a new party member to a quest if the quest is still in the invitation stage (fixes #5598)
2015-07-13 22:37:46 -05:00
Alys cb9f5bcff3 Merge pull request #5523 from hairlessbear/update_isOnQuest_logic
Removed user.party.quest.key checks from isOnQuest and added check for user ID in quest members
2015-07-14 08:11:35 +10:00
hairlessbear 7223eeb681 Invites a new party member to a quest if the quest is still in the invitation stage (fixes #5598) 2015-07-13 13:01:35 -04:00
Kevin Gisi c82e5a885d Put memory check back in 2015-07-12 13:51:22 -04:00
Kevin Gisi be420a67a0 Remove apdex check from middleware until NR is back 2015-07-12 13:39:16 -04:00
Blade Barringer 284fa03223 Add platform, change itemName to itemKey 2015-07-12 10:03:41 -05:00
Blade Barringer 305414e152 Merge pull request #5553 from Lokeh/Lokeh/maxHealth
maxHealth refactor
2015-07-11 00:18:15 -05:00
Blade Barringer cdcc085530 Adjust test 2015-07-10 23:21:23 -05:00