Commit graph

1924 commits

Author SHA1 Message Date
Matt Jankowski
cde3206478
Simplify feature loop in welcome mailer (#29760) 2024-04-03 20:10:59 +00:00
KMY(雪あすか)
07c6d896e0
Merge pull request #691 from kmycode/upstream-20240403
Upstream 20240403
2024-04-03 18:21:00 +09:00
KMY(雪あすか)
d89e1114bb
Add: #667 プレビューカード、参照のフェッチを行わないドメインの設定 (#690) 2024-04-03 12:37:18 +09:00
KMY
479c4fecc1 Merge remote-tracking branch 'parent/main' into upstream-20240403 2024-04-03 12:12:09 +09:00
KMY(雪あすか)
ff2860d0df
Change: #591 ホワイトリストのドメイン一覧の保存先・画面変更 (#689)
* Change: #591 ホワイトリストのドメイン一覧の保存先・画面変更

* Update account_batch.rb

* 表示まわりを改善

* Update dangerous.rake
2024-04-03 12:09:43 +09:00
Matt Jankowski
f56309f5f0
Add by_latest_used scope, move admin area recent IPs to partial (#29497) 2024-04-02 13:51:34 +00:00
KMY
bef755a577 Merge remote-tracking branch 'parent/main' into upstream-20240401 2024-04-01 08:52:35 +09:00
Renaud Chaput
672c9f5f05
Change the theme-color value automatically when using a built-in theme (#29795) 2024-03-29 13:32:07 +00:00
Matt Jankowski
e85f24174e
Simplify checklist step loop in welcome mailer (#29761) 2024-03-28 10:56:33 +00:00
KMY
ace193fda3 Merge remote-tracking branch 'parent/main' into upstream-20240327 2024-03-27 12:13:55 +09:00
Matt Jankowski
c4feba4347
Use existing MascotHelper#instance_presenter instead of local var in welcome email template (#29759) 2024-03-26 15:58:48 +00:00
Claire
7508472d84
Fix admin interface repeating rule title instead of showing hint text (#29758) 2024-03-26 14:46:05 +00:00
Claire
cfea9cc172
Add list of pending releases directly in mail notifications for version updates (#29436) 2024-03-26 14:45:19 +00:00
KMY(雪あすか)
116a6b50cd
Change: フィールド入力フォームのデザイン改善 (#672)
* Change: フィールド入力フォームのデザイン改善

* 翻訳の置き場所変更
2024-03-26 20:36:34 +09:00
Renaud Chaput
02ea161506
Support "system" theme setting (light/dark theme depending on user system preference) (#29748)
Co-authored-by: Nishiki Liu <hello@nshki.com>
2024-03-26 09:25:49 +00:00
KMY
6c9b221cb2 Merge remote-tracking branch 'parent/main' into upstream-20240326 2024-03-26 09:08:20 +09:00
KMY(雪あすか)
95ab1f729c
Change: #647 NGワードの入力フォーム (#663)
* Change: #647 NGワードの入力フォーム

* Wip: 画面改造

* テストコード、画面

* Fix: 複数の問題
2024-03-26 08:44:16 +09:00
Claire
37ca59815c
Remove setting for unfollow confirmation modal, and make it unconditional (#29373) 2024-03-22 16:24:04 +00:00
Claire
dfa43707eb
Change AccountRelationshipSeveranceEvent model to store lost followers and following counts separately (#29714) 2024-03-22 15:44:31 +00:00
Matt Jankowski
77897cd24c
Use existing SeveredRelationship.about_local_account scope in more places (#29673) 2024-03-21 08:36:49 +00:00
Claire
44bf7b8128
Add notifications of severed relationships (#27511) 2024-03-20 15:37:21 +00:00
Claire
8a1423a474
Allow unblocking email addresses from any matching account (#29305) 2024-03-20 14:38:00 +00:00
Matt Jankowski
0a33be39c1
Reduce LineLength for react_admin_component helpers (#29650) 2024-03-20 13:45:34 +00:00
Matt Jankowski
4c84891453
Pull out full li element into admin/status_edits/status_edit partial (#29499) 2024-03-19 16:11:10 +00:00
Matt Jankowski
d7ab5655ef
Replace render_symbol method with inline_svg_tag usage (#29647) 2024-03-19 14:17:18 +00:00
Claire
cf08a438e7
Add badge on account card in report moderation interface when account is already suspended (#29592) 2024-03-19 08:20:53 +00:00
KMY
76598bd542 Merge remote-tracking branch 'parent/main' into upstream-20240319 2024-03-19 09:15:20 +09:00
KMY(雪あすか)
ed246f0d03
Change: #648 センシティブワードの入力フォーム (#653)
* Change: #648 センシティブワードの入力フォーム

* Wip: 行の追加削除

* Wip: 設定の保存、マイグレーション

* 不要な処理を削除

* マイグレーションコード調整
2024-03-19 08:18:34 +09:00
Claire
82c2af0356
Fix user_mailer.welcome.hashtags_recent_count not having plural form (#29607) 2024-03-16 16:38:20 +00:00
Matt Jankowski
f445d33fd6
Fix haml-lint LineLength cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
KMY
8e94ed2cec Merge remote-tracking branch 'parent/main' into upstream-20240308 2024-03-12 09:27:01 +09:00
Eugen Rochko
5b3a8737d6
Add hints for rules (#29539) 2024-03-11 08:57:07 +00:00
KMY
fa96bf2e87 Merge remote-tracking branch 'parent/main' into upstream-20240308 2024-03-08 08:08:34 +09:00
Eugen Rochko
50b17f7e10
Add notification policies and notification requests (#29366) 2024-03-07 14:53:37 +00:00
KMY(雪あすか)
1edf92b5bb
Add: #626 購読許可を将来的に削除する注意書き (#645) 2024-03-07 12:00:43 +09:00
KMY(雪あすか)
53c2aa797b
Add: #36 アカウント詳細画面の「フォローされています」を隠すオプション (#638)
* Add: #36 アカウント詳細画面の「フォローされています」を隠すオプション

* Fix lint
2024-03-06 12:30:48 +09:00
KMY(雪あすか)
eee13b3f5f
ユーザー設定の複数の項目を反転 (#639) 2024-03-06 12:01:39 +09:00
KMY
42b5727723 Merge remote-tracking branch 'parent/main' into upstream-20240304 2024-03-04 10:37:41 +09:00
Claire
1d721b21e1
Add attribution to Tabler.io icons used in the new mailer designs (#29470) 2024-03-01 14:51:01 +00:00
HTeuMeuLeu
934cab7508
New welcome email (#28883)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-03-01 12:16:53 +00:00
KMY(雪あすか)
76b24193c4
Remove: #608 ドメインブロック「リプライを拒否」 (#624) 2024-03-01 12:03:31 +09:00
KMY
4b5fc77b6e Merge remote-tracking branch 'parent/main' into upstream-20240229 2024-02-29 09:23:59 +09:00
Jeong Arm
deffb8ecb6
Show comments in the admin/instances page (#29240)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-28 12:07:06 +00:00
KMY(雪あすか)
0767212284
Fix: センシティブなキーワードの入力欄のサイズの不整合 (#615)
* Fix: センシティブなキーワードの入力欄のサイズの不整合

* Fix lint
2024-02-27 12:42:05 +09:00
KMY(雪あすか)
04b3f9fc4f
Merge pull request #614 from kmycode/upstream-20240227
Upstream 20240227
2024-02-27 10:15:06 +09:00
KMY(雪あすか)
9dd11117db
Add: #605 リモート投稿に適用するセンシティブワード設定 (#612) 2024-02-27 10:14:42 +09:00
KMY
78446fead4 Merge remote-tracking branch 'parent/main' into upstream-20240227 2024-02-27 08:53:15 +09:00
Jason Punyon
1ad3cffaea
Missed a .to_date (#29390) 2024-02-26 12:42:09 +00:00
KMY(雪あすか)
7d96d5828e
Add: #600 NGルール (#602)
* Wip

* Wip

* Wip: History

* Wip: テストコード作成

* Fix test

* Wip

* Wip

* Wip

* Fix test

* Wip

* Wip

* Wip

* Wip

* なんとか完成、これから動作確認

* spell miss

* Change ng rule timings

* Fix test

* Wip

* Fix test

* Wip

* Fix form

* 表示まわりの改善
2024-02-26 17:45:41 +09:00
KMY
1802e318f9 Merge remote-tracking branch 'parent/main' into upstream-20240226 2024-02-26 12:23:46 +09:00