Commit Graph

743 Commits

Author SHA1 Message Date
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 981e1f553f Merge pull request #5468 from HabitRPG/sabrecat/analytics-service
Analytics service
2015-06-23 12:36:22 -07: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
Alys a7e1c30dca remove http from link to fonts.googleapis.com to prevent Mixed Content Warnings - partial fix for #5464 2015-06-23 16:47:18 +10:00
Sabe Jones f8e3120b3a fix(analytics): Move landing page tracking
...to AuthCtrl
2015-06-22 18:49:15 -05:00
Sabe Jones f5dfa5f015 fix(analytics): Define Analytics on scope 2015-06-22 18:30:47 -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 196490ecb1 WIP(analytics): Enable service 2015-06-22 15:44:33 -05:00
Sabe Jones 56a461c513 Revert "feat(analytics): Analytics service"
This reverts commit 9a0e31db40.
2015-06-22 14:14:33 -05:00
Blade Barringer 8579bb86df Merge branch 'develop' into sabrecat/analytics-service 2015-06-22 12:37:17 -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 5ab3a80b57 Closes #5360 2015-06-21 17:49:59 -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 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 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 9008a31c4a Add user to analytics service, rewrite updateUser to match test 2015-06-20 16:04:34 -05:00
Blade Barringer c7615e1cbd Merge branch 'develop' into gisikw-sabrecat/analytics-service 2015-06-20 14:52:28 -05:00
hairlessbear 02acad9dfc Removed unused 'armorSet' attribute in user model 2015-06-20 01:38:47 -04:00
Blade Barringer ddc8508816 Merge branch 'develop' into TheHollidayInn-tasks-api-up-checkoff-todo 2015-06-19 23:00:18 -05:00
Sabe Jones f6fafc5b6d WIP(event): Summer Splash 2015 2015-06-19 10:42:20 -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 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 2015-06-17 17:26:36 -05: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 3ab27f32d2 Refactored editTask into TaskService 2015-06-16 23:11:04 -05:00
Blade Barringer 1801ad0bce Add authors to bailey and correct refresh text 2015-06-16 17:59:59 -05:00