10 commits

Author	SHA1	Message	Date
ilya	e677e4782e	the handle is now in the email if only one user invited the person	2010-10-21 16:07:31 -07:00
Raphael	fd8028db33	Revert "Revert "Merge remote branch 'upstream/master'"" ... This reverts commit 1481056af2.	2010-10-20 09:51:55 -07:00
Alec Leamas	1481056af2	Revert "Merge remote branch 'upstream/master'" ... This reverts commit fb70dc8c99, reversing changes made to 53fef63a9a. Conflicts: pkg/fedora/diaspora-setup pkg/ubuntu/diaspora-setup public/stylesheets/sass/application.sass spec/models/user/attack_vectors_spec.rb	2010-10-20 14:59:55 +02:00
maxwell	da95930c9a	added a bit to test email	2010-10-19 20:23:20 -07:00
danielvincent	d200aaab52	mail has some style. couldn't figure out devise mailer templating at the time...	2010-10-19 18:26:02 -07:00
ilya	a8bf082e35	The invitation now has an optional personal message	2010-10-18 14:35:41 -07:00
ilya	d0c6f12ea8	added another attack vector spec	2010-10-13 18:43:22 -07:00
ilya	36b9f66f60	the invited user keeps track of who invited them, limit on invites, ... removed the invites controller test	2010-10-13 16:52:33 -07:00
ilya	3b8998ab71	Invitations contains the inviters	2010-10-13 13:29:45 -07:00
danielvincent	eaeafd3240	added authentication via devise	2010-06-12 21:56:50 -07:00