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.ts	Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream	2024-02-29 19:02:31 +01:00
auth.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	2020-10-21 21:28:47 +02:00
common.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	2020-10-21 21:28:47 +02:00
embed.js	[Glitch] Run eslint --fix	2023-02-03 20:52:07 +01:00
inert.js	Remove bypass and use use glitch-soc's theming system for inert.css	2024-01-15 22:16:26 +01:00
mailer.js	Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
remote_interaction_helper.ts	Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream	2023-09-15 20:08:09 +02:00
settings.js	Fix @rails/ujs imports	2023-10-24 20:23:31 +02:00
theme.yml	Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream	2024-02-29 19:02:31 +01:00
two_factor_authentication.js	Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02:00