maxwell daf0de2eb0 Merge branch 'master' of github.com:diaspora/diaspora_rails into ostatus

2010-07-22 11:54:07 -07:00

..

albums_controller.rb

DG MS added basic album support

2010-07-20 21:28:24 -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

MS found one more duplicate in the Gemfile

2010-07-17 14:10:31 -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

RS IZ the photo controller now uses instantiate

2010-07-22 11:41:00 -07:00

publics_controller.rb

MS found one more duplicate in the Gemfile

2010-07-17 14:10:31 -07:00

requests_controller.rb

i think it works - max

2010-07-21 21:15:16 -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

DG IZ; added simple image picker for edit profile page. currently displays all images uploaded.

2010-07-20 11:50:36 -07:00