Tyler Renelle 76565384d3 Merge branch 'classes' into develop ...

Conflicts:
	public/js/controllers/tasksCtrl.js
	views/shared/modals/settings.jade

2013-12-08 18:17:53 -07:00

..

inventory

Merge branch 'classes' into develop

2013-12-08 18:17:53 -07:00

social

Merge branch 'classes' into develop

2013-12-08 18:17:53 -07:00

admin.jade

admin: add list of contributors. Add contributor.contributions, textarea for links of contributions for tracking. move all admin stuff to dedicated controller & routes

2013-11-15 19:27:23 -08:00

index.jade

contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor

2013-11-06 15:59:56 -08:00

profile.jade

classes: small tweaks

2013-12-07 11:31:11 -07:00

settings.jade

Fix #1934 (make Reset and Restore options more distinct)

2013-12-02 10:20:38 -06:00