danielvincent 5be27f33ec Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/layouts/application.html.haml app/views/status_messages/_status_message.html.haml		2010-06-27 10:32:23 -07:00
..
blogs	DG MS fixing tests	2010-06-24 20:45:49 -07:00
bookmarks	Removed bookmark new page, moved form to index	2010-06-25 23:23:37 -04:00
comments	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-27 10:32:23 -07:00
dashboard	Change the form_for not to need a message passed, and adding it to the home page	2010-06-25 19:58:40 -07:00
devise	took out filler elements	2010-06-20 11:49:05 -07:00
friends	MS^2 Added the friends panel to application layout	2010-06-25 19:22:05 -07:00
layouts	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-27 10:32:23 -07:00
posts	added debug partial	2010-06-25 15:35:40 -07:00
status_messages	forgot to take out a debug line. i kept comments in, but they prevent a new post to be sent from the database to the view. on refresh everything works. also moved comments to its own partial so we can add it to all posts	2010-06-26 15:40:33 -07:00
users	DG MS; clicking on a person's name redirects to that person's post stream	2010-06-23 14:32:51 -07:00