Commit graph

9 commits

Author SHA1 Message Date
Claire 6ee3e382df Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.jsx`:
  Some of the removed dead code was split from this code in
  `app/javascript/core/public.js` and `app/javascript/core/settings.js`.
  Removed this dead code, and removed `app/javascript/core/public.js`
  altogether.
2023-09-02 13:18:16 +02:00
Claire a1f1424e76 Fix interaction modal being broken because of glitch-soc's theming system 2023-07-30 16:45:50 +02:00
Claire ba73f0ea3a [Glitch] Add polling and automatic redirection to /start on email confirmation
Port e60414792d to glitch-soc
2023-05-25 22:37:14 +02:00
Thibaut Girka a68ec50e4e Adapt 2FA changes to glitch-soc's theming system 2020-08-30 17:26:18 +02:00
Thibaut Girka 0fd7a8b63d Include necessary JS in auth pages 2019-06-13 22:38:22 +02:00
Thibaut Girka ec18359c3d Fix CW fold/unfold in remote interaction dialog 2019-02-17 15:40:49 +01:00
kibi! cda845ae0e Fix mailer to use webpack core 2018-01-15 21:17:03 -08:00
kibigo! 541fe9b110 Skins support 2017-11-30 19:29:47 -08:00
kibigo! bdbbd06dad Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00