tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-23 02:53:48 -05:00

History

Claire 0cec9077a4 Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream

Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Upstream added a test for a new attribute, next to a line we modified
  in glitch-soc because of a different default value.
  Updated as upstream's did, keeping glitch-soc's default value.

2024-08-21 18:44:21 +02:00

about

Change public accounts pages to mount the web UI (#19319 )

2022-10-20 14:35:29 +02:00

accounts

Avoid unnecessary i-var for account rss page url generation (#28092 )

2023-11-28 08:19:08 +00:00

admin

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

2024-08-20 18:31:50 +02:00

admin_mailer

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

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

application

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

2024-08-20 18:31:50 +02:00

auth

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

2024-08-20 18:31:50 +02:00

custom_css

Spec coverage for custom css endpoint (#28706 )

2024-01-12 09:19:25 +00:00

disputes/strikes

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

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

errors

Use existing config access to local_domain value (#30509 )

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

filters

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

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

follower_accounts

Change public accounts pages to mount the web UI (#19319 )

2022-10-20 14:35:29 +02:00

following_accounts

Change public accounts pages to mount the web UI (#19319 )

2022-10-20 14:35:29 +02:00

home

Change public accounts pages to mount the web UI (#19319 )

2022-10-20 14:35:29 +02:00

invites

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

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

kaminari

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

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

layouts

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

2024-08-20 18:31:50 +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

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

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

notification_mailer

Update follow and follow_request emails (#28755 )

2024-01-17 14:37:04 +00:00

oauth

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

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

privacy

Change public accounts pages to mount the web UI (#19319 )

2022-10-20 14:35:29 +02:00

redirects

Add noindex meta tag and rel=canonical link to redirect interstitials (#30651 )

2024-06-11 15:29:45 +00:00

relationships

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

2024-08-20 18:31:50 +02: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 '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream

2024-08-20 18:31:50 +02:00

severed_relationships

Change AccountRelationshipSeveranceEvent model to store lost followers and following counts separately (#29714 )

2024-03-22 15:44:31 +00:00

shared

Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream

2024-05-01 19:16:48 +02:00

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

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

statuses

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

2024-08-21 18:44:21 +02:00

statuses_cleanup

Disable irrelevant fields unless cleanup is enabled (#26562 )

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