diaspora/app
zhitomirskiyi 4e96d11cd0 Revert "refactored local person person friend finder functionality to use the partial"
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.

Conflicts:

	app/views/services/_remote_friend.html.haml
	app/views/users/getting_started/_step_3.html.haml

refactored invitations, added them to the last page

fixed styling on adding an aspect to the aspect list

added a facebook for person edit aspect memberships

touched up and simplified sign-up flow

fix styling on step 3
2011-02-08 16:40:33 -08:00
..
controllers Revert "refactored local person person friend finder functionality to use the partial" 2011-02-08 16:40:33 -08:00
helpers localize dates 2011-02-08 16:26:56 +01:00
mailers Fix build 2011-01-28 12:18:56 -08:00
models invitation text 2011-02-08 16:40:32 -08:00
uploaders remove s3 setting 2011-01-17 16:46:39 -08:00
views Revert "refactored local person person friend finder functionality to use the partial" 2011-02-08 16:40:33 -08:00