gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-08-22 13:03:36 +09:00
commit f522998541
25 changed files with 599 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/locales/simple_form.en.yml
View file

@ -245,6 +245,7 @@ en:
setting_reject_unlisted_subscription: Reject sending unlisted posts to Misskey, Calckey
setting_send_without_domain_blocks: Send your post to all server with administrator set as rejecting-post-server for protect you [DEPRECATED]
setting_show_application: Disclose application used to send posts
setting_stay_privacy: Not change privacy after post
setting_stop_emoji_reaction_streaming: Disable stamp streamings
setting_system_font_ui: Use system's default font
setting_theme: Site theme

3
config/locales/simple_form.ja.yml
View file

@ -247,13 +247,14 @@ ja:
setting_hide_network: 繋がりを隠す
setting_hide_recent_emojis: 絵文字ピッカーで最近使用した絵文字を隠す（リアクションデッキのみを表示する）
setting_hide_statuses_count: 投稿数を隠す
setting_stay_privacy: 投稿時に公開範囲を保存する
setting_noai: 自分のコンテンツのAI学習利用に対して不快感を表明する
setting_public_post_to_unlisted: サードパーティアプリから投稿するとき、公開投稿をローカル公開に変更する
setting_reduce_motion: アニメーションの動きを減らす
setting_reject_public_unlisted_subscription: Misskey系サーバーに「ローカル公開」投稿を「フォロワーのみ」に変換して配送する
setting_reject_unlisted_subscription: Misskey系サーバーに「未収載」投稿を「フォロワーのみ」に変換して配送する
setting_send_without_domain_blocks: 管理人の設定した配送停止設定を拒否する (非推奨)
setting_show_application: 送信したアプリを開示する
setting_stay_privacy: 投稿時に公開範囲を保存する
setting_stop_emoji_reaction_streaming: スタンプのストリーミングを停止する
setting_system_font_ui: システムのデフォルトフォントを使う
setting_theme: サイトテーマ

2
config/routes/api.rb
View file

@ -211,9 +211,11 @@ namespace :api, format: false do
resource :accounts, only: [:show, :create, :destroy], controller: 'antennas/accounts'
resource :domains, only: [:show, :create, :destroy], controller: 'antennas/domains'
resource :keywords, only: [:show, :create, :destroy], controller: 'antennas/keywords'
resource :tags, only: [:show, :create, :destroy], controller: 'antennas/tags'
resource :exclude_accounts, only: [:show, :create, :destroy], controller: 'antennas/exclude_accounts'
resource :exclude_domains, only: [:create, :destroy], controller: 'antennas/exclude_domains'
resource :exclude_keywords, only: [:create, :destroy], controller: 'antennas/exclude_keywords'
resource :exclude_tags, only: [:create, :destroy], controller: 'antennas/exclude_tags'
end
resources :circles, only: [:index, :create, :show, :update, :destroy] do