Raphael d71966476b Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top ... Conflicts: app/views/albums/show.html.haml app/views/authors/show.html.haml app/views/layouts/application.html.haml app/views/photos/show.html.haml		2010-08-09 15:09:05 -07:00
..
albums	Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top	2010-08-09 15:09:05 -07:00
blogs	removed references of mine? method in all views	2010-08-08 22:53:23 -07:00
bookmarks	removed references of mine? method in all views	2010-08-08 22:53:23 -07:00
comments	began album index page. added a larger thumbnail on image upload. also, there is one HUGE memory leak somewhere	2010-07-21 00:24:11 -07:00
dashboards	new user top bar	2010-07-28 17:04:56 -07:00
devise	added email field to login screen. strange error won't let me log in?	2010-08-06 23:55:05 -07:00
js	RS, DG; Websocket is now working again, users have a channel	2010-08-09 13:02:08 -07:00
layouts	Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top	2010-08-09 15:09:05 -07:00
people	Merging ostatus deletion with selenium start	2010-08-04 16:01:19 -07:00
photos	Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top	2010-08-09 15:09:05 -07:00
posts	MS IZ profile page has more useful info, but ultimatly kinda ugly	2010-07-27 14:23:31 -07:00
publics	MS IZ getting the profile	2010-07-16 21:59:40 -07:00
requests	minute changes	2010-07-28 00:04:43 -07:00
shared	Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top	2010-08-09 15:09:05 -07:00
status_messages	Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top	2010-08-09 15:09:05 -07:00
users	DG IZ; moved some buttons around, added album edit page	2010-07-28 14:00:02 -07:00