Commit graph

94 commits

Author SHA1 Message Date
Sabe Jones
c8982b3513 fix(analytics): Track intro tour steps 1-2 2015-07-23 15:07:37 -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
Sabe Jones
6d52f842ff fix(quest): Move party jump to cb 2015-07-22 11:52:15 -05:00
Sabe Jones
0313170921 feat(quests): Invite party button 2015-07-21 15:25:34 -05:00
Blade Barringer
2695419182 Use better beastMaster / mountMaster counts 2015-07-19 21:51:30 -05:00
Blade Barringer
3643d11d97 Refactor pet and mount count into one method 2015-07-19 20:56:14 -05:00
Blade Barringer
aee37b2a0e Swap out pet and mount count with stat calc functions 2015-07-19 20:40:15 -05:00
Blade Barringer
89bfc83b95 Organize stat functions alphabetically 2015-07-19 20:19:16 -05:00
Blade Barringer
c784b97586 Create private method for how stats should be displayed 2015-07-18 16:00:08 -05:00
Blade Barringer
53fb0ec8b0 Add display experience function 2015-07-18 16:00:07 -05:00
Blade Barringer
f1453d30c4 Add gold display function 2015-07-18 16:00:07 -05:00
Blade Barringer
2eb62de056 Add mpdisplay function 2015-07-18 16:00:07 -05:00
Blade Barringer
17ef7e2885 Add hpDisplay function 2015-07-18 16:00:06 -05:00
Blade Barringer
f9304bd28f Move stat calc scripts to angular service 2015-07-18 16:00:06 -05:00
Blade Barringer
94d476f837 Correct method name 2015-07-18 16:00:06 -05:00
Blade Barringer
a9757c9dbb Refactor member service; Remove logic in functions that were never used 2015-07-18 16:00:03 -05:00
Matteo Pagliazzi
695c793f6e Merge pull request #5632 from HabitRPG/paglias/amazon-payments
Amazon Payments: implement one time purchases
2015-07-16 13:24:42 +02:00
Sabe Jones
4a54363966 fix(quests): Show info modal for Gold quests 2015-07-15 14:02: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
Sabe Jones
c0d35dc472 WIP(quests): Quests page cont'd
Test fixes and addition of function for buying Quests with Gold
2015-07-08 17:43:08 -05:00
Sabe Jones
78d4989544 WIP(event): Summer Splash cont'd
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
2015-07-08 16:13:23 -05:00
Matteo Pagliazzi
ca36c5c632 Merge pull request #5531 from HabitRPG/paglias/amazon-payments
Amazon Payments Subscriptions
2015-07-01 01:40:27 +02:00
Sabe Jones
71d8fd2f0c fix(analytics): Handle missing user object 2015-06-30 17:13:56 -05:00
Sabe Jones
3d15da61ec fix(analytics): Correct user ID handling 2015-06-30 16:52:18 -05:00
Matteo Pagliazzi
65f4aac23c feat(amazon-payments): working subscriptions, put donations and gifts on hold 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
271245f1e6 feat(amazon-payments): finalize one time purchases 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
78cca423f0 feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
a377501f64 feat(amazon-payments): wip on donations 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
6faef6f737 wip amazon payments 2015-06-30 17:59:30 +02:00
Blade Barringer
547523c8f7 Merge branch 'crookedneighbor-blade-refactor-clone-challenges' into release-june-30th-2015 2015-06-29 17:56:42 -05:00
Blade Barringer
b72b14fe6c Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-28 21:07:32 -05:00
Kevin Gisi
01755a6d98 setTimeout all the analytics stuff 2015-06-24 03:23:48 -04:00
Kevin Gisi
c7fea86aa5 Revert "Debug all the things"
This reverts commit be79d20864.
2015-06-24 03:21:30 -04:00
Kevin Gisi
be79d20864 Debug all the things 2015-06-24 02:33:58 -04:00
Sabe Jones
fcd278c2f6 fix(analytics): Pass tests
Restores the "UUID" property so that tests no longer fail. Corrects various typos in analytics service test. Moves landing page tracking to the Jade file to avoid duplicate tracking.
2015-06-23 10:11:03 -05:00
Sabe Jones
8b04768b37 fix(analytics): Resolve errors
Should correct 400 Bad Request errors with Amplitude and cannot read undefined errors in tmp_static_front.
2015-06-23 09:30:18 -05:00
Sabe Jones
2ce1daffb8 feat(analytics): call service from app 2015-06-22 16:35:17 -05:00
Sabe Jones
83e0eb374f fix(analytics): Load scripts in factory 2015-06-22 16:32:44 -05:00
Sabe Jones
56a461c513 Revert "feat(analytics): Analytics service"
This reverts commit 9a0e31db40.
2015-06-22 14:14:33 -05:00
Sabe Jones
9a0e31db40 feat(analytics): Analytics service
Inject Analytics service into controllers where needed. Call Analytics service instead of GA or Mixpanel for tracking within the app.
2015-06-22 11:21:02 -05:00
Blade Barringer
f5647ecd76 Wrap task service in anon function 2015-06-21 20:35:45 -05:00
Blade Barringer
34c08e941f Wrap service in anonymous function; put constants at top of file 2015-06-21 17:16:06 -05:00
Blade Barringer
fbc466cb29 Create private methods for analytics functions 2015-06-21 17:07:48 -05:00
Blade Barringer
15c08f091d Remove mixpanel from analytics service 2015-06-21 17:07:22 -05:00
Blade Barringer
7ee1899807 Refactore analytics service and tests 2015-06-21 16:39:32 -05:00
Blade Barringer
19f8ca7980 Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-20 17:36:32 -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
86f18e9a5a Refactor clone challenges PR 2015-06-19 20:49:24 -05:00