maxwell 6cc9deaa65 merging with head		2010-07-08 21:44:14 -07:00
..
application_controller.rb	DG MS cleaning up friend request	2010-07-08 12:05:06 -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	Merging dashboards	2010-07-08 20:56:25 -04:00
people_controller.rb	DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket	2010-07-08 14:14:03 -07:00
person_requests_controller.rb	DG MS; person request is now request. refactoring as well. user verbiage for request actions	2010-07-08 18:28:39 -07:00
requests_controller.rb	DG MS; person request is now request. refactoring as well. user verbiage for request actions	2010-07-08 18:28:39 -07:00
sockets_controller.rb	DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket	2010-07-08 14:14:03 -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 keyrings to gitignore, symlinked to shared dir in cap scripts	2010-07-08 20:54:20 -04:00