Blade Barringer 316c3e9c2e Sort out conflicts from develop

2015-07-12 13:51:42 -05:00

..

authCtrl.js

Adjust login modal

2015-07-02 07:58:11 -05:00

challengesCtrl.js

Refactor clone challenges PR

2015-06-19 20:49:24 -05:00

filtersCtrl.js

Initialize user.filterQuery as undefined

2015-06-13 14:09:08 -05:00

footerCtrl.js

feat(analytics): Invite Friends experiment

2015-07-02 16:13:22 -05:00

groupsCtrl.js

Added additional check for chatChanged

2015-06-29 08:13:03 -05:00

hallCtrl.js

scroll to top and load hero; add tests for new behavior.

2015-04-10 23:51:34 -05:00

headerCtrl.js

WIP(event): Summer Splash cont'd

2015-07-08 16:13:23 -05:00

inventoryCtrl.js

WIP(event): Summer Splash cont'd

2015-07-08 16:13:23 -05:00

menuCtrl.js

Moved menu stuff to own controller

2015-06-29 12:39:05 -05:00

notificationCtrl.js

Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync

2015-06-28 21:07:32 -05:00

rootCtrl.js

Allow animal ears to be added to costume or equipped gear

2015-07-12 09:23:03 -05:00

settingsCtrl.js

change coupon route in angular router to promo

2015-05-08 21:24:57 -05:00

tasksCtrl.js

WIP(quests): Quests page cont'd

2015-07-08 17:43:08 -05:00

userCtrl.js

fix(interactive-tour): cleanup steps when navigating chapters, don't use tour.restart()

2015-03-10 15:40:19 -06:00