danielgrippi 648a10e6d3 Merge branch 'master' into follow ... Conflicts: app/controllers/requests_controller.rb app/controllers/tags_controller.rb app/helpers/aspects_helper.rb app/views/notifications/index.html.haml config/routes.rb public/javascripts/aspect-edit.js public/javascripts/contact-list.js spec/integration/receiving_spec.rb spec/models/user/connecting_spec.rb spec/models/user/posting_spec.rb		2011-05-04 11:35:35 -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	Merge branch 'master' into follow	2011-05-04 11:35:35 -07:00