KMY
dc7778cb8b
Fix rubocop
2024-05-24 08:38:58 +09:00
KMY
c546939a40
Merge remote-tracking branch 'parent/main' into upstream-20240524
2024-05-24 08:33:49 +09:00
Matt Jankowski
def6b686ff
Fix Rails/WhereRange cop ( #30343 )
2024-05-20 09:37:36 +00:00
KMY
89b71363ae
Merge remote-tracking branch 'parent/main' into upstream-20240507
2024-05-07 08:05:04 +09:00
Claire
2fe1b8d169
Add API to get multiple accounts and statuses ( #27871 )
...
Co-authored-by: noellabo <noel.yoshiba@gmail.com>
2024-05-06 15:19:15 +00:00
Râu Cao
9aa31be8d3
Fix local account search on LDAP login being case-sensitive ( #30113 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-03 09:22:48 +00:00
KMY
80789a603a
Merge remote-tracking branch 'parent/main' into upstream-20240503
2024-05-03 11:17:22 +09:00
Matt Jankowski
88882fbbee
Move Rails/HABTM cop out of todo ( #30118 )
2024-05-02 09:40:05 +00:00
Matt Jankowski
1e7d5d2957
Update devise-two-factor to version 5.0.0 ( #28325 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-02 09:31:41 +00:00
KMY
44f4a93430
Merge remote-tracking branch 'parent/main' into upstream-20240422
2024-04-22 08:58:37 +09:00
KMY（雪あすか）
f79fb3adae
Add: #483 特定の公開範囲を無効にするオプション ( #712 )
...
* Add: #483 特定の公開範囲を無効にするオプション
* Fix test partically
* Complete
2024-04-18 12:40:18 +09:00
Matt Jankowski
6fed108703
Use Rails upsert to generate update_count! query in Counters concern ( #28738 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-17 08:16:51 +00:00
KMY
51cf7b3eb4
Merge remote-tracking branch 'parent/main' into upstream-20240417
2024-04-17 12:51:32 +09:00
Matt Jankowski
caad1e2628
Add scope Status.distributable_visibility ( #29950 )
2024-04-16 13:16:54 +00:00
KMY（雪あすか）
1c054ed3a3
Add: #699 引用・参照対応サーバーをAPIで取得 ( #711 )
...
* Add: #699 引用・参照対応サーバーをAPIで取得
* Complete
* ごめん
2024-04-16 12:58:54 +09:00
KMY
52c5784910
Merge remote-tracking branch 'parent/main' into upstream-20240409
2024-04-09 12:15:51 +09:00
KMY（雪あすか）
44af34f306
Fix : #703 NGワード、センシティブワード「無関係なフォロワーへのメンション」が、自分自身へのメンションにも適用される ( #704 )
2024-04-09 09:02:50 +09:00
Matt Jankowski
285f63c02e
Use composable query in User.active scope ( #29775 )
2024-04-08 13:53:49 +00:00
Claire
babbf6017d
Remove caching in cache_collection ( #29862 )
2024-04-08 13:46:13 +00:00
KMY
45c5c7b055
Merge remote-tracking branch 'parent/main' into upstream-20240408
2024-04-08 07:44:47 +09:00
Matt Jankowski
c0fe8a9f13
Extract shared callback behaviour to CustomFilterCache concern ( #29695 )
2024-04-05 09:17:58 +00:00
KMY（雪あすか）
69ba7a70d5
Add: #56 投稿のブーストボタンをクリックしたらポップアップメニューが出るオプション ( #696 )
...
* Add: #56 投稿のブーストボタンをクリックしたらポップアップメニューが出るオプション
* ブースト時に確認ダイアログを表示する設定との兼ね合いでメニュー項目を削除
2024-04-05 12:32:47 +09:00
KMY
6c9b221cb2
Merge remote-tracking branch 'parent/main' into upstream-20240326
2024-03-26 09:08:20 +09:00
Claire
37ca59815c
Remove setting for unfollow confirmation modal, and make it unconditional ( #29373 )
2024-03-22 16:24:04 +00:00
Claire
d71d26a3c9
Reattribute notification-related records if possible when merging accounts ( #29694 )
2024-03-22 16:21:53 +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
Matt Jankowski
62e266fbd6
Add BrowserDetection model concern ( #29513 )
2024-03-19 15:39:14 +00:00
KMY
76598bd542
Merge remote-tracking branch 'parent/main' into upstream-20240319
2024-03-19 09:15:20 +09:00
Matt Jankowski
838b0bdf2d
Remove unused Account::Interactions#endorsed? method ( #29463 )
2024-03-15 09:00:26 +00:00
Matt Jankowski
0bc17a3d48
Use enum-generated public_visibility scope on Status ( #28156 )
2024-03-14 09:31:57 +00:00
Matt Jankowski
d4ed7e466c
Extract by_domain_length scope in DomainNormalizable concern ( #29517 )
2024-03-12 13:09:11 +00:00
KMY
8e94ed2cec
Merge remote-tracking branch 'parent/main' into upstream-20240308
2024-03-12 09:27:01 +09:00
Jeong Arm
4a6ddbc9c0
Normalize idna domain before account unblock domain ( #29530 )
2024-03-11 09:28:08 +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（雪あすか）
53c2aa797b
Add: #36 アカウント詳細画面の「フォローされています」を隠すオプション ( #638 )
...
* Add: #36 アカウント詳細画面の「フォローされています」を隠すオプション
* Fix lint
2024-03-06 12:30:48 +09:00
KMY（雪あすか）
2ab9ea642a
Add: #595 リモート保留中アカウントからメンションが来た場合にuriを記録し、承認時にフェッチしに行く処理 ( #620 )
...
* Add: #591 リモート保留中アカウントからメンションが来た場合にuriを記録し、承認時にフェッチしに行く処理
* Rename fetch_remove_status_worker.rb to fetch_remote_status_worker.rb
* Wip
* Add lock code
2024-02-29 12:54:47 +09:00
KMY（雪あすか）
aec832e257
Remove: #611 グループシステム関係のカラムを複数削除 ( #618 )
2024-02-27 13:08:30 +09:00
KMY
78446fead4
Merge remote-tracking branch 'parent/main' into upstream-20240227
2024-02-27 08:53:15 +09:00
Matt Jankowski
8429d07454
Add RankedTrend concern for trends classes ( #29388 )
2024-02-26 13:45:39 +00:00
KMY
7684b5de6f
Merge remote-tracking branch 'parent/main' into upstream-20240218
2024-02-20 09:25:49 +09:00
Matt Jankowski
245064bb98
Move "everyone" role and "instance actor" account magic number IDs to constants ( #29260 )
2024-02-19 11:09:43 +00:00
KMY（雪あすか）
dfc9f35d71
Add: #586 保留中のリモートアカウントからのフォローが飛んできた場合に記録する ( #590 )
...
* Add: #586 保留中のリモートアカウントからのフォローが飛んできた場合に記録する
* 本家に戻す処理を修正
* Fix test
* Fix worker link
* Fix test
* リモートアカウント拒否時に既存のリクエストを削除
2024-02-18 10:48:48 +09:00
KMY
9ef5c05ea0
Merge remote-tracking branch 'parent/main' into upstream-20241015
2024-02-15 08:37:59 +09:00
Claire
b31af34c97
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:16:07 +01:00
Emelia Smith
e8b66a0525
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 17:14:49 +00:00
KMY
05e52a09a8
Merge remote-tracking branch 'parent/main' into upstream-20230209
2024-02-09 12:53:59 +09:00
Matt Jankowski
86500e3312
Extract scenic view model common methods to concern ( #28111 )
2024-02-06 09:08:07 +00:00
KMY（雪あすか）
2860765866
Add: Misskeyに相互限定投稿を配送しないオプション ( #499 )
2024-01-24 21:36:31 +09:00
