maxwell c3d0c78bd1 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: lib/diaspora/user/receiving.rb		2010-11-02 12:46:08 -07:00
..
cruise	Use diaspora gemset. Simplify rake runner.	2010-10-20 21:43:03 -07:00
diaspora	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-02 12:46:08 -07:00
mongo_mapper	DG MS; 404 show pages for objects that don't exist for given user	2010-10-11 11:32:20 -07:00
salmon	EM websocket cleanly merged with master. webfingering is now async	2010-10-29 11:05:17 -07:00
tasks	Putting the jasmine back in CI - changing selenium to be an external process.	2010-10-30 16:31:36 -07:00
chrome_frame.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
collect_user_photos.rb	Use FileUtils for all file operations. Also uses Kernel.system to execute shell commands in a secure fashion.	2010-10-29 20:31:45 -07:00
development_mail_interceptor.rb	should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now	2010-10-22 00:49:01 -07:00
diaspora.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
em-webfinger.rb	mocking	2010-10-29 16:21:39 -07:00
encryptable.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
encryptor.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
hcard.rb	EM websocket cleanly merged with master. webfingering is now async	2010-10-29 11:05:17 -07:00
message_handler.rb	refactored message handler spec	2010-10-29 14:26:11 -07:00
webfinger_profile.rb	EM websocket cleanly merged with master. webfingering is now async	2010-10-29 11:05:17 -07:00