Tyler Renelle f8f8a1334b Merge branch 'develop' into classes ...

Conflicts:
	views/options/inventory/stable.jade

2013-12-07 20:23:26 -07:00

..

adminCtrl.js

admin: refresh contrib list when saving a member

2013-11-15 20:06:18 -08:00

authCtrl.js

authCtrl tests now working, replaced window for $window

2013-10-12 22:46:13 -03:00

challengesCtrl.js

[#1837] separate groups filter from "create new challenge"-available groups

2013-11-15 17:36:36 -08:00

filtersCtrl.js

Subdocs & script templates. Migrate the API from User.tasks =>

2013-10-28 11:34:07 -07:00

footerCtrl.js

confirm "trigger new day"

2013-11-08 09:18:03 -08:00

groupsCtrl.js

fixes #1936. petCount was only being calculated for the current user, not for the profile being displayed. This data should probably be calculated in the model rather than in a controller

2013-11-27 21:22:15 -08:00

headerCtrl.js

party.order set and cases added

2013-11-23 21:18:33 +11:00

inventoryCtrl.js

Merge branch 'develop' into classes

2013-12-07 20:23:26 -07:00

notificationCtrl.js

mounts: bugfix to drop notif for food

2013-12-07 12:17:03 -07:00

rootCtrl.js

classes: misc spell-casting fixes, support party spells

2013-12-05 11:05:47 -07:00

settingsCtrl.js

Merge branch 'develop' into classes

2013-12-02 18:24:33 -07:00

tasksCtrl.js

classes: move item-store sorting from web to shard (so we can share with

2013-12-05 18:20:09 -07:00

userCtrl.js

classes: proper handling of items on class-switch, un-equipping items,

2013-12-06 15:41:58 -07:00