nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/models
History
Raphael f66b5f4006 Merge branch 'master' of github.com:diaspora/diaspora into pivots 
Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	config/sprinkle/provision.rb
2010-08-19 16:09:08 -07:00
..
album.rb Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 16:59:52 -07:00
comment.rb Encryption removed from callbacks, except retractions sort of. verification is in user.receive 2010-08-16 17:23:54 -07:00
group.rb MS IZ made a reques form in the user index page 2010-08-19 11:59:58 -07:00
person.rb removing the sanity check 2010-08-19 14:36:15 -07:00
photo.rb RS, IZ a slash 2010-08-18 18:13:17 -07:00
post.rb IZ MS person profile page now displays only posts a user can see 2010-08-19 10:46:47 -07:00
profile.rb RS, DG; build_xml_for has been eliminated. 2010-08-11 14:21:53 -07:00
request.rb refactored signature validation got specs passing 2010-08-17 23:21:00 -07:00
retraction.rb minor cleanup in models 2010-08-16 22:44:22 -07:00
status_message.rb DG IZ albums are now posts 2010-08-18 16:59:19 -07:00
user.rb Merge branch 'master' of github.com:diaspora/diaspora into pivots 2010-08-19 16:09:08 -07:00