maxwell d04093f456 Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo

2010-07-08 10:18:03 -07:00

..

application_controller.rb

DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.

2010-07-07 16:53:52 -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

dashboard_controller.rb

socket is now a controller

2010-07-08 10:17:41 -07:00

people_controller.rb

DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.

2010-07-07 16:53:52 -07:00

person_requests_controller.rb

DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.

2010-07-07 16:53:52 -07:00

socket_controller.rb

socket is now a controller

2010-07-08 10:17:41 -07:00

status_messages_controller.rb

DG MS; fixed delete button bug on stream

2010-07-01 19:49:56 -07:00

users_controller.rb

added will pagination action.

2010-06-28 21:56:58 -07:00