Mastodon

History

Claire d5b959a2ca Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some preferences to a new category, while glitch-soc had an
  extra preference there.
  Moved the extra preference like upstream did to the new category.

2025-09-02 19:07:51 +02:00

account_actions

Fix inability to locally suspend remotely-suspended accounts in moderation interface (#31899 )

2024-09-13 09:11:10 +00:00

account_warnings

…

accounts

Prefer delegated nil-wrapping methods to safe navigation (#35541 )

2025-07-28 08:03:23 +00:00

action_logs

Move admin action log type list generation to helper (#32178 )

2024-10-02 14:47:00 +00:00

announcements

Add paragraph to tell admins that email announcements cannot be opted out (#34411 )

2025-04-11 09:52:23 +00:00

change_emails

…

custom_emojis

Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream

2025-01-23 13:38:23 +01:00

dashboard

Fix: prevent linking to pages which require extra permissions (#32843 )

2024-11-12 08:55:17 +00:00

disputes/appeals

Use async_count in more view locations (#32086 )

2024-10-04 12:29:43 +00:00

domain_allows

…

domain_blocks

Use default action of persisted records on edit forms (#35904 )

2025-08-25 17:26:25 +00:00

email_domain_blocks

Add DomainResource class to wrap MX lookup/normalize (#32864 )

2024-11-14 13:47:29 +00:00

export_domain_allows

…

export_domain_blocks

Convert form_for -> form_with in views (#30700 )

2024-06-14 09:54:22 +00:00

fasp

Basic FASP support (#34031 )

2025-03-28 12:16:40 +00:00

follow_recommendations

Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292 )

2024-08-10 09:17:10 +00:00

instances

Add minute resolution to DeliveryFailureTracker (#35625 )

2025-08-01 13:29:22 +00:00

invites

Fix missing button styles on some forms (#33771 )

2025-01-29 10:36:24 +00:00

ip_blocks

Convert form_for -> form_with in views (#30700 )

2024-06-14 09:54:22 +00:00

relationships

Convert form_for -> form_with in views (#30700 )

2024-06-14 09:54:22 +00:00

relays

Change design of edit media modal in web UI (#33516 )

2025-01-21 11:34:22 +00:00

report_notes

Implement Instance Moderation Notes (#31529 )

2025-06-25 08:15:44 +00:00

reports

Move 'add more' inside table toolbar on reports (#35963 )

2025-09-02 07:54:58 +00:00

roles

Remove role color highlighting from custom css (#33493 )

2025-01-07 16:28:35 +00:00

rules

Change rule translation interface to display english name and populate empty translations (#35170 )

2025-06-25 10:02:19 +00:00

settings

Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream

2025-05-25 14:51:59 +02:00

shared

Support displaying polls in Admin UI (#35933 )

2025-09-01 14:59:03 +00:00

software_updates

…

status_edits

Refactor to reuse the one status partial across moderation tools (#35644 )

2025-08-21 14:51:11 +00:00

statuses

Refactor to reuse the one status partial across moderation tools (#35644 )

2025-08-21 14:51:11 +00:00