Raphael Sofaer 9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change ... Conflicts: app/controllers/users_controller.rb config/locales/diaspora/en.yml db/schema.rb spec/controllers/users_controller_spec.rb spec/mailers/notifier_spec.rb		2011-07-19 10:44:00 -07:00
..
chubbies	require haml in chubbies to kill error	2011-07-12 20:19:38 -07:00
controllers	Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change	2011-07-19 10:44:00 -07:00
fixtures	optimized images (safes a few bits and makes pagespeed shut the fuck up )	2011-05-31 17:34:22 +02:00
helpers	Removed unicode smileys, #1589	2011-07-17 10:45:06 +02:00
integration	IZ, RS, Move AS::Photo controller spec into integration so that rack middleware is run. Make auth failure return 401 rather than 302.	2011-06-27 12:31:47 -07:00
javascripts	DH remove test pollution from EventBroker#subscribe spec	2011-07-14 18:03:30 -07:00
lib	Fix specs after merge	2011-07-11 14:38:51 -07:00
mailers	Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change	2011-07-19 10:44:00 -07:00
models	Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change	2011-07-19 10:44:00 -07:00
multi_server	Merge branch 'master' into oauth	2011-06-28 17:13:38 -07:00
shared_behaviors	Revert "Revert "Merge branch 'hashtags-in-comments'""	2011-07-07 15:10:04 -07:00
support	Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController	2011-07-10 20:06:31 -07:00
factories.rb	Likes in comments, cache counter disabled for now.	2011-07-11 15:00:48 -07:00
helper_methods.rb	split 'mutual' flag into 'sharing' and 'receiving' on Contact	2011-05-04 17:09:48 -07:00
misc_spec.rb	Change :on to :post in the comment and post methods	2011-06-01 16:45:29 -07:00
spec_helper.rb	Merge branch 'master' into oauth	2011-06-28 17:13:38 -07:00