Commit d6171e53 authored by Dennis Schubert's avatar Dennis Schubert

Merge pull request #6778 from Zauberstuhl/facebook_review_changes

Changes for my successful facebook reviews
parents b0e608aa b9cf5995
......@@ -97,6 +97,7 @@ Contributions are very welcome, the hard work is done!
* Redesign stream pages [#6535](https://github.com/diaspora/diaspora/pull/6535)
* Improve search and mentions suggestions [#6788](https://github.com/diaspora/diaspora/pull/6788)
* Redesign back to top button [#6782](https://github.com/diaspora/diaspora/pull/6782)
* Adjusted Facebook integration for a successful review [#6778](https://github.com/diaspora/diaspora/pull/6778)
## Bug fixes
* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)
......
......@@ -12,9 +12,12 @@ module PublisherHelper
end
def service_button(service)
provider_title = I18n.t(
"services.index.share_to",
provider: service.provider.titleize)
content_tag :div,
class: "btn btn-link service_icon dim",
title: "#{service.provider.titleize} (#{service.nickname})",
title: "#{provider_title} (#{service.nickname})",
id: "#{service.provider}",
maxchar: "#{service.class::MAX_CHARACTERS}",
data: {toggle: "tooltip", placement: "bottom"} do
......
......@@ -13,7 +13,6 @@ Rails.application.config.middleware.use OmniAuth::Builder do
if AppConfig.services.facebook.enable?
provider :facebook, AppConfig.services.facebook.app_id, AppConfig.services.facebook.secret, {
display: "popup",
scope: "public_profile,publish_actions",
client_options: {
ssl: {
......
......@@ -1172,6 +1172,7 @@ en:
really_disconnect: "Disconnect %{service}?"
edit_services: "Edit services"
services_explanation: "Connecting to third-party sharing services gives you the ability to publish your posts to them as you write them in diaspora*."
share_to: "Share to %{provider}"
create:
success: "Authentication successful."
failure: "Authentication failed."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment