 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
|
78689e6e7c
|
Made analytics mock, adjusted sandbox
|
2015-06-22 12:52:24 -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
|
b4c4b891a1
|
Moved sandbox.js to mocks directory
|
2015-06-21 20:02:48 -05:00 |
|
|
Blade Barringer
|
7064871557
|
Create Vagrantfile.example
|
2015-06-21 19:28:19 -05:00 |
|
|
Blade Barringer
|
4574501e07
|
Set base stats lower for vagrantfile
|
2015-06-21 19:10:36 -05:00 |
|
|
Blade Barringer
|
d98e6081e6
|
Merge branch 'develop' into kusold-vagrant-more-power
|
2015-06-21 19:02:43 -05:00 |
|
|
Blade Barringer
|
5ab3a80b57
|
Closes #5360
|
2015-06-21 17:49:59 -05:00 |
|
|
Blade Barringer
|
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 |
|
|
Blade Barringer
|
73f8f48450
|
Merge branch 'sabrecat/analytics-service' into add-user-to-analyticsService
|
2015-06-21 17:21:17 -05:00 |
|
|
Blade Barringer
|
232afffbb8
|
Merge branch 'develop' into sabrecat/analytics-service
|
2015-06-21 17:19:12 -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
|
96162b37bd
|
Merge pull request #5433 from gisikw/ultimate-gear-fix
Ultimate gear fix
|
2015-06-20 17:34:47 -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
|
d96b362531
|
Add additional tests for updateUser
|
2015-06-20 16:37:30 -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
|
21b8fc35ba
|
Merge branch 'play-in-the-sandbox' into sabrecat/analytics-service
|
2015-06-20 16:01:02 -05:00 |
|
|
Blade Barringer
|
9fea2b5a90
|
Merge pull request #5435 from gisikw/sabrecat/analytics-service
Repaired specs (stubbing issues)
|
2015-06-20 16:00:11 -05:00 |
|
|
Blade Barringer
|
71fad8ca97
|
Provide user for anaylitcs service test
|
2015-06-20 15:50:06 -05:00 |
|
|
Blade Barringer
|
ab53391fee
|
Convert analytics service to use sinon.sandbox
|
2015-06-20 15:00:30 -05:00 |
|
|
Blade Barringer
|
c7615e1cbd
|
Merge branch 'develop' into gisikw-sabrecat/analytics-service
|
2015-06-20 14:52:28 -05:00 |
|
|
Blade Barringer
|
944cef4d44
|
Switch over to using sinon.sandbox in karma specs
|
2015-06-20 14:48:38 -05:00 |
|
|
Kevin Gisi
|
266122567d
|
Repaired specs (stubbing issues)
|
2015-06-20 14:25:34 -04:00 |
|
|
Blade Barringer
|
970b8d4061
|
Merge branch 'update-node-version' into develop
|
2015-06-20 10:51:39 -05:00 |
|
|
Blade Barringer
|
837c26415d
|
Update node version
|
2015-06-20 10:02:46 -05:00 |
|
|
Blade Barringer
|
f4ae2b98ff
|
Merge pull request #5432 from hairlessbear/remove_armorSet
Removed unused 'armorSet' attribute in user model
|
2015-06-20 08:38:31 -05:00 |
|
|
Alys
|
6eac1174a2
|
sort eligibleEquipment before choosing random item from Enchaned Armoire - possible partial fix for https://github.com/HabitRPG/habitrpg/issues/5376#issuecomment-111799217
|
2015-06-20 20:22:27 +10:00 |
|
|
Kevin Gisi
|
f32305458a
|
Fix armoire edge case
|
2015-06-20 01:58:54 -04:00 |
|
|
Kevin Gisi
|
951d5417bc
|
Add failing spec for armoire edge case
|
2015-06-20 01:58:05 -04:00 |
|
|
hairlessbear
|
02acad9dfc
|
Removed unused 'armorSet' attribute in user model
|
2015-06-20 01:38:47 -04:00 |
|
|
Blade Barringer
|
a44d760b8f
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
|
2015-06-19 23:52:20 -05:00 |
|
|
Blade Barringer
|
2acf7eb71e
|
Move score tests to separate file
|
2015-06-19 23:51:37 -05:00 |
|
|
Blade Barringer
|
ddc8508816
|
Merge branch 'develop' into TheHollidayInn-tasks-api-up-checkoff-todo
|
2015-06-19 23:00:18 -05:00 |
|
|
Alys
|
83089720c8
|
Update migration script that sets Ultimate Gear object in user accounts to ensure true OR false values for all classes. Ref https://github.com/HabitRPG/habitrpg/issues/5427
|
2015-06-20 09:17:32 +10:00 |
|
|
Sabe Jones
|
f6fafc5b6d
|
WIP(event): Summer Splash 2015
|
2015-06-19 10:42:20 -05:00 |
|
|
TheHollidayInn
|
925cc81425
|
Removed complete param from creating todos with up and down url and added test for overriding complete parameter
|
2015-06-18 23:10:50 -05:00 |
|