Commit Graph

5 Commits (b15bf23f9d00ab09c959699b534019bce24d5d28)

Author SHA1 Message Date
Claire 179f1d3a78 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +01:00
Eugen Rochko 7bf5924339 Add batch suspend for accounts in admin UI () 2021-12-05 21:48:39 +01:00
Eugen Rochko 79f71206de Add subresource integrity for JS and CSS assets ()
Fix 
2020-11-06 11:56:31 +01:00
Thibaut Girka a56cf3be14 Fix IP blocks in admin panel
It was broken due to discrepancies between upstream and glitch-soc's
theming system.
2020-10-28 23:55:41 +01:00
Eugen Rochko da4c730c47 Add IP-based rules () 2020-10-12 16:33:49 +02:00