3 Commits

Author	SHA1	Message	Date
Sabe Jones	37a71924fe	Incentives, Batch 2 (#8435) ... * feat(content): Incentives batch 2 gear * feat(incentives): incentives 55-100 * chore(migration): hand out missed incentive * refactor(constant): export MAX_INCENTIVES * fix(incentives): correct const import and say "Royal Purple Potion" not "Royal Purple"	2017-01-20 20:36:38 -06: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
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