danielvincent c53efbe56f Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/models/post.rb		2010-07-17 19:00:53 -07:00
..
application_controller.rb	DG MS; person object now properly stored with request object save	2010-07-09 14:07:35 -07:00
blogs_controller.rb	IZ MS blogs ctivity streams/atom	2010-07-16 16:07:58 -07:00
bookmarks_controller.rb	IZ MS bookmarks now create activity streams	2010-07-16 15:54:26 -07:00
comments_controller.rb	commiting so i can pull	2010-06-28 14:47:23 -07:00
dashboards_controller.rb	Fixing friending deploy	2010-07-16 10:06:29 -07:00
gridfs_controller.rb	Added photos, profile editing	2010-07-16 17:26:06 -07:00
people_controller.rb	ms dg post deletions now come thru the socket again	2010-07-09 19:27:39 -07:00
photos_controller.rb	Photo controller fixed	2010-07-17 18:13:51 -07:00
publics_controller.rb	MS IZ hcard, emptyfiles, routesw	2010-07-15 18:36:07 -07:00
requests_controller.rb	did a couple of things to the request page	2010-07-16 23:22:18 -07:00
sockets_controller.rb	MS DG friend deletions dont work, but they do send, prob a parser problem	2010-07-09 19:36:02 -07:00
status_messages_controller.rb	DG MS; diaspora xml generate model genereates a valid atom feed for status messages	2010-07-13 12:09:06 -07:00
users_controller.rb	Added photos, profile editing	2010-07-16 17:26:06 -07:00