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
..
fake_http_request.rb	Took 90 seconds off the build. Fixture builder FTFW.	2011-02-20 00:35:51 -08:00
fake_redis.rb	made websockets far less dumb. don't render partials for people not connected.	2011-03-15 18:21:09 -07:00
fake_resque.rb	refetch profile if it's missing, comment out hydra stub for now because it breaks the specs	2011-04-09 15:20:28 +02:00
fake_typhoeus.rb	Disable typhoeus everywhere but the HTTPMulti specs	2011-04-11 14:52:21 -07:00
fixture_builder.rb	stub hydra for great success. also, make local_luke, local_leia, and remote_raphael fixtures.	2011-04-08 18:24:02 -07:00
fixture_generation.rb	Put in a lot of non nullable fields, edit the specs to match, drop a couple superfluous columns	2011-01-26 18:29:23 -08:00
i18n_raise_errors.rb	Make translation failure error out, there are at least 1 uncovered translation failures (share with lightbox)	2011-02-18 11:12:20 -05:00
no_id_on_object.rb	WTF. Seriously. It works with 1.9 now though.	2011-03-01 21:43:49 -08:00
user_methods.rb	added mutual flag, removed pending from contact, specs are green. wip	2011-04-05 16:12:53 -07:00