Jonne Haß 2a45470232 Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services ... Conflicts: Changelog.md app/models/services/facebook.rb spec/models/services/facebook_spec.rb		2012-11-02 11:31:47 +01:00
..
assets	Fix overflow button in mobile reset password	2012-10-31 23:31:24 +01:00
controllers	Fix empty page after callback from service by redirecting to origin. Also make settings/services page use the same window when authenticating with other services instead of launching a popup.	2012-11-01 21:50:31 +02:00
helpers	Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false	2012-10-10 16:49:45 +02:00
mailers	New configuration system	2012-09-26 20:19:37 +02:00
models	Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services	2012-11-02 11:31:47 +01:00
presenters	don't error out if the root of a reshare of a reshare got deleted, fixes #3546	2012-10-24 19:51:31 +02:00
uploaders	Strip Beta Features	2012-09-11 21:52:53 -05:00
views	Fix empty page after callback from service by redirecting to origin. Also make settings/services page use the same window when authenticating with other services instead of launching a popup.	2012-11-01 21:50:31 +02:00