Mastodon

History

Claire 6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream

Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.

2024-11-24 16:46:28 +01: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 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream

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

admin_mailer

Fix string interpolation for software updates admin mailer (#30035 )

2024-04-23 12:54:52 +00:00

application

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

2024-11-03 20:51:58 +01:00

auth

Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream

2024-09-29 11:06:09 +02:00

custom_css

…

disputes/strikes

Fix recently-broken admin interface buttons (#32240 )

2024-10-03 16:12:15 +00:00

errors

Use existing config access to local_domain value (#30509 )

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

filters

Remove remnants of embed views (#32419 )

2024-11-16 20:48:10 +00:00

follower_accounts

…

following_accounts

…

home

…

invites

Add copyable_input helper method to wrap shared options (#32119 )

2024-10-02 14:45:54 +00:00

kaminari

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

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

layouts

Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream

2024-09-12 20:05:08 +02:00

mail_subscriptions

Migrate form_tag to form_with in admin and auth views (#30692 )

2024-06-14 09:49:10 +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

Add copyable_input helper method to wrap shared options (#32119 )

2024-10-02 14:45:54 +00:00

privacy

Fix titles being escaped twice (#32889 )

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

redirects

Move redirect/base body class to view (#31796 )

2024-09-12 13:31:50 +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 '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream

2024-11-15 18:44:32 +01: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

Fix titles being escaped twice (#32889 )

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

statuses_cleanup

Disable irrelevant fields unless cleanup is enabled (#26562 )

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