maxwell c3d0c78bd1 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: lib/diaspora/user/receiving.rb		2010-11-02 12:46:08 -07:00
..
controllers	Retaining specs and line from robustdj's patch	2010-11-02 11:27:51 -07:00
fixtures	Moving to make_user, a few specs broken	2010-10-29 15:53:21 -07:00
helpers	Revert "Merge remote branch 'ed0h/336-markdown-for-status-messages'"	2010-11-02 12:14:12 -07:00
javascripts	Enough jasmine specs to get us started.	2010-10-30 11:48:17 -07:00
lib	REMOVED IMPORTER	2010-11-02 11:17:47 -07:00
mailers	removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts)	2010-10-31 12:34:26 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-02 12:46:08 -07:00
factories.rb	rake task to generate user fixtures, helper method which saves them	2010-10-29 15:53:21 -07:00
helper_methods.rb	requests are almost there	2010-11-01 14:54:40 -07:00
misc_spec.rb	MS IZ refactor green	2010-11-01 14:54:40 -07:00
spec_helper.rb	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-29 16:23:33 -07:00