diaspora/spec
danielgrippi 106ae983d5 Merge branch 'master' into follow. all specs green.
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
..
config Add rcov task 2011-03-01 18:12:42 -08:00
controllers Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
fixtures Fix data conversion, fixture generation in publicscontroller 2011-01-26 18:39:09 -08:00
helpers cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
integration Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
javascripts added direction detector widget to jasmine.yml 2011-04-11 22:23:21 +02:00
lib Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
mailers request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
models Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
shared_behaviors actually it was the other way around, we have to tell ruby that it's utf8, though now the build fails because (first guess) \w probably doesn't include utf8 chars in 1.9 2011-03-26 18:43:31 +01:00
support Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
factories.rb Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
helper_methods.rb added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
misc_spec.rb Moving PostVisibility to aspects, WIP, model specs pass 2011-03-29 17:31:56 -07:00
spec_helper.rb Disable typhoeus everywhere but the HTTPMulti specs 2011-04-11 14:52:21 -07:00