14 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
Raphael	43dd95147e	Starting to remove database-cleaner	2010-10-19 23:29:58 -07:00
Raphael	1fd3aeabd9	Add or later to license notice	2010-10-07 16:25:34 -07:00
Dorian	6ffc03a4c9	Big clean up: delete trailing whitespace	2010-09-26 12:48:40 -04:00
Stephen Caudill	536cea5e44	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
Stephen Caudill	821643deb9	Use the new style of spec_helper require	2010-09-25 11:27:59 -04:00
Raphael	19199dabfe	fix spec_helper for 1.9.2	2010-09-24 11:49:30 -07:00
Jamie Wilkinson	fbdd50172d	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
Raphael	708e9f88a5	Spell our own name right	2010-09-15 17:56:18 -07:00
Raphael	aa3ebe372c	License notices replaced	2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi	4c15b1a01c	added license to every single goddamn file. also, put one in the root dir.	2010-09-13 14:23:50 -07:00
Raphael	f2e327d908	User factory now works	2010-08-06 13:27:42 -07:00
Raphael	540b56805d	Fixed misc_spec.rb	2010-06-22 10:50:35 -07:00
maxwell	85e6eb2132	added stray local files	2010-06-13 21:22:52 -07:00