maxwell d393458ae8 Merge branch 'master' of github.com:diaspora/diaspora_rails		2010-07-15 16:55:09 -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	DG MS; fixed delete button bug on stream	2010-07-01 19:49:56 -07:00
bookmarks_controller.rb	DG MS; fixed delete button bug on stream	2010-07-01 19:49:56 -07:00
comments_controller.rb	commiting so i can pull	2010-06-28 14:47:23 -07:00
dashboards_controller.rb	Fixing zombies	2010-07-15 16:20:38 -07:00
people_controller.rb	ms dg post deletions now come thru the socket again	2010-07-09 19:27:39 -07:00
publics_controller.rb	MS IZ small webfinger bug fixes	2010-07-15 16:54:46 -07:00
requests_controller.rb	ms dg post deletions now come thru the socket again	2010-07-09 19:27:39 -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 keyrings to gitignore, symlinked to shared dir in cap scripts	2010-07-08 20:54:20 -04:00