44c83eb341
Merge pull request #5477 from gisikw/fix-analytics-again
...
Fix analytics
2015-06-24 03:52:30 -04:00
8c343c1845
*ahem* You saw nothing.
2015-06-24 03:45:25 -04:00
c8b5480157
Repair tests to respect setTimeout
2015-06-24 03:41:49 -04:00
01755a6d98
setTimeout all the analytics stuff
2015-06-24 03:23:48 -04:00
c7fea86aa5
Revert "Debug all the things"
...
This reverts commit be79d20864
2015-06-24 03:21:30 -04:00
be79d20864
Debug all the things
2015-06-24 02:33:58 -04:00
095f0f17c0
Merge pull request #5472 from gisikw/api-test-watch
...
Add gulp test:api:watch
2015-06-23 21:08:33 -05:00
10cb1d651a
Add gulp test:api:watch
2015-06-23 21:33:05 -04:00
981e1f553f
Merge pull request #5468 from HabitRPG/sabrecat/analytics-service
...
Analytics service
2015-06-23 12:36:22 -07:00
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
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
782ae4f81c
chore(i18n): update locales
2015-06-23 10:43:29 +02:00
e03bf6a711
fix(i18n): remove unused, empty string that was breaking Transifex
2015-06-23 10:38:30 +02:00
2c41553d7a
chore(i18n): update locales
2015-06-23 10:31:10 +02:00
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
f8e3120b3a
fix(analytics): Move landing page tracking
...
...to AuthCtrl
2015-06-22 18:49:15 -05:00
f5dfa5f015
fix(analytics): Define Analytics on scope
2015-06-22 18:30:47 -05:00
2ce1daffb8
feat(analytics): call service from app
2015-06-22 16:35:17 -05:00
83e0eb374f
fix(analytics): Load scripts in factory
2015-06-22 16:32:44 -05:00
196490ecb1
WIP(analytics): Enable service
2015-06-22 15:44:33 -05:00
56a461c513
Revert "feat(analytics): Analytics service"
...
This reverts commit 9a0e31db40
2015-06-22 14:14:33 -05:00
78689e6e7c
Made analytics mock, adjusted sandbox
2015-06-22 12:52:24 -05:00
8579bb86df
Merge branch 'develop' into sabrecat/analytics-service
2015-06-22 12:37:17 -05:00
afc6fba5bf
chore(i18n): update locales
2015-06-22 18:24:37 +02:00
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
b4c4b891a1
Moved sandbox.js to mocks directory
2015-06-21 20:02:48 -05:00
7064871557
Create Vagrantfile.example
2015-06-21 19:28:19 -05:00
4574501e07
Set base stats lower for vagrantfile
2015-06-21 19:10:36 -05:00
d98e6081e6
Merge branch 'develop' into kusold-vagrant-more-power
2015-06-21 19:02:43 -05:00
5ab3a80b57
Closes #5360
2015-06-21 17:49:59 -05:00
a98d9ac29c
Merge pull request #5437 from crookedneighbor/add-user-to-analyticsService
...
Add user to analytics service, rewrite updateUser to match test
2015-06-21 17:22:57 -05:00
73f8f48450
Merge branch 'sabrecat/analytics-service' into add-user-to-analyticsService
2015-06-21 17:21:17 -05:00
232afffbb8
Merge branch 'develop' into sabrecat/analytics-service
2015-06-21 17:19:12 -05:00
34c08e941f
Wrap service in anonymous function; put constants at top of file
2015-06-21 17:16:06 -05:00
fbc466cb29
Create private methods for analytics functions
2015-06-21 17:07:48 -05:00
15c08f091d
Remove mixpanel from analytics service
2015-06-21 17:07:22 -05:00
7ee1899807
Refactore analytics service and tests
2015-06-21 16:39:32 -05:00
1be73011eb
Merge branch 'develop' into add-user-to-analyticsService
2015-06-21 14:04:17 -05:00
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
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
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
c3b4950314
Merge branch 'sabrecat/summer-splash' into develop
2015-06-20 23:08:03 -05:00
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
96162b37bd
Merge pull request #5433 from gisikw/ultimate-gear-fix
...
Ultimate gear fix
2015-06-20 17:34:47 -05:00
11ba5ad368
Merge branch 'develop' into add-user-to-analyticsService
2015-06-20 16:56:29 -05:00
95f1c01b01
Removed more variable assignments that were never getting set
2015-06-20 16:54:33 -05:00
68f764bca6
Removed var assignment that is never reached
2015-06-20 16:50:48 -05:00
d96b362531
Add additional tests for updateUser
2015-06-20 16:37:30 -05:00
9008a31c4a
Add user to analytics service, rewrite updateUser to match test
2015-06-20 16:04:34 -05:00
21b8fc35ba
Merge branch 'play-in-the-sandbox' into sabrecat/analytics-service
2015-06-20 16:01:02 -05:00
Kevin Gisi