Commit graph

9 commits

Author SHA1 Message Date
maxwell
5701c3a873 should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now 2010-10-22 00:49:01 -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
e7f764ffeb attack vector where you take posts from valid (unknown) diaspora people is now fixed 2010-10-20 00:42:33 -07:00
ilya
4e9e716783 another attack vector spec 2010-10-19 15:42:40 -07:00
ilya
d0c6f12ea8 added another attack vector spec 2010-10-13 18:43:22 -07:00
ilya
03df0ff716 parser spec is green 2010-10-11 18:22:19 -07:00
Sarah Mei
2a24de2ba7 Changing spec to pending because it hasn't been implemented yet 2010-10-10 13:29:03 -07:00
ilya
3887712115 slight refactor of receiving spec, wrote a spec that exposed malicious friend attack
vector
2010-10-09 21:34:53 -07:00