danielvincent 3dd2384458 Merge branch 'fixturebuilder' ... Conflicts: spec/controllers/people_controller_spec.rb spec/controllers/publics_controller_spec.rb spec/lib/diaspora/parser_spec.rb		2011-01-18 17:05:44 -08:00
..
config	Replace APP_CONFIG with lib/app_config.rb so that it's testable.	2010-12-24 12:31:09 -08:00
controllers	Merge branch 'fixturebuilder'	2011-01-18 17:05:44 -08:00
fixtures	Remove yml files from git	2011-01-18 15:18:58 -08:00
helpers	Made specs work with fixtures, spec_helper needs work	2011-01-18 13:31:10 -08:00
intergration	Made specs work with fixtures, spec_helper needs work	2011-01-18 13:31:10 -08:00
javascripts	Diaspora.js 2.0, added an official widget, don't use native alerts anymore	2011-01-14 14:54:44 -06:00
lib	fixed the querying in the controllers got rid of hashes	2011-01-18 16:21:14 -08:00
mailers	Made specs work with fixtures, spec_helper needs work	2011-01-18 13:31:10 -08:00
models	Merge branch 'fixturebuilder'	2011-01-18 17:05:44 -08:00
shared_behaviors	Log specs don't check for specific number of renders.	2011-01-12 22:43:45 -08:00
support	Fixed connecting spec, magic import failure disappearance	2011-01-18 16:05:50 -08:00
factories.rb	Build test diaspora_handle properly.	2010-12-29 10:10:08 +01:00
helper_methods.rb	Merge almost complete, 4 failures	2011-01-14 16:00:10 -08:00
misc_spec.rb	Merge branch 'fixturebuilder'	2011-01-18 17:05:44 -08:00
spec_helper.rb	Fixed connecting spec, magic import failure disappearance	2011-01-18 16:05:50 -08:00