6 commits

Author	SHA1	Message	Date
MrZYX	849072f283	this should fix #572	2010-11-24 17:48:47 +01:00
MrZYX	0a363a73b0	just found the mailer... :)	2010-11-12 06:07:37 +01: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
danielvincent	d200aaab52	mail has some style. couldn't figure out devise mailer templating at the time...	2010-10-19 18:26:02 -07:00
danielvincent	eaeafd3240	added authentication via devise	2010-06-12 21:56:50 -07:00