Claire d5b959a2ca Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some preferences to a new category, while glitch-soc had an
  extra preference there.
  Moved the extra preference like upstream did to the new category.

2025-09-02 19:07:51 +02:00

..

aliases

…

applications

…

deletes

…

exports

…

featured_tags

…

flavours

…

imports

…

login_activities

…

migration/redirects

…

migrations

…

preferences

Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream

2025-09-02 19:07:51 +02:00

privacy

…

profiles

Change avatar and header size limits from 2MB to 8MB when using libvips (#33002)

2024-11-26 21:01:52 +00:00

shared

…

two_factor_authentication

Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream

2025-05-25 14:36:51 +02:00

two_factor_authentication_methods

Change design of edit media modal in web UI (#33516)

2025-01-21 11:34:22 +00:00

verifications

Fix missing button styles on some forms (#33771)

2025-01-29 10:36:24 +00:00