Commit Graph

2949 Commits

Author SHA1 Message Date
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
Blade Barringer
1c2ec66c93 Add format user data function to analytics server 2015-07-08 08:09:43 -05:00
Blade Barringer
d2b74f11dd Create analytics.track 2015-07-07 18:00:41 -05:00
Blade Barringer
e6ee4d303c Set up purchase tracking 2015-07-06 08:11:31 -05:00
Blade Barringer
4bcff71859 Adjust login modal
* Rename loginForm
* Use larger buttons for logging in or registering
* Use fully translated placeholder text
2015-07-02 07:58:11 -05:00
Blade Barringer
e6f0acba4c Add initial server side analytics service 2015-07-01 18:36:43 -05:00
Blade Barringer
0ac76cfe34 Remove mixpanel mock 2015-07-01 18:32:11 -05: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
bc837fd4db Moved menu stuff to own controller 2015-06-29 12:39:05 -05:00
Blade Barringer
567ed1f28b Correct seenMessage use in menu
Closes #5519
2015-06-29 08:58:51 -05:00
Blade Barringer
b72b14fe6c Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-28 21:07:32 -05:00
Blade Barringer
bcf141840d Merge branch 'TheHollidayInn-tasks-search-checklists' into develop 2015-06-27 22:23:08 -05:00
Blade Barringer
4abd7f85f8 Adjustments to PR#5494
* Update filter name to be more accurate
* Add additional tests
* Simplify checklist checking logic
* Prevent errors from multiple matches in checklist
2015-06-27 22:21:50 -05:00
Alys
d7a203ccc2 set all daily repeat code and tests to use true/false instead of 1/0 for consistency with DailySchema; comment-out unused default Daily repeat code 2015-06-27 20:06:04 +10:00
TheHollidayInn
8ba621795a Task filter now searches checklists 2015-06-25 22:33:08 -05:00
Blade Barringer
2d78f6c838 Remove only from karma test 2015-06-24 08:15:33 -05:00
Kevin Gisi
8c343c1845 *ahem* You saw nothing. 2015-06-24 03:45:25 -04:00
Kevin Gisi
c8b5480157 Repair tests to respect setTimeout 2015-06-24 03:41:49 -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
hairlessbear
0e4e7a032a Added explanatory comment 2015-06-22 21:36:06 -04:00
hairlessbear
f0ddbae775 Added quest completion modal test for when RSVPNeeded is true; modified quest invite test to use 'to.not.be.calledWith' 2015-06-22 21:33:38 -04:00
hairlessbear
c942c10c17 Added a line break 2015-06-22 21:21:38 -04:00
hairlessbear
b249e103de Removed duplicated test 2015-06-22 21:04:28 -04:00
hairlessbear
f75bbb6e5f Modified 'RSVPNeeded is not true' test to not set user.party.quest.completed because it is not needed for the test 2015-06-22 20:55:50 -04:00
hairlessbear
8026e99219 Added quest completion modal watch tests 2015-06-22 20:48:11 -04:00
hairlessbear
c5292e7ff8 Changed 'invite modal does not open' tests to focus on completion modal opening, but being the only modal to open. Also modified the named of two tests to be more intuitive and accurate 2015-06-22 20:33:49 -04: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
Blade Barringer
10c709a9f2 Merge branch 'develop' into TheHollidayInn-challenges-clone 2015-06-21 20:05:20 -05:00
Blade Barringer
b4c4b891a1 Moved sandbox.js to mocks directory 2015-06-21 20:02:48 -05:00
Blade Barringer
38e24571da Merge branch 'develop' into TheHollidayInn-challenges-clone
Take specHelper off of global scope
2015-06-21 18:59:11 -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
11fcb54c03 Corrected watch check
4fc04fea24 (commitcomment-11784493)
2015-06-21 10:44:59 -05:00
Blade Barringer
4fc04fea24 Adjustments to PR #5298
* Put watch on $scope
* Check for quest.completed !== true or false
* Add test for quest invite modal watch
2015-06-20 21:10:18 -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
96162b37bd Merge pull request #5433 from gisikw/ultimate-gear-fix
Ultimate gear fix
2015-06-20 17:34:47 -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
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
Kevin Gisi
951d5417bc Add failing spec for armoire edge case 2015-06-20 01:58:05 -04: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
Blade Barringer
86f18e9a5a Refactor clone challenges PR 2015-06-19 20:49:24 -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