Matteo Pagliazzi 041224b5ac fix merge conflicts

2015-11-21 12:09:40 +01:00

..

authCtrl.js

Move header assignment to app level

2015-11-12 12:23:42 -06:00

autoCompleteCtrl.js

Split out group controllers into separate files

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

challengesCtrl.js

wip: starts upgrading lodash to v3

2015-11-11 10:32:49 +01:00

chatCtrl.js

Split out group controllers into separate files

2015-08-19 08:20:13 -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(groups): Show specific invite modal

2015-08-28 16:48:39 -04:00

guildsCtrl.js

Split out group controllers into separate files

2015-08-19 08:20:13 -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

Adjust sm modal to not attach objects on rootScope

2015-11-17 21:23:20 -06: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

feat(sharing): Buttons for more modals

2015-10-29 16:33:27 -04:00

rootCtrl.js

Move header assignment to app level

2015-11-12 12:23:42 -06:00

settingsCtrl.js

Replaced magic numbers with variables

2015-11-17 14:07:35 +01:00

tasksCtrl.js

Split out potion and armoire out of the itemStore object

2015-08-12 18:53:49 -05: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