10 Commits

Author	SHA1	Message	Date
MathWhiz	42c5e6c22b	Facebook pixel Revert (3rd time's a charm?) (#8450) ... * attempt revert * Add back unrelated stuff	2017-01-23 14:42:57 -06:00
Matteo Pagliazzi	74c6a891fc	Revert "Revert Facebook Pixel" (#8449)	2017-01-23 16:38:56 +01:00
MathWhiz	9a5d17f538	attempt revert (#8406)	2017-01-23 16:03:23 +01:00
Matteo Pagliazzi	92cbb4a07d	Upgrade ESLint to v3 (#8299) ... * upgraded habitrpg-eslint-config to v2 and eslint to v3 * adapt to eslint3 rules * update shrinkwrap * update shrinkwrap again	2016-12-20 22:31:36 +01: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
Sabe Jones	77c276fefe	feat(analytics): Facebook "Pixel" (#7871)	2016-08-05 13:40: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