Commit graph

586 commits

Author SHA1 Message Date
KMY
206021455e Merge remote-tracking branch 'parent/main' into upstream-20240830 2024-08-30 08:17:34 +09:00
Matt Jankowski
b9269c8d38
Convert admin/reset controller spec to system spec (#31643) 2024-08-29 08:38:17 +00:00
KMY
a5bbc3f93b Merge remote-tracking branch 'parent/main' into upstream-20240824 2024-08-24 09:39:11 +09:00
Emelia Smith
376088f6da
Add button to view the Hashtag on the instance from Hashtags in Moderation UI (#31533) 2024-08-22 08:42:33 +00:00
KMY
01adb452f0 Remove all fa_icon 2024-08-21 18:13:33 +09:00
KMY
af0f8f01e1 Merge remote-tracking branch 'parent/main' into upstream-20240821 2024-08-21 12:39:30 +09:00
Matt Jankowski
71405eabfc
Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
KMY
e7ccc0539f Merge remote-tracking branch 'parent/main' into upstream-20240813 2024-08-13 07:01:38 +09:00
Emelia Smith
d3089018d5
Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292) 2024-08-10 09:17:10 +00:00
Christian Schmidt
e29c401f77
Add lang attribute on preview card title (#31303) 2024-08-09 13:05:34 +00:00
Jeong Arm
9bae237792
Change confirmation prompt on trending management (#19626) 2024-08-09 12:47:02 +00:00
Matt Jankowski
84c3cc4e5b
Replace more font-awesome icons in views/admin area (#30961) 2024-08-07 23:08:36 +00:00
KMY(雪あすか)
b787b130a2
Remove: #609 NGワード設定の2項目を削除 (#789)
* Remove: #609 NGワード設定の2項目を削除

* Fix test
2024-08-06 09:17:36 +09:00
KMY
8b09a57a91 Merge remote-tracking branch 'parent/main' into upstream-20240731 2024-07-31 13:00:13 +09:00
Emelia Smith
c40e481169
Implement UI for Admin Search of Hashtags (#30880) 2024-07-29 15:49:44 +00:00
KMY
a99f174d98 Merge commit '9e04007020' into upstream-20240725 2024-07-25 13:06:26 +09:00
Michael Stanclift
8b7f93cc7f
Recolor Preferences/Admin UI to better match main design (#31034) 2024-07-23 15:30:45 +00:00
Emelia Smith
bb2e5a4b58
Add audit logs to Admin::InstancesController (#27386) 2024-07-23 08:12:30 +00:00
Emelia Smith
aa88aca0ad
Add optional OAuth application to reports (#30539) 2024-07-16 13:23:08 +00:00
KMY
6955843321 Merge remote-tracking branch 'parent/main' into upstream-20240628 2024-06-28 08:57:12 +09:00
Emelia Smith
30ae5952d2
Fix: Ensure "With Media" is highlighted from Admin Accounts page (#30812) 2024-06-25 07:46:53 +00:00
KMY
aa2cdc898a Merge remote-tracking branch 'parent/main' into upstream-20240618 2024-06-18 07:43:33 +09:00
Matt Jankowski
b5d1d48266
Convert form_for -> form_with in views (#30700) 2024-06-14 09:54:22 +00:00
Matt Jankowski
8d5ed19c6d
Migrate form_tag to form_with in admin and auth views (#30692) 2024-06-14 09:49:10 +00:00
KMY
c546939a40 Merge remote-tracking branch 'parent/main' into upstream-20240524 2024-05-24 08:33:49 +09:00
Claire
89f89d738f
Revert "Allow unblocking email addresses from any matching account (#29305)" (#30385) 2024-05-21 08:56:08 +00:00
KMY
094ff9d2ee Merge remote-tracking branch 'parent/main' into upstream-20240517 2024-05-17 08:53:59 +09:00
Emelia Smith
5fd56512de
Improve Report Notes and Account Moderation Notes (#30288) 2024-05-15 13:38:36 +00:00
KMY
89b71363ae Merge remote-tracking branch 'parent/main' into upstream-20240507 2024-05-07 08:05:04 +09:00
Fawaz Farid
bc24c4792d
Allow admins to configure instance favicon and logo (#30040) 2024-05-06 15:06:52 +00:00
KMY
80789a603a Merge remote-tracking branch 'parent/main' into upstream-20240503 2024-05-03 11:17:22 +09:00
Matt Jankowski
e336466894
Use shared form partial for admin/rules views (#30067) 2024-04-29 09:33:27 +00:00
Matt Jankowski
a9816f051d
Use shared form partial for admin/warning_presets views (#30069) 2024-04-29 09:33:06 +00:00
Matt Jankowski
2739d8d5a4
Use shorter render call in admin/webhooks view (#30071) 2024-04-29 09:10:23 +00:00
KMY
ec7b51504b Merge remote-tracking branch 'parent/main' into kb_development 2024-04-27 08:42:37 +09:00
Michael Stanclift
bb8c6346fb
Reword and rearrange Content Retention page (#27733) 2024-04-26 15:17:41 +00:00
KMY
32a8f367a3 Merge remote-tracking branch 'parent/main' into upstream-20240424 2024-04-24 08:57:07 +09:00
Matt Jankowski
32ead51e5a
Add material design icons to admin/settings views (#27780)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-23 16:43:49 +00:00
Matt Jankowski
33e829763d
Use shared form partial for admin/domain_blocks views (#29609) 2024-04-22 12:22:16 +00:00
KMY
44f4a93430 Merge remote-tracking branch 'parent/main' into upstream-20240422 2024-04-22 08:58:37 +09:00
Matt Jankowski
4837bfcc6a
Use shared form partial for admin/announcements views (#29608) 2024-04-19 13:57:32 +00:00
KMY(雪あすか)
8c5d3e08af
Fix: #697 英語翻訳の改善 (#709)
* Fix: #697 英語翻訳の改善

* Fix translations
2024-04-12 12:15:53 +09: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
ace193fda3 Merge remote-tracking branch 'parent/main' into upstream-20240327 2024-03-27 12:13:55 +09:00
Claire
7508472d84
Fix admin interface repeating rule title instead of showing hint text (#29758) 2024-03-26 14:46:05 +00:00
KMY
6c9b221cb2 Merge remote-tracking branch 'parent/main' into upstream-20240326 2024-03-26 09:08:20 +09:00