This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript
Claire 4ed629cd7e Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
2023-09-02 14:44:47 +02:00
..
core Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream 2023-09-02 13:18:16 +02:00
flavours [Glitch] Fix search popout including full-text search instructions when full-text search is disabled 2023-09-02 13:56:20 +02:00
fonts
hooks [Proposal] Make able to write React in Typescript (#16210) 2023-04-03 03:31:39 +02:00
icons
images Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
mastodon Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream 2023-09-02 13:50:16 +02:00
packs Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream 2023-09-02 13:18:16 +02:00
skins
styles Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream 2023-09-02 14:44:47 +02:00
types Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00