mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00

Files

Claire 5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream

Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.

2025-05-14 13:38:23 +02:00

about

Fix titles being escaped twice (#32889 )

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

accounts

Fix titles being escaped twice (#32889 )

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

admin

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

2025-05-14 13:38:23 +02: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 '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream

2025-01-10 20:41:36 +01:00

auth

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

2025-05-14 13:38:23 +02: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

Use existing config access to local_domain value (#30509 )

2024-06-03 09:15:58 +00:00

filters

Add new filter action to blur media (#34256 )

2025-03-26 07:31:05 +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

Migrate fontawesome->material in more views (#31360 )

2024-08-20 11:52:45 +00:00

layouts

Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream

2025-01-10 20:41:36 +01:00

mail_subscriptions

Fix missing button styles on some forms (#33771 )

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

media

Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream

2024-09-06 19:25:31 +02:00

notification_mailer

Mailer header partial access cleanup (#32585 )

2024-10-28 13:41:56 +00:00

oauth

Fix missing button styles on some forms (#33771 )

2025-01-29 10:36:24 +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 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream

2024-11-24 16:46:28 +01:00

remote_interaction_helper

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

settings

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

2025-05-14 13:38:23 +02:00

severed_relationships

Wrap datetime in time element with attrs (#32177 )

2024-10-01 12:45:58 +00:00

shared

Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream

2024-11-15 18:44:32 +01:00

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

statuses

Expose status language via og:locale (#34012 )

2025-02-28 10:53:39 +00:00

statuses_cleanup

Disable irrelevant fields unless cleanup is enabled (#26562 )

2024-08-04 08:57:46 +00:00