Claire f09f5b35f2 Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/account.rb`:
  Upstream refactored this file a bit, moving validation limits to constants.
  We already had a similar change, although with different constant names.
  Updated to match upstream's code.

The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`

2024-05-04 16:12:51 +02:00

..

contrast

Change design of compose form in web UI (#28119)

2024-01-25 15:41:31 +00:00

fonts

Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream

2024-01-15 21:30:00 +01:00

mastodon

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

2024-05-04 16:12:51 +02:00

mastodon-light

Fix language and emoji search field background colors on light theme (#29828)

2024-04-03 14:22:50 +00:00

application.scss

Change icons in web UI (#27385)

2023-10-24 17:45:08 +00:00

contrast.scss

Separate high contrast theme (#7213)

2018-04-21 21:35:55 +02:00

inert.scss

Use the assets pipeline to load inert.css (#28701)

2024-01-12 09:32:45 +00:00

mailer.scss

New welcome email (#28883)

2024-03-01 12:16:53 +00:00

mastodon-light.scss

More polished light theme (#7620)

2018-05-25 18:36:26 +02:00

win95.scss

Update win95 style from cybre.space

2022-04-27 23:05:24 +02:00