Commit graph

464 commits

Author SHA1 Message Date
db3dc2ab83 revert 16a2f4fb9e
Some checks are pending
Check i18n / check-i18n (push) Waiting to run
CodeQL / Analyze (push) Waiting to run
Check formatting / lint (push) Waiting to run
JavaScript Linting / lint (push) Waiting to run
Ruby Linting / lint (push) Waiting to run
JavaScript Testing / test (push) Waiting to run
Historical data migration test / test (14-alpine) (push) Waiting to run
Historical data migration test / test (15-alpine) (push) Waiting to run
Historical data migration test / test (16-alpine) (push) Waiting to run
Historical data migration test / test (17-alpine) (push) Waiting to run
Ruby Testing / build (production) (push) Waiting to run
Ruby Testing / build (test) (push) Waiting to run
Ruby Testing / test (.ruby-version) (push) Blocked by required conditions
Ruby Testing / test (3.2) (push) Blocked by required conditions
Ruby Testing / test (3.3) (push) Blocked by required conditions
Ruby Testing / Libvips tests (push) Blocked by required conditions
Ruby Testing / End to End testing (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (push) Blocked by required conditions
Ruby Testing / Back to original and return test (push) Blocked by required conditions
revert Top posts test
2025-06-14 00:31:50 +02:00
Mario
16a2f4fb9e Top posts test
Some checks are pending
Check i18n / check-i18n (push) Waiting to run
CodeQL / Analyze (push) Waiting to run
Check formatting / lint (push) Waiting to run
JavaScript Linting / lint (push) Waiting to run
Ruby Linting / lint (push) Waiting to run
JavaScript Testing / test (push) Waiting to run
Historical data migration test / test (14-alpine) (push) Waiting to run
Historical data migration test / test (15-alpine) (push) Waiting to run
Historical data migration test / test (16-alpine) (push) Waiting to run
Historical data migration test / test (17-alpine) (push) Waiting to run
Ruby Testing / build (production) (push) Waiting to run
Ruby Testing / build (test) (push) Waiting to run
Ruby Testing / test (.ruby-version) (push) Blocked by required conditions
Ruby Testing / End to End testing (push) Blocked by required conditions
Ruby Testing / test (3.2) (push) Blocked by required conditions
Ruby Testing / test (3.3) (push) Blocked by required conditions
Ruby Testing / Libvips tests (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (push) Blocked by required conditions
Ruby Testing / Back to original and return test (push) Blocked by required conditions
2025-06-12 20:00:16 -04:00
KMY
dba5f3b93f Merge remote-tracking branch 'parent/main' into upstream-20250414 2025-04-14 13:23:00 +09:00
Echo
d43bfa95aa
Adds featured tab to web (#34405) 2025-04-10 15:40:30 +00:00
KMY
32f5604499 Merge remote-tracking branch 'parent/main' into upstream-20250403 2025-04-03 08:36:36 +09:00
David Roetzel
97b9994743
Basic FASP support (#34031) 2025-03-28 12:16:40 +00:00
KMY
5979c0ea1d Merge remote-tracking branch 'parent/main' into upstream-20240310 2025-03-10 19:58:05 +09:00
Eugen Rochko
cadda2f957
Add effective date to terms of service (#33993) 2025-03-05 09:01:33 +00:00
KMY
75b56ad5c7 Fix test 2025-01-09 17:52:41 +09:00
KMY
d35fa72842 Merge remote-tracking branch 'parent/main' into upstream-20240109 2025-01-09 13:20:56 +09:00
Matt Jankowski
c0264c8013
Extend custom CSS cache time with digest paths (#33207) 2025-01-08 08:48:45 +00:00
KMY
3784ad273c Merge remote-tracking branch 'parent/main' into upstream-20241216 2024-12-16 10:14:31 +09:00
Eugen Rochko
30aa0df88c
Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
KMY
6b6f145633 Merge remote-tracking branch 'parent/main' into upstream-20241209 2024-12-09 17:49:49 +09:00
Matt Jankowski
58c40caeb4
Extract SPA-handled routes to stand-alone file (#33190) 2024-12-07 07:46:34 +00:00
KMY
946f5bce3e Wip: アンテナ編集画面周辺 2024-11-28 12:51:25 +09:00
KMY(雪あすか)
943db145e4
Add: #883 管理者の設定したカスタムCSSをユーザー単位で無効にするオプション (#902)
* Add: #883 管理者の設定したカスタムCSSをユーザー単位で無効にするオプション

* ラベル変更
2024-11-01 12:09:24 +09:00
KMY
1c1f76697b Merge remote-tracking branch 'parent/main' into upstream-20241101 2024-11-01 08:04:03 +09:00
Emelia Smith
e1b7382ea6
Add userinfo oauth endpoint (#32548) 2024-10-30 14:38:10 +00:00
KMY
66bed31dbe Merge remote-tracking branch 'parent/main' into upstream-20241006 2024-10-05 09:10:58 +09:00
Christian Schmidt
33d3ca7cf1
Support /.well-known/host-meta.json (#32206) 2024-10-02 09:23:44 +00:00
KMY
c905714459 Merge remote-tracking branch 'parent/main' into upstream-20240926 2024-09-26 08:29:41 +09:00
Eugen Rochko
aaab6b7adc
Add reblogs and favourites counts to statuses in ActivityPub (#32007) 2024-09-23 13:14:15 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00
KMY(雪あすか)
665c632d66
Add: #406 ユーザーのカスタムCSS (#825)
* Add: #406 ユーザーのカスタムCSS

* Fix lint

* Fix lint

* カスタムCSSの保存先を変更

* キャッシュを考慮して別URLに変更
2024-08-29 07:55:01 +09:00
KMY
8b09a57a91 Merge remote-tracking branch 'parent/main' into upstream-20240731 2024-07-31 13:00:13 +09:00
Tim Rogers
2ce99c51dd
Fixed Rails route covering %40-encoded profile URL paths to not 404 (#31184) 2024-07-30 08:18:00 +00:00
KMY
a99f174d98 Merge commit '9e04007020' into upstream-20240725 2024-07-25 13:06:26 +09:00
Renaud Chaput
f587ff643f
Grouped Notifications UI (#30440)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-07-18 14:36:09 +00:00
KMY
adee1645a3 Merge remote-tracking branch 'parent/main' into upstream-20240716 2024-07-16 09:01:12 +09:00
Matt Jankowski
6c37529723
Use module: :auth to wrap devise_for routes config (#30990) 2024-07-11 11:13:55 +00:00
Matt Jankowski
f47d761e12
Remove unneeded controller option in routes (#30958) 2024-07-09 07:34:19 +00:00
Matt Jankowski
7a30c68953
Use scope module: ... block for .well-known routes (#30959) 2024-07-09 07:34:15 +00:00
KMY
9a07550fa6 Merge remote-tracking branch 'parent/main' into upstream-20240705 2024-07-05 07:22:34 +09:00
Eugen Rochko
20fa9ce484
Add timeline of public posts about a trending link in web UI (#30840) 2024-07-01 14:45:48 +00:00
KMY
89b71363ae Merge remote-tracking branch 'parent/main' into upstream-20240507 2024-05-07 08:05:04 +09:00
Emelia Smith
116f01ec7d
Implement RFC 8414 for OAuth 2.0 server metadata (#29191) 2024-05-06 13:17:56 +00:00
KMY
44f4a93430 Merge remote-tracking branch 'parent/main' into upstream-20240422 2024-04-22 08:58:37 +09:00
Matt Jankowski
933189887b
Fix Style/StringLiterals cop (#30005) 2024-04-19 20:33:00 +00:00
KMY
6c9b221cb2 Merge remote-tracking branch 'parent/main' into upstream-20240326 2024-03-26 09:08:20 +09:00
Claire
44bf7b8128
Add notifications of severed relationships (#27511) 2024-03-20 15:37:21 +00:00
KMY
76598bd542 Merge remote-tracking branch 'parent/main' into upstream-20240319 2024-03-19 09:15:20 +09:00
Matt Jankowski
049d9171eb
Use with_options for shared option in accounts#show routing block (#28914) 2024-03-14 10:03:38 +00:00
Matt Jankowski
79e7590578
Clean up activitypub module route scope near instance actor (#29579) 2024-03-14 09:18:46 +00:00
Matt Jankowski
65e8349980
Clean up activitypub module route scope near collections/boxes (#29580) 2024-03-14 09:18:41 +00:00
KMY
8e94ed2cec Merge remote-tracking branch 'parent/main' into upstream-20240308 2024-03-12 09:27:01 +09:00
Eugen Rochko
c10bbf5fe3
Add notification policies and notification requests in web UI (#29433) 2024-03-11 15:02:21 +00:00
KMY
9ef5c05ea0 Merge remote-tracking branch 'parent/main' into upstream-20241015 2024-02-15 08:37:59 +09:00
Claire
554e2a019e
Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default (#29199) 2024-02-14 12:12:13 +00:00
KMY
92ef42d697 Merge remote-tracking branch 'parent/main' into upstream-20240201 2024-02-01 11:32:27 +09:00