* Add: #363 特定サーバーの投稿にスタンプを付けることを禁止する管理者設定 * Fix test
This commit is contained in:
parent
08f2fcb72b
commit
7b8fedb3cd
10 changed files with 157 additions and 26 deletions
|
@ -911,6 +911,10 @@ en:
|
|||
minor: Minor release
|
||||
patch: Patch release — bugfixes and easy to apply changes
|
||||
version: Version
|
||||
special_instances:
|
||||
emoji_reaction_disallow_domains: Domains we are not permitted stamp
|
||||
emoji_reaction_disallow_domains_hint: If you need to be considerate to your coalition partners, set the domain with a new line separator. It is not possible to put a stamp on a post from a set domain.
|
||||
title: Special servers
|
||||
statuses:
|
||||
account: Author
|
||||
application: Application
|
||||
|
|
|
@ -909,6 +909,10 @@ ja:
|
|||
minor: マイナーリリース
|
||||
patch: パッチ (バグ修正のみ)
|
||||
version: バージョン
|
||||
special_instances:
|
||||
emoji_reaction_disallow_domains: 自分がスタンプをつけることを許可しないドメイン
|
||||
emoji_reaction_disallow_domains_hint: 連合先に配慮する必要がある場合、ドメインを改行区切りで設定します。設定されたドメインの投稿にスタンプを付けることはできません。
|
||||
title: 特殊なサーバー
|
||||
statuses:
|
||||
account: 作成者
|
||||
application: アプリ
|
||||
|
|
|
@ -54,6 +54,7 @@ SimpleNavigation::Configuration.run do |navigation|
|
|||
s.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) }
|
||||
s.item :follow_recommendations, safe_join([fa_icon('user-plus fw'), t('admin.follow_recommendations.title')]), admin_follow_recommendations_path, highlights_on: %r{/admin/follow_recommendations}, if: -> { current_user.can?(:manage_taxonomies) }
|
||||
s.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_path(limited: limited_federation_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) }
|
||||
s.item :special_instances, safe_join([fa_icon('list fw'), t('admin.special_instances.title')]), admin_special_instances_path, highlights_on: %r{/admin/special_instances}, if: -> { current_user.can?(:manage_federation) }
|
||||
s.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_path, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.can?(:manage_blocks) }
|
||||
s.item :ip_blocks, safe_join([fa_icon('ban fw'), t('admin.ip_blocks.title')]), admin_ip_blocks_path, highlights_on: %r{/admin/ip_blocks}, if: -> { current_user.can?(:manage_blocks) }
|
||||
s.item :action_logs, safe_join([fa_icon('bars fw'), t('admin.action_logs.title')]), admin_action_logs_path, if: -> { current_user.can?(:view_audit_log) }
|
||||
|
|
|
@ -34,6 +34,7 @@ namespace :admin do
|
|||
resources :warning_presets, except: [:new, :show]
|
||||
resource :ng_words, only: [:show, :create]
|
||||
resource :sensitive_words, only: [:show, :create]
|
||||
resource :special_instances, only: [:show, :create]
|
||||
|
||||
resources :announcements, except: [:show] do
|
||||
member do
|
||||
|
|
|
@ -46,6 +46,7 @@ defaults: &defaults
|
|||
unlocked_friend: false
|
||||
stranger_mention_from_local_ng: true
|
||||
enable_local_timeline: true
|
||||
emoji_reaction_disallow_domains: []
|
||||
|
||||
development:
|
||||
<<: *defaults
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue