Commit graph

563 commits

Author SHA1 Message Date
KMY
bfc7b0101d Merge remote-tracking branch 'parent/main' into upstream-20231110 2023-11-10 09:02:03 +09:00
Matt Jankowski
548bb30b2a
Consolidate html page title output logic into helper (#27563) 2023-11-09 13:05:57 +00:00
KMY
fc1b280d59 Merge remote-tracking branch 'parent/main' into upstream-20231109 2023-11-09 12:33:50 +09:00
Matt Jankowski
7d6bcc0615
Remove unmatched rubocop:enable declaration (#27769) 2023-11-08 12:02:09 +00:00
KMY(雪あすか)
76f2f2ed0c
Add: #87 フォロワーのみに購読を許可する設定 (#239)
* Wip: マイグレーション、設定など一式

* Fix test

* Fix test

* Fix: マスター用の設定を他サーバーに送信しないよう修正

* DTL、外部サーバーの情報受け入れのテストを追加

* スペルミスを修正

* Web画面に設定項目追加

* 既存の`master_settings`を上書きしないよう修正
2023-11-08 17:51:36 +09:00
KMY(雪あすか)
cea042e7c9
Merge pull request #254 from kmycode/upstream-20231108
Upstream 20231108
2023-11-08 11:48:47 +09:00
KMY(雪あすか)
411c6ec16e
Add: #207 リスト通知機能をfedibird_capabilitiesに追加 (#253) 2023-11-08 11:12:37 +09:00
KMY
08f86bcb8f Merge commit '389a6cc4c0' into upstream-20231108 2023-11-08 10:41:10 +09:00
Jasmin Johal
27cbdc6f22
Change alt text to empty string for avatars (#21875)
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-11-07 21:46:08 +00:00
KMY(雪あすか)
1d8862712a
Add: #62 ローカルタイムラインを無効にする管理者向け設定 (#179)
* Bump version to 8.0

* Add: 他のサーバーに公開する情報に、制限設定などを追加

* Fix: `quote_of_id`のインデックス

* Fix: #172 他のサーバーからの相乗り絵文字削除が反映されない

* Test: #166 リモートから自分の絵文字を受け取った時、ライセンスが上書きされないことを確認するテスト

* Add: #62 ローカルタイムラインを無効にする管理者設定(内部挙動のみ)

* Add: 画面部分を追加
2023-10-27 08:08:50 +09:00
KMY
5448bcf276 Merge remote-tracking branch 'parent/main' into kb-upstream-20231026 2023-10-26 20:24:34 +09:00
KMY(雪あすか)
551a9e8216
Merge pull request #159 from kmycode/upstream-20231021
Upstream 20231021
2023-10-26 10:07:09 +09:00
KMY
67eced5a98 Add: 他のサーバーに公開する情報に、制限設定などを追加 2023-10-26 08:52:14 +09:00
Claire
379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439) 2023-10-23 15:46:21 +00:00
KMY
b992e673c7 Merge branch 'kb_development' into upstream-20231021 2023-10-22 14:42:08 +09:00
KMY(雪あすか)
5497e2ae5d
Add: カスタム絵文字のエイリアス名を連合 (#135)
* Add: カスタム絵文字のエイリアス名を連合

* Fix test
2023-10-22 09:09:01 +09:00
KMY
f9eaaec4e7 Merge remote-tracking branch 'parent/main' into upstream-20231021 2023-10-21 10:32:06 +09:00
Matt Jankowski
ab0fb81479
Configure brakeman to ignore url safe preview card urls (#25883) 2023-10-20 15:32:16 +02:00
Matt Jankowski
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning (#25880) 2023-10-19 17:25:54 +02:00
KMY(雪あすか)
2e7cdd0516
Fix: #89 NodeInfo向けの機能一覧表を作成して区別 (#103) 2023-10-12 20:06:21 +09:00
KMY
5b21964bda Merge branch 'kb-draft-7.0' into kb_development 2023-10-08 18:59:30 +09:00
KMY
3ccf0d02c6 Merge remote-tracking branch 'parent/main' into kb_development 2023-10-07 09:19:36 +09:00
KMY
1fb0df2ca6 Add: circle_history機能を公開 2023-10-06 19:45:11 +09:00
KMY
016a8490d2 #63 NodeInfoでのfedibird_capabilities公開 2023-10-06 19:00:47 +09:00
KMY
f95a995b81 Capabilitiesの検索許可にローカルを追加 2023-10-06 19:00:19 +09:00
KMY
dd88cef84b #63 NodeInfoでのfedibird_capabilities公開 2023-10-06 18:59:10 +09:00
gunchleoc
68ec1d180a
Fix language sorting in settings (#27158) 2023-10-04 09:23:50 +02:00
KMY
e82444634a Merge remote-tracking branch 'parent/main' into kb_development 2023-10-04 14:17:41 +09:00
Matt Jankowski
e715da6d25
Fix haml-lint Rubocop Rails/* cops (#26042) 2023-10-03 15:00:40 +02:00
KMY
3c649aa74d Merge remote-tracking branch 'parent/main' into kb_development 2023-09-30 19:37:20 +09:00
Matt Jankowski
340f1a68be
Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
Matt Jankowski
99e289f03f
Fix include Rails.application.routes.url_helpers (Rails 7.1 prep) (#27189) 2023-09-28 16:52:11 +02:00
Matt Jankowski
e6b903b21e
Fix haml-lint InstanceVariables rule for invites/_form (#26064) 2023-09-28 15:40:28 +02:00
gunchleoc
ce79caca4e
Only strip country code when language not listed in SUPPORTED_LOCALES (#27099) 2023-09-28 10:13:44 +02:00
KMY
36f3bbb909 Merge remote-tracking branch 'parent/main' into kb_development 2023-09-23 20:14:11 +09:00
Claire
39da3d86f8
Fix ActiveRecord using two connection pools when no replica is defined (#27061) 2023-09-22 16:01:59 +02:00
KMY
a2d4a9295d Allow jsonld array contains null value 2023-09-20 08:17:51 +09:00
KMY
b78ee07af3 Fix note references not working 2023-09-19 23:29:33 +09:00
KMY
d78281fb1d Merge branch 'kb_development' into kb_lts 2023-09-19 18:58:48 +09:00
KMY
818bcc0277 Fix quote is not set in noteserializer 2023-09-19 18:22:18 +09:00
KMY
7a36615f0e Merge remote-tracking branch 'parent/main' into kb_lts 2023-09-18 19:33:00 +09:00
Claire
392c07f2bf
Fix Setting.authorized_fetch not being properly taken into consideration (#26958) 2023-09-18 09:37:29 +02:00
KMY
6fe51e360a Make DTL switchable 2023-09-12 09:04:20 +09:00
KMY
fdf1d6df38 Merge remote-tracking branch 'parent/main' into kb_migration 2023-09-06 10:09:07 +09:00
Claire
ea7de25de0
Fix video player not being displayed in reports interface (#26801) 2023-09-05 20:05:58 +02:00
KMY
93faae7b63 Merge remote-tracking branch 'parent/main' into kb_migration 2023-09-04 21:21:04 +09:00
gunchleoc
ac3f310f4b
Remove kmr from language selection (#26014) 2023-09-04 13:21:43 +02:00
KMY
32cfd20257 Merge remote-tracking branch 'parent/main' into kb_migration 2023-09-03 10:55:46 +09:00
Claire
9e26cd5503
Add authorized_fetch server setting in addition to env var (#25798) 2023-09-01 15:41:10 +02:00
KMY
bde0ddaca6 Add spoiler_text to keyword antenna 2023-08-25 14:29:37 +09:00