Raphael 9309be2d69 Merge branch 'import' ... Conflicts: spec/models/user/invite_spec.rb		2010-10-19 16:06:48 -07:00
..
albums	default user picture change. stream link on all aspects page fix. layout view is not fragmented.	2010-10-19 11:29:29 -07:00
aspects	fixed no friends/posts message positioning	2010-10-19 12:28:54 -07:00
comments	various. fixed publisher in new layout.	2010-10-18 11:00:52 -07:00
devise	The invitation now has an optional personal message	2010-10-18 14:35:41 -07:00
invitations	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-18 15:46:44 -07:00
js	Resolve #387	2010-10-19 11:47:43 -07:00
layouts	default user picture change. stream link on all aspects page fix. layout view is not fragmented.	2010-10-19 11:29:29 -07:00
people	padding on stream fix. added add aspect button in aspect nav.	2010-10-19 12:10:22 -07:00
photos	padding on stream fix. added add aspect button in aspect nav.	2010-10-19 12:10:22 -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	MS DG; basic view support; it works, but it is ugly	2010-10-13 18:42:24 -07:00
requests	small view cleanups	2010-10-17 21:55:03 -07:00
shared	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-19 12:10:36 -07:00
status_messages	padding on stream fix. added add aspect button in aspect nav.	2010-10-19 12:10:22 -07:00
users	padding on stream fix. added add aspect button in aspect nav.	2010-10-19 12:10:22 -07:00