Claire fbfc4145fd Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' 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 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream

2023-05-28 15:54:31 +02:00

auth.js

…

common.js

…

embed.js

[Glitch] Run eslint --fix

2023-02-03 20:52:07 +01:00

mailer.js

Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' 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 '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' 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 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream

2023-05-28 15:54:31 +02:00