Commit graph

793 commits

Author SHA1 Message Date
Mario
03818781b6 EN translation edit
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
JavaScript Testing / test (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
2025-06-14 19:03:23 -04:00
KMY
dba5f3b93f Merge remote-tracking branch 'parent/main' into upstream-20250414 2025-04-14 13:23:00 +09:00
Claire
00cd218741
Add paragraph to tell admins that email announcements cannot be opted out (#34411) 2025-04-11 09:52:23 +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
Claire
5a100bf38f
Add ability to email announcements to all users (#33928) 2025-03-06 14:05:27 +00:00
Eugen Rochko
cadda2f957
Add effective date to terms of service (#33993) 2025-03-05 09:01:33 +00:00
KMY
3e065f4e12 Merge remote-tracking branch 'parent/main' into upstream-20240128 2025-01-28 18:02:01 +09:00
Claire
4b4de02fee
Remove broken link to Terms of Service when none are defined (#33699) 2025-01-23 14:34:30 +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
Eugen Rochko
796dd57e1b
Change ability to navigate of unconfirmed users (#33209) 2024-12-09 08:31:56 +00:00
KMY
3c3ee557d0 Merge remote-tracking branch 'parent/main' into upstream-20241206 2024-12-06 12:17:45 +09:00
Matt Jankowski
6fddf1610c
Fix awkwardly-worded nature of scheduled too soon error (#33156) 2024-12-04 07:43:29 +00:00
KMY
f1e701febf Fix lint 2024-11-28 13:09:22 +09:00
KMY(雪あすか)
d135cb4eb2
Update en.yml 2024-11-19 17:37:17 +09:00
KMY
055045981f Merge remote-tracking branch 'parent/main' into upstream-20241119 2024-11-19 08:49:55 +09:00
Emelia Smith
ddfb3d123b
Improve display of statuses in admin panel (#30813) 2024-11-15 09:38:01 +00:00
KMY
910eafda63 Merge remote-tracking branch 'parent/main' into upstream-20241113 2024-11-13 08:17:38 +09:00
Emelia Smith
a34edc211f
Add audit logging to Relays (#32819) 2024-11-12 08:35:08 +00:00
KMY
ab58aed910 Merge remote-tracking branch 'parent/main' into upstream-20241021 2024-10-21 07:07:48 +09:00
Claire
8b56509625
Add more explicit explanations about author attribution and fediverse:creator (#32383) 2024-10-17 09:03:08 +00:00
KMY
d021659cb7 Merge remote-tracking branch 'parent/main' into upstream-20241009 2024-10-09 12:32:11 +09:00
Leni Kadali
4238da6ee3
Add error message when user tries to follow their own account (#31910) 2024-10-07 12:05:46 +00:00
KMY
66bed31dbe Merge remote-tracking branch 'parent/main' into upstream-20241006 2024-10-05 09:10:58 +09:00
gunchleoc
160917e718
Pluralize csv imports (#27094)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-10-04 08:19:01 +00:00
KMY
133a263f79 Merge remote-tracking branch 'parent/main' into upstream-20241001 2024-10-01 08:13:23 +09:00
Claire
513f187daf
Add “A Mastodon update is available.” message on admin dashboard for non-bugfix updates (#32106) 2024-09-26 19:27:57 +00:00
KMY
c905714459 Merge remote-tracking branch 'parent/main' into upstream-20240926 2024-09-26 08:29:41 +09:00
Christian Schmidt
db332553c9
Rename "Data export" menu item (#32099) 2024-09-25 19:54:28 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00
KMY
fc9d27ff91 Merge remote-tracking branch 'parent/main' into upstream-20240913 2024-09-13 10:31:48 +09:00
Eugen Rochko
3d46f47817
Change embedded posts to use web UI (#31766)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews (#31819) 2024-09-10 12:00:40 +00:00
Claire
592a7af27f
Fix translatable source string using “silenced” instead of “limited” (#31822) 2024-09-09 19:57:52 +00:00
KMY
218cb37fe3 Merge remote-tracking branch 'parent/main' into upstream-20240906 2024-09-09 08:47:15 +09:00
Claire
b716248fc5
Add link to /admin/roles in moderation interface when changing someone's role (#31791) 2024-09-06 17:21:49 +00:00
Emelia Smith
fd7fc7bdc3
Disable actions on reports that have already been taken (#31773) 2024-09-06 12:50:30 +00:00
KMY
f18eabfe75 Merge remote-tracking branch 'parent/main' into upstream-20240906 2024-09-06 08:42:24 +09:00
Christian Schmidt
491033c86c
Reject status creation with invalid media_ids parameter (#31681) 2024-09-02 15:30:48 +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
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
e7ccc0539f Merge remote-tracking branch 'parent/main' into upstream-20240813 2024-08-13 07:01:38 +09:00
Robin
c39a8e1061
Change “e-mail” to “email” in en.yml (#31317) 2024-08-10 09:32:57 +00:00
Emelia Smith
d3089018d5
Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292) 2024-08-10 09:17:10 +00:00
Jeong Arm
9bae237792
Change confirmation prompt on trending management (#19626) 2024-08-09 12:47:02 +00:00
KMY(雪あすか)
b787b130a2
Remove: #609 NGワード設定の2項目を削除 (#789)
* Remove: #609 NGワード設定の2項目を削除

* Fix test
2024-08-06 09:17:36 +09:00
KMY(雪あすか)
9e1c63aa2c
Merge pull request #786 from kmycode/upstream-20240731
Upstream 20240731
2024-08-01 07:24:31 +09:00