Claire 1f30778ec6 Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there.		2023-08-24 21:01:19 +02:00
..
admin.js	Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02: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
mailer.js	Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
public.js	[Glitch] Dont use CommonJS (require, module.exports) anywhere	2023-05-09 22:28:53 +02:00
remote_interaction_helper.ts	Fix interaction modal being broken because of glitch-soc's theming system	2023-07-30 16:45:50 +02:00
settings.js	Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' into glitch-soc/merge-upstream	2023-08-24 21:01:19 +02:00
theme.yml	Fix interaction modal being broken because of glitch-soc's theming system	2023-07-30 16:45:50 +02:00
two_factor_authentication.js	Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02:00