Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/account.rb`: Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits. Ported upstream's changes. - `yarn.lock`: Dependencies adjacent to glitch-soc-only dependencies updated. Updated them as well.		2024-10-26 13:38:07 +02:00
..
admin.tsx	Move JS source from packs to entrypoints (#30037)	2024-04-23 16:45:12 +00:00
application.ts	Convert easy entrypoints files to Typescript (#30102)	2024-04-29 08:02:41 +00:00
common.js	[Glitch] Remove font-awesome npm package	2024-08-20 18:49:56 +02:00
embed.tsx	Change embedded posts to use web UI (#31766)	2024-09-12 09:41:19 +00:00
error.ts	Convert easy entrypoints files to Typescript (#30102)	2024-04-29 08:02:41 +00:00
inert.ts	Convert easy entrypoints files to Typescript (#30102)	2024-04-29 08:02:41 +00:00
mailer.ts	Convert easy entrypoints files to Typescript (#30102)	2024-04-29 08:02:41 +00:00
public-path.ts	Convert easy entrypoints files to Typescript (#30102)	2024-04-29 08:02:41 +00:00
public.tsx	Replace execCommand for copying text with the modern clipboard API (#32598)	2024-10-21 07:08:18 +00:00
remote_interaction_helper.ts	Enable stricter Typescript options (#30435)	2024-05-27 09:24:59 +00:00
share.tsx	Convert easy entrypoints files to Typescript (#30102)	2024-04-29 08:02:41 +00:00
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