mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
Merging code updates (Unlisted Mode)
This commit is contained in:
commit
89dab7c534
@ -20,7 +20,7 @@ class Settings::ProfilesController < ApplicationController
|
||||
private
|
||||
|
||||
def account_params
|
||||
params.require(:account).permit(:display_name, :note, :avatar, :header)
|
||||
params.require(:account).permit(:display_name, :note, :avatar, :header, :silenced)
|
||||
end
|
||||
|
||||
def set_account
|
||||
|
@ -24,8 +24,8 @@ class FanOutOnWriteService < BaseService
|
||||
def deliver_to_followers(status)
|
||||
Rails.logger.debug "Delivering status #{status.id} to followers"
|
||||
|
||||
status.account.followers.find_each do |follower|
|
||||
next if !follower.local? || FeedManager.instance.filter?(:home, status, follower)
|
||||
status.account.followers.where(domain: nil).find_each do |follower|
|
||||
next if FeedManager.instance.filter?(:home, status, follower)
|
||||
FeedManager.instance.push(:home, follower, status)
|
||||
end
|
||||
end
|
||||
|
@ -9,6 +9,7 @@
|
||||
%link{:rel => "manifest", :href => "/manifest.json"}/
|
||||
%meta{:name => "msapplication-config", :content => "/browserconfig.xml"}/
|
||||
%meta{:name => "theme-color", :content => "#2b90d9"}/
|
||||
%meta{:name => "apple-mobile-web-app-capable", :content => "yes"}/
|
||||
|
||||
%title
|
||||
= "#{yield(:page_title)} - " if content_for?(:page_title)
|
||||
|
@ -8,6 +8,7 @@
|
||||
= f.input :note, placeholder: t('simple_form.labels.defaults.note')
|
||||
= f.input :avatar, wrapper: :with_label
|
||||
= f.input :header, wrapper: :with_label
|
||||
= f.input :silenced, as: :boolean, wrapper: :with_label
|
||||
|
||||
.actions
|
||||
= f.button :button, t('generic.save_changes'), type: :submit
|
||||
|
@ -13,6 +13,7 @@ Rails.application.configure do
|
||||
# Full error reports are disabled and caching is turned on.
|
||||
config.consider_all_requests_local = false
|
||||
config.action_controller.perform_caching = true
|
||||
config.action_controller.asset_host = ENV['CDN_HOST']
|
||||
|
||||
# Disable serving static files from the `/public` folder by default since
|
||||
# Apache or NGINX already handles this.
|
||||
|
@ -15,6 +15,7 @@ de:
|
||||
note: Über mich
|
||||
password: Passwort
|
||||
username: Nutzername
|
||||
silenced: Öffentliche Beiträge nicht auflisten
|
||||
notification_emails:
|
||||
favourite: E-mail senden, wenn jemand meinen Beitrag favorisiert
|
||||
follow: E-mail senden, wenn mir jemand folgt
|
||||
|
@ -15,6 +15,7 @@ en:
|
||||
note: Bio
|
||||
password: Password
|
||||
username: Username
|
||||
silenced: Unlisted mode
|
||||
notification_emails:
|
||||
favourite: Send e-mail when someone favourites your status
|
||||
follow: Send e-mail when someone follows you
|
||||
|
@ -15,6 +15,7 @@ es:
|
||||
note: Biografía
|
||||
password: Contraseña
|
||||
username: Nombre de usuario
|
||||
silenced: No listado
|
||||
notification_emails:
|
||||
favourite: Enviar correo electrónico cuando alguien de a favorito en su publicación
|
||||
follow: Enviar correo electrónico cuando alguien le siga
|
||||
|
Loading…
Reference in New Issue
Block a user