Claire 630b245bb4 Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream ...

Conflicts:
- `app/lib/settings/scoped_settings.rb`:
  Removed upstream, while glitch-soc had a change related to its theming system.
  Removed as well, as it's unused.

2024-01-11 12:59:27 +01:00

..

__mocks__

Change icons in web UI (#27385)

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

core

Fix @rails/ujs imports

2023-10-24 20:23:31 +02:00

flavours

New Crowdin Translations (automated) (#2502)

2024-01-11 12:56:56 +01:00

fonts

Merge branch 'main' into glitch-soc/merge-upstream

2022-10-28 19:23:58 +02:00

hooks

[Proposal] Make able to write React in Typescript (#16210)

2023-04-03 03:31:39 +02:00

icons

png optimization(loss less) (#19630)

2022-11-01 15:06:52 +01:00

images

Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream

2023-06-25 14:27:38 +02:00

mastodon

Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream

2024-01-11 12:59:27 +01:00

packs

Fix @rails/ujs import on public.jsx (#2482)

2023-11-24 17:40:31 +01:00

skins

initial translation of Glitch-specific texts into Czech (#1997)

2022-12-08 10:38:52 +01:00

styles

Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream

2023-12-29 17:40:57 +01:00

svg-icons

Add icons for private and disabled boost in web UI (#27817)

2023-11-13 14:39:45 +00:00

types

Use Immutable Record for accounts in Redux state (#26559)

2023-11-03 15:00:03 +00:00