danielvincent a1830b5d40 Merge branch 'master' of github.com:diaspora/diaspora		2010-10-20 18:15:19 -07:00
..
albums	comment submit buttons show again. further changes to show pages.	2010-10-20 18:15:07 -07:00
aspects	remove friend from aspect box, with js call to remove the person from the aspect	2010-10-20 17:34:52 -07:00
comments	various. fixed publisher in new layout.	2010-10-18 11:00:52 -07:00
devise	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
invitations	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
js	stream using data-guid for messages. view fix in photo show	2010-10-20 13:47:16 -07:00
layouts	status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album.	2010-10-20 00:02:15 -07:00
people	fixed translation showing en on person show page when the person had no posts	2010-10-20 17:52:07 -07:00
photos	comment submit buttons show again. further changes to show pages.	2010-10-20 18:15:07 -07:00
posts	Add or later to license notice	2010-10-07 16:25:34 -07:00
publics	scratch that last commit	2010-10-05 20:37:28 -07:00
registrations	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
requests	moved the add people into a partial	2010-10-20 15:42:03 -07:00
shared	changed show layouts for album and photos. still needs work.	2010-10-20 17:35:27 -07:00
status_messages	changed show layouts for album and photos. still needs work.	2010-10-20 17:35:27 -07:00
users	padding on stream fix. added add aspect button in aspect nav.	2010-10-19 12:10:22 -07:00