Commit graph

1869 commits

Author SHA1 Message Date
Louis Brauer
f0ca874b09
Include crossorigin in inert css (#30687) 2024-06-13 14:37:43 +00:00
Claire
921b0db544
Add noindex meta tag and rel=canonical link to redirect interstitials (#30651) 2024-06-11 15:29:45 +00:00
KMY(雪あすか)
23f2e17d66
Fix: 「絵文字ピッカーで絵文字デッキと一緒に、絵文字の使用履歴も表示する」設定が実際とは逆になる問題 (#756) 2024-06-10 23:18:46 +09:00
KMY
90f2ea9015 Merge remote-tracking branch 'parent/main' into upstream-20240610 2024-06-10 08:19:27 +09:00
Matt Jankowski
2fdd782f21
Fix empty aria-hidden attribute value in logo resources area (#30570) 2024-06-06 07:50:15 +00:00
KMY
8927b1444b Merge remote-tracking branch 'parent/main' into upstream-20240604 2024-06-04 08:02:05 +09:00
Matt Jankowski
249cbc449c
Use existing config access to local_domain value (#30509) 2024-06-03 09:15:58 +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
f0d6dc4519
Fix: Mark redirect uris field in Development > Application form as required (#30311) 2024-05-16 07:59:46 +00:00
Emelia Smith
5fd56512de
Improve Report Notes and Account Moderation Notes (#30288) 2024-05-15 13:38:36 +00:00
Jason Punyon
85c625d319
Fix repetitive database queries from #30040 (#30259) 2024-05-15 09:38:16 +00:00
KMY
10eec0e102 Merge remote-tracking branch 'parent/main' into upstream-20240510 2024-05-10 06:40:33 +09:00
Claire
d8c4284723
Ensure custom favicon is converted to PNG and ICO (#30208) 2024-05-07 18:15:17 +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
Matt Jankowski
f0c9cbaf3b
Use EXPIRATION_DURATIONS constant in CustomFilter class (#30088) 2024-04-29 09:01:46 +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
Claire
a2399046ca
Fix string interpolation for software updates admin mailer (#30035) 2024-04-23 12:54:52 +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
Matt Jankowski
11e0049b08
Use enum-generated scopes/queries for BulkImport (#29975) 2024-04-18 10:13:35 +00:00
KMY(雪あすか)
f79fb3adae
Add: #483 特定の公開範囲を無効にするオプション (#712)
* Add: #483 特定の公開範囲を無効にするオプション

* Fix test partically

* Complete
2024-04-18 12:40:18 +09:00
KMY
51cf7b3eb4 Merge remote-tracking branch 'parent/main' into upstream-20240417 2024-04-17 12:51:32 +09:00
KMY(雪あすか)
1c054ed3a3
Add: #699 引用・参照対応サーバーをAPIで取得 (#711)
* Add: #699 引用・参照対応サーバーをAPIで取得

* Complete

* ごめん
2024-04-16 12:58:54 +09:00
Renaud Chaput
ee4ea83a87
Remove image_pack_tag usage (#29925) 2024-04-15 09:05:19 +00:00
KMY(雪あすか)
8c5d3e08af
Fix: #697 英語翻訳の改善 (#709)
* Fix: #697 英語翻訳の改善

* Fix translations
2024-04-12 12:15:53 +09:00
KMY
52c5784910 Merge remote-tracking branch 'parent/main' into upstream-20240409 2024-04-09 12:15:51 +09:00
Claire
f3430eebbb
Fix hashtag string interpolation in welcome email (#29879) 2024-04-08 13:45:25 +00:00
KMY
45c5c7b055 Merge remote-tracking branch 'parent/main' into upstream-20240408 2024-04-08 07:44:47 +09:00
Matt Jankowski
b61ae28f8d
Separate methods for theme style and meta color tags (#29802) 2024-04-05 09:52:43 +00:00
KMY(雪あすか)
69ba7a70d5
Add: #56 投稿のブーストボタンをクリックしたらポップアップメニューが出るオプション (#696)
* Add: #56 投稿のブーストボタンをクリックしたらポップアップメニューが出るオプション

* ブースト時に確認ダイアログを表示する設定との兼ね合いでメニュー項目を削除
2024-04-05 12:32:47 +09:00
Matt Jankowski
601834d746
Use partial collection render for welcome mailer features (#29843) 2024-04-04 16:13:10 +00:00
KMY(雪あすか)
a2dbc4a818
Change: #694 参照の名称をひかえめな引用に変更 (#695) 2024-04-04 18:52:49 +09:00
Jeong Arm
4045c069f8
Use public_visibility (#29847) 2024-04-04 07:31:30 +00:00
KMY
dd98f9a9a7 Merge remote-tracking branch 'parent/main' into upstream-20240404 2024-04-04 12:02:18 +09:00
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