Sabe Jones beb86ea4bd Merge branch 'khipkin/party-badges' into develop ...

Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png

2016-03-15 14:57:38 -04:00

..

authCtrl.js

feat: Refine clear local storage function

2015-12-26 19:00:45 -06:00

autoCompleteCtrl.js

Split out group controllers into separate files

2015-08-19 08:20:13 -05:00

challengesCtrl.js

chore(dependency): Upgrade lodash from v2 to v3

2015-12-29 07:45:03 -06:00

chatCtrl.js

fix(analytics): don't log chat messages

2016-03-08 15:19:39 -05:00

copyMessageModalCtrl.js

Split out group controllers into separate files

2015-08-19 08:20:13 -05:00

filtersCtrl.js

Initialize user.filterQuery as undefined

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

footerCtrl.js

fix(sharing): Needed return object

2015-10-22 15:08:04 -04:00

groupsCtrl.js

Fix for issue #5182: Allow cancel editing group infobox

2016-01-18 22:39:06 -06:00

guildsCtrl.js

Closed issue #6758

2016-03-04 13:16:37 -03: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): Winter Wonderland 2015-16 partial

2015-12-15 17:15:02 -05:00

inviteToGroupCtrl.js

Fix bug where non-party members could not send invitations

2015-09-05 08:02:00 -05:00

memberModalCtrl.js

Remove countPets and countMounts from codebase

2015-07-20 08:11:00 -05:00

menuCtrl.js

Remove unneded declaration

2015-08-22 17:04:46 -05:00

notificationCtrl.js

fix(modals): SM modal fixes

2015-11-17 16:56:11 -05:00

partyCtrl.js

fix awarding of party {up,on} achievs to update server

2016-03-10 20:38:53 -05:00

rootCtrl.js

Change userLevelStyle to a root scope so it can be used in modals.

2016-02-25 15:59:04 -08:00

settingsCtrl.js

Add confirmation popover for Release pets/mounts

2015-12-28 21:37:38 -06:00

tasksCtrl.js

Merge pull request #6314 from TheHollidayInn/tasks-fix-delete-message

2015-12-14 14:30:06 -06:00

tavernCtrl.js

Split out group controllers into separate files

2015-08-19 08:20:13 -05:00

userCtrl.js

feat(sharing): Load widgets from service

2015-10-22 14:37:29 -04:00