nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/models/jobs
History
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 Disable typhoeus everywhere but the HTTPMulti specs 2011-04-11 14:52:21 -07:00
http_post.rb
invite_user_by_email.rb Job::InviteUser -> Job::InviteUserByEmail 2011-01-26 12:16:48 -08:00
mail_also_commented.rb
mail_comment_on_post.rb
mail_liked.rb few cucumber steps failing. wip. 2011-05-11 11:08:30 -07:00
mail_mentioned.rb notifications for mentions 2011-02-10 12:39:05 -08:00
mail_private_message.rb added the email notification, the notification is not persisted, fixed the receive callback spec 2011-03-08 18:24:56 -08:00
mail_started_sharing.rb request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
notify_local_users.rb Move notifying iteration into resque job 2011-03-17 15:19:26 -07:00
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 Moving PostVisibility to aspects, WIP, model specs pass 2011-03-29 17:31:56 -07:00
receive_salmon.rb
resend_invitation.rb added files 2011-02-05 15:01:04 -08:00
socket_webfinger.rb SocketsController now takes a user object or a user id, so that we only instantiate the user if we need to 2011-03-17 12:56:23 -07:00
update_service_users.rb almost done, need to figure out how whats the deal with the controller not being called 2011-03-21 14:56:50 -07:00