me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16525 commits 2 branches 0 tags 429 MiB
Commit graph

5 commits

Author SHA1 Message Date
Claire
997553a99e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
 2022-11-14 08:35:55 +01:00
Claire
29cddeffaf Fix saving server registration settings redirecting to branding settings (#20505) 2022-11-13 03:33:31 +01:00
Claire
0b2da756d8 Add “Glitch-only” label to glitch-specific settings 2022-11-12 11:30:35 +01:00
Claire
0060eb5dcf Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
Eugen Rochko
2130895196 Change settings area to be separated into categories in admin UI (#19407) 
And update all descriptions
 2022-10-22 11:44:41 +02:00