nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/models
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
..
jobs Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
notifications Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
services Remove unneeded callback 2011-03-23 12:00:47 -07:00
aspect.rb added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
aspect_membership.rb fixed disconnecting logic. specs&cucumber green 2011-04-11 15:10:51 -07:00
aspect_visibility.rb Moving PostVisibility to aspects, WIP, model specs pass 2011-03-29 17:31:56 -07:00
comment.rb messages are now relayable, a comment has an author as opposed to a person. 2011-03-01 12:39:42 -08:00
contact.rb only display contacts you are sharing with in aspect edit panes 2011-05-04 18:05:49 -07:00
conversation.rb added the email notification, the notification is not persisted, fixed the receive callback spec 2011-03-08 18:24:56 -08:00
conversation_visibility.rb PrivateMessage -> Conversation, Message. 2011-03-01 12:25:55 -08:00
invitation.rb added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
like.rb OMG SO MANY EMAILS, fixed 2011-05-11 16:07:24 -07:00
mention.rb notification now only created when message is received, not when message is first saved 2011-03-10 16:41:03 -05:00
message.rb added the email notification, the notification is not persisted, fixed the receive callback spec 2011-03-08 18:24:56 -08:00
notification.rb create a new notifciation if previous was read, only concatinate when it is the same unread message 2011-05-02 18:18:30 -07:00
notification_actor.rb wip 2011-01-28 22:37:38 -08:00
person.rb Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
photo.rb damn, typo 2011-04-02 16:02:51 +02:00
post.rb Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
post_visibility.rb added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
profile.rb Revert "Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings" 2011-03-30 14:47:40 -07:00
relayable_retraction.rb cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
request.rb split 'mutual' flag into 'sharing' and 'receiving' on Contact 2011-05-04 17:09:48 -07:00
retraction.rb fixed 'destroy for nil class' warning in cucumber: 2011-04-11 11:11:32 -07:00
service.rb added a dependant destroy to the service_users 2011-03-23 11:56:15 -07:00
service_user.rb follow wip. 2 failures. 2011-04-04 19:22:19 -07:00
status_message.rb clean activity streams, fix test 2011-03-30 14:27:20 -07:00
user.rb Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
user_preference.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00