diaspora/app/models
maxwell d443be35f9 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
Conflicts:
	app/controllers/publics_controller.rb
	app/models/user.rb
2010-08-09 17:31:46 -07:00
..
album.rb Typo in album 2010-08-02 18:30:09 -07:00
blog.rb MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module 2010-07-24 15:48:42 -07:00
bookmark.rb MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module 2010-07-24 15:48:42 -07:00
comment.rb DG, RS; User person delegation fixed 2010-08-09 10:46:02 -07:00
group.rb DG RS; added groups. can't delete, but can make new ones 2010-08-09 15:58:53 -07:00
person.rb Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 17:31:46 -07:00
photo.rb Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -07:00
post.rb Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -07:00
profile.rb Merge branch 'master' of github.com:diaspora/diaspora_rails into 2010-08-05 15:13:05 -07:00
request.rb Going toward pending requests 2010-08-09 17:21:41 -07:00
retraction.rb Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -07:00
status_message.rb RS; posted statuses now use the websocket to update latest, time is now styled right 2010-08-02 11:13:21 -07:00
user.rb Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 17:31:46 -07:00