Claire 353e5f797c Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream ...

Conflicts:
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.

2025-01-28 18:29:46 +01:00

..

__mocks__

…

entrypoints

Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream

2025-01-10 20:41:36 +01:00

flavours

[Glitch] Add hover cards to follow suggestions

2025-01-27 18:21:56 +01:00

fonts

…

hooks

Change search to use query params in web UI (#32949)

2024-12-12 17:12:33 +00:00

icons

…

images

Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream

2025-01-21 19:23:25 +01:00

mastodon

Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream

2025-01-28 18:29:46 +01:00

material-icons

Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream

2025-01-27 18:19:09 +01:00

skins

…

styles

Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream

2025-01-27 18:19:09 +01:00

svg-icons

Change design of lists in web UI (#32881)

2024-11-21 16:10:04 +00:00

types

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

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