Raphael 701bec670f Merge branch 'master' of github.com:diaspora/diaspora into pivots ... Conflicts: app/views/groups/index.html.haml config/deploy_config.yml		2010-08-18 20:50:28 -07:00
..
albums	the album create doesn't crash the app	2010-08-18 20:14:31 -07:00
comments	fixed comment view bug	2010-08-09 21:21:35 -07:00
devise	things mostly working	2010-08-17 18:27:50 -07:00
groups	Merge branch 'master' of github.com:diaspora/diaspora into pivots	2010-08-18 20:50:28 -07:00
js	Merge branch 'socket-group' of github.com:diaspora/diaspora_rails	2010-08-17 20:19:29 -07:00
layouts	DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing	2010-08-18 16:15:10 -07:00
people	user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self	2010-08-18 02:40:53 -07:00
photos	RS, IZ fixed the url for the image	2010-08-18 18:06:13 -07:00
posts	Show debug	2010-08-18 20:49:06 -07:00
publics	MS IZ taking out URL options in sockets helper. hopefully the websocket doesnt blow up	2010-08-10 14:11:41 -07:00
requests	DG IZ added an error message on request delete	2010-08-16 15:08:05 -07:00
shared	A bunch of dumb checks to make the group index publisher pass tests	2010-08-18 15:42:06 -07:00
status_messages	Moved socket code out to lib, unsocketing from view should now work again	2010-08-11 12:03:26 -07:00
users	Moving to file store	2010-08-18 16:37:05 -07:00