Commit graph

760 commits

Author SHA1 Message Date
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
Sarah Mei
8cf1b83662 cucumber feature closer to passing. 2010-10-19 22:29:07 -07:00
Raphael
eeea57d307 Case sensitivity... 2010-10-18 12:43:04 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
Stephen Caudill
8d17b3537c Refactor to use a Background 2010-09-26 14:18:58 -04:00
Stephen Caudill
fd69f0201f User creates an aspect 2010-09-26 12:05:39 -04:00
Stephen Caudill
5f2d4ba073 Use the mongo_mapper and cucumber Cleaner strategy 2010-09-26 11:35:50 -04:00
Stephen Caudill
9038d6b0ed Allow connections to be passed through to Selenium 2010-09-26 11:35:50 -04:00
Stephen Caudill
8a93c67166 Add the Hashrocket default step definitions
Tweaked for mongomapper and diaspora
2010-09-26 11:35:50 -04:00
Stephen Caudill
05c2da81e5 Add cucumber and run the generator 2010-09-26 11:35:50 -04:00