nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/spec
History
ilya 74c70d9410 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/models/user.rb
	spec/lib/diaspora_parser_spec.rb
2010-08-16 18:18:30 -07:00
..
controllers Merging in friend-refactor... 2010-08-16 15:35:14 -07:00
fixtures RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
helpers Made a few more tests pass 2010-08-16 16:22:46 -07:00
lib DG IZ; post user refs started (permissions) 2010-08-16 18:11:23 -07:00
models Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-16 18:18:30 -07:00
factories.rb User factory now works 2010-08-06 13:27:42 -07:00
misc_spec.rb User factory now works 2010-08-06 13:27:42 -07:00
spec_helper.rb Made a few more tests pass 2010-08-16 16:22:46 -07:00
user_encryption_spec.rb Encryption removed from callbacks, except retractions sort of. verification is in user.receive 2010-08-16 17:23:54 -07:00