danielgrippi 60a60733df Merge branch 'master' into follow ... Conflicts: app/controllers/aspects_controller.rb app/controllers/contacts_controller.rb app/controllers/people_controller.rb app/controllers/photos_controller.rb app/controllers/tags_controller.rb app/helpers/notifications_helper.rb app/models/notifications/new_request.rb app/models/user_preference.rb public/javascripts/view.js spec/controllers/aspects_controller_spec.rb spec/controllers/contacts_controller_spec.rb spec/controllers/home_controller_spec.rb spec/controllers/post_visibilities_controller_spec.rb spec/controllers/requests_controller_spec.rb spec/mailers/notifier_spec.rb spec/models/user_spec.rb		2011-05-12 15:49:51 -07:00
..
base.rb
http_multi.rb
http_post.rb	make jobs have a base class, which will verify the activerecord connection before trying the job	2011-01-19 14:10:42 -08:00
invite_user_by_email.rb
mail_also_commented.rb
mail_comment_on_post.rb
mail_liked.rb
mail_mentioned.rb
mail_private_message.rb
mail_started_sharing.rb
notify_local_users.rb
post_to_service.rb
process_photo.rb	Refactor image processing to use 2 uploaders. Federation and s3 need testing	2011-03-21 16:40:53 -07:00
publish_to_hub.rb	update publish job to include .atom	2011-03-30 10:41:47 -07:00
receive.rb
receive_local_batch.rb
receive_salmon.rb
resend_invitation.rb
socket_webfinger.rb
update_service_users.rb