113 Commits

Author	SHA1	Message	Date
Sabe Jones	25b0ff38c4	Login Incentives (#8230) ... * feat(incentives): login bennies WIP * feat(content): incentive prize content WIP * fix(content): placeholders pass tests * WIP(content): Bard instrument placeholder * feat(content): Incentives build * chore(sprites): compile and fix some strings * WIP(incentives): quests and backgrounds * fix(quests): correct buy/launch handling * [WIP] Incentives rewarding (#8226) * Added login incentive rewards * Updated incentive rewards * Added incentive modal and updated notification structure * Added analytics to sleeping * Added login incentives to user analytics * Fixed unit tests and ensured that prizes are incremented and not replaced * Updated style of daily login incentive modal * Added rewards modal * Added translations * Added loigin incentive ui elements to profile * Updated login incentives structure and abstracted to common.content * Added dynamic display for login incentives on profile * Added purple potion image * Updated daily login modal * Fixed progress calculation * Added bard gear * Updated login incentive rewards * Fixed styles and text * Added multiple read for notifications * Fixed lint issues * Fixed styles and added 50 limit * Updated quest keys * Added login incentives reward page * Fixed tests * Fixed linting and tests * Read named notifications route. Add image for backgrounds * Fixed style issues and added tranlsations to login incentive notification * Hided abiltiy to purchase incentive backgrounds and added message to detail how to unlock * Updated awarded message * Fixed text and updated progress counter to display better * Fixed purple potion reward text * Fixed check in backgrouns reward text * fix(quest): pass tests * Added display of multiple rewards * Updated modal styles * Fixed neagtive 50 issue * Remvoed total count from daily login incentives modal * Fixed magic paw display * fix(awards): give bunnies again * WIP(incentives): more progress on BG shop * fix(incentives): actually award backgrounds * fix(incentives): more BG fixy * fix(backgrounds): don't gem-buy checkin bgs * Added dust bunny notification * fix(incentives): don't redisplay bunny award * chore(news): Bailey and different promo sprite	2016-11-23 19:34:09 -06:00
Sabe Jones	80e9735b28	Turkey Day 2016 (#8231) ... * feat(event): Turkey Day 2016 * fix(test): allow for free pet	2016-11-22 20:00:10 -06:00
Sabe Jones	d323be19c6	Mystery Items 2016/10 (#8169) ... * feat(content): mystery items 2016-10 * chore(news): Bailey 2016-10-25 Also ends the Enchanted Armoire A/B test. * fix(armoire): failing tests from A/B conclusion	2016-10-25 16:16:00 -05:00
Phillip Thelen	e3b484b29a	Add Google Signin (#7969) ... * Start adding google login * fix local js issue * implement syntax suggestions * fix delete social tests * Add service for authentication alerts * fix social login tests * make suggested google sign in changes * fix accidentally deleted code * refactor social network sign in * fix incorrect find * implement suggested google sign in changes * fix(tests): Inject fake Auth module for auth controller * fix(test): prevent social service from causing page reload * fix loading user info * Use lodash's implimentation of find for IE compatibility * chore: increase test coverage around deletion route * chore: clean up social auth test * chore: Fix social login tests * remove profile from login scope * fix(api): Allow social accounts to deregister as user has auth backup * temporarily disable google login button	2016-09-28 12:11:10 +02:00
Sabe Jones	51ffe2c8c2	A/B Testing, Round 2 (#8077) ... * feat(analytics): A/B test 2016-09-26 * feat(tutorial): A/B variant text	2016-09-26 17:10:43 -05:00
Sabe Jones	86c9bddc09	Handle social auth in A/B testing (#8024) ... * fix(AB-testing): handle social auth * refactor(AB-testing): move to pre save hooks	2016-09-16 19:13:21 +02:00
Blade Barringer	81b7eeeb71	Common reorg (#8025) ... * Re-organize common folder * fix: Correct paths in tests * fix: move new content to proper folder * chore: Move audio folder to assets * Move sprites to sprites assets directory * Move css sprites to assets directory * Split out readmes for common code and sprites * Move images to assets directory * Move destinatin of shared browserified file * remove unused file * move compiled js to client-old * Fix karma tests * fix: Correct paths for sprites	2016-09-16 17:18:07 +02:00
Sabe Jones	f20a7b851f	feat(analytics): AB testing ... User model update for AB tests, and the first AB test to start Sept 12 closes #7984	2016-09-12 22:13:25 -05:00
Matteo Pagliazzi	60f34dafb0	Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802) ... * Revert "Revert "Deprecate API v2"" * fix path in shops controller	2016-08-01 22:36:10 +02:00
Matteo Pagliazzi	590adb3438	Revert "Deprecate API v2" (#7801)	2016-07-17 18:15:25 +02:00
Matteo Pagliazzi	45c31a2bcf	Deprecate API v2 (#7761) ... * deprecate api-v2 * remove v2 test helpers * remove unused string	2016-07-16 19:56:18 +02:00
Shervin Sarain	539547b39e	prevent sync from clearing selected tags (#7631) ... * prevent sync from clearing selected tags * improved tag selection bugfix	2016-06-11 19:57:20 +02:00
Matteo Pagliazzi	f7be7205e7	Remove localstorage and add notifications (#7588) ... * move remaining files frm /common/script/public to website/public * remove localstorage * add back noscript template and put all javascript in the footer * fixes client side tests * remove double quotes where possible * simplify jade code and add tests for buildManifest * loading page with logo and spinner * better loading screen in landscape mode * icon on top of text logo * wip: user.notifications * notifications: simpler and working code * finish implementing notifications * correct loading screen css and re-inline images * add tests for user notifications * split User model in multiple files * remove old comment about missing .catch() * correctly setup hooks and methods for User model. Cleanup localstorage * include UserNotificationsService in static page js and split loading-screen css in its own file * add cron notification and misc fixes * remove console.log * fix tests * fix multiple notifications	2016-06-07 16:14:19 +02:00