danielvincent c630d3db6f Merge branch 'master' of github.com:diaspora/diaspora

2010-10-11 10:53:18 -07:00

..

controllers

Make intended behavior on hcard action clearer, return 404 on nonexistent person

2010-10-11 10:13:52 -07:00

helpers

don't translate css class to mark request count

2010-10-08 14:46:57 -07:00

models

stop the file include madness. using File.join and Rails.root for includes everywhere I could

2010-10-10 11:54:08 -07:00

uploaders

Add or later to license notice

2010-10-07 16:25:34 -07:00

views

DG MS; added tooltip

2010-10-11 10:53:00 -07:00