Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly.		2025-01-10 20:41:36 +01:00
..
admin.tsx	…
application.ts	…
common.js	[Glitch] Remove `font-awesome` npm package	2024-08-20 18:49:56 +02:00
embed.tsx	Fix Chromium showing scrollbar on embedded posts (#33237)	2024-12-10 13:02:17 +00:00
error.ts	…
inert.ts	…
mailer.ts	…
public-path.ts	…
public.tsx	Include time portion in formatted datetimes when provided (#33191)	2025-01-08 14:26:08 +00:00
remote_interaction_helper.ts	Enable stricter Typescript options (#30435)	2024-05-27 09:24:59 +00:00
share.tsx	…
sign_up.ts	Convert `entrypoints/sign_up` to Typescript (#30106)	2024-04-29 08:23:05 +00:00
two_factor_authentication.ts	Convert `entrypoints/two_factor_authentication` to Typescript (#30105)	2024-05-02 12:02:13 +00:00