mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-16 01:09:55 +00:00

Files

Claire 1fdb48c668 Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream

Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Updated upstream changes.

2025-12-15 20:22:20 +01:00

about

Fix titles being escaped twice (#32889 )

2024-11-14 13:28:00 +00:00

accounts

Fix Accept headers when fetching AP objects to match spec (#30354 )

2025-11-05 13:32:29 +00:00

admin

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

2025-12-04 20:16:21 +01:00

admin_mailer

Change hashtag trends to be stored in the database instead of redis (#32837 )

2024-12-04 11:59:17 +00:00

application

Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream

2025-08-27 18:13:03 +02:00

auth

Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream

2025-11-19 21:34:53 +01:00

custom_css

Remove role color highlighting from custom css (#33493 )

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

disputes/strikes

Include time portion in formatted datetimes when provided (#33191 )

2025-01-08 14:26:08 +00:00

errors

…

filters

Fix unfortunate action button wrapping in admin area (#36247 )

2025-09-24 08:57:18 +00:00

follower_accounts

…

following_accounts

…

home

…

invites

Fix missing button styles on some forms (#33771 )

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

kaminari

…

layouts

Merge commit '65b216353e9bc9ae8517d967f8c2cd8122551fdc' into glitch-soc/merge-upstream

2025-12-05 19:25:40 +01:00

mail_subscriptions

Fix missing button styles on some forms (#33771 )

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

media

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

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

notification_mailer

Fix moderation warning e-mails that include posts (#36462 )

2025-10-14 11:48:51 +00:00

oauth

Fix unfortunate action button wrapping in admin area (#36247 )

2025-09-24 08:57:18 +00:00

privacy

Fix titles being escaped twice (#32889 )

2024-11-14 13:28:00 +00:00

redirects

Change referrer policy to be controlled by header in web UI (#33214 )

2024-12-09 22:42:45 +00:00

relationships

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

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

remote_interaction_helper

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

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

settings

Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream

2025-11-19 21:34:53 +01:00

severed_relationships

Fix layout of severed relationships when purged events are listed (#36593 )

2025-10-27 15:19:38 +00:00

shared

Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream

2025-05-30 17:41:31 +02:00

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

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

statuses

Remove unneeded type check on Status in og_image partial (#36980 )

2025-11-21 14:29:03 +00:00

statuses_cleanup

…