danielvincent c53efbe56f Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/models/post.rb		2010-07-17 19:00:53 -07:00
..
blogs	all post partials now use object_path for links	2010-07-17 13:59:04 -07:00
bookmarks	all post partials now use object_path for links	2010-07-17 13:59:04 -07:00
comments	user has a image url field for user picture	2010-07-16 23:02:24 -07:00
dashboards	DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket	2010-07-08 14:14:03 -07:00
devise	MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change	2010-07-10 10:34:46 -07:00
js	MS socket now works in the server, but I can't figure out how to mock this stuff	2010-07-07 22:20:15 -07:00
layouts	user has a image url field for user picture	2010-07-16 23:02:24 -07:00
people	Added photos, profile editing	2010-07-16 17:26:06 -07:00
photos	all post partials now use object_path for links	2010-07-17 13:59:04 -07:00
posts	added debug partial	2010-06-25 15:35:40 -07:00
publics	MS IZ getting the profile	2010-07-16 21:59:40 -07:00
requests	did a couple of things to the request page	2010-07-16 23:22:18 -07:00
shared	warming up the page. colors were too cold and non-human before.	2010-07-05 00:02:16 -07:00
status_messages	all post partials now use object_path for links	2010-07-17 13:59:04 -07:00
users	user has a image url field for user picture	2010-07-16 23:02:24 -07:00