Tyler Renelle 19b6eb73e0 Merge branch 'develop' into classes ... Conflicts: public/css/index.styl src/models/user.js views/options/profile.jade views/shared/header/avatar.jade views/shared/tasks/lists.jade views/shared/tasks/task.jade		2013-12-02 18:24:33 -07:00
..
inventory	Merge branch 'develop' into classes	2013-12-02 18:24:33 -07:00
social	Merge remote-tracking branch 'origin/sabe_tweak' into develop	2013-11-27 11:28:31 -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	Merge branch 'develop' into classes	2013-12-02 18:24:33 -07:00
settings.jade	support for xml and json export of all user data	2013-11-25 08:06:27 -08:00