Claire f6654e0842 Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: This file was split between `app/javascript/core/admin.js`, `app/javascript/pack/admin.jsx`, and `app/javascript/flavours/glitch/packs/admin.jsx`. Ported upstream's change, splitting the new file to `app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`, and `app/javascript/flavours/glitch/packs/admin.tsx`		2024-02-29 19:02:31 +01:00
..
admin.tsx	Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream	2024-02-29 19:02:31 +01:00
common.js	Fix @rails/ujs imports	2023-10-24 20:23:31 +02:00
error.js
home.js	[Glitch] Fix /share and cleanup and reorganize frontend locale loading	2023-06-10 16:18:01 +02:00
public.jsx	[Glitch] Fix full date display not respecting the locale 12/24h format	2024-02-29 18:29:11 +01:00
settings.js	Fix @rails/ujs imports	2023-10-24 20:23:31 +02:00
share.jsx	[Glitch] Change design of compose form in web UI	2024-02-22 23:06:12 +01:00
sign_up.js	[Glitch] Add client-side timeout on resend confirmation button	2023-08-12 09:38:57 +02:00