Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/admin.js`:
  Conflicts due to glitch-soc's theming system.
  Upstream changes have been ported to `app/javascript/core/admin.js`
- `app/models/trends/statuses.rb`:
  Minor conflict due to glitch-soc's option to allow CWed toots in trends.
  Ported upstream changes.

2022-05-01 16:52:27 +02:00

..

actions

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

2022-04-08 19:53:32 +02:00

components

Change "Direct" status visibility to "Only people I mention" in web UI (#18146)

2022-04-29 00:24:31 +02:00

containers

Spelling (#17705)

2022-03-06 22:51:40 +01:00

features

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

2022-05-01 16:52:27 +02:00

locales

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

2022-05-01 16:52:27 +02:00

middleware

…

reducers

Fix potentially missing statuses when reconnecting to websocket (#17981)

2022-04-07 16:08:17 +02:00

selectors

…

service_worker

Add notifications for new sign-ups (#16953)

2022-02-23 16:45:22 +01:00

storage

…

store

…

utils

Add graphs and retention metrics to admin dashboard (#16829)

2021-10-14 20:44:59 +02:00

api.js

Change routing paths to use usernames in web UI (#16171)

2021-09-26 05:46:13 +02:00

base_polyfills.js

…

blurhash.js

…

common.js

…

compare_id.js

…

extra_polyfills.js

…

initial_state.js

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

2021-06-30 00:42:52 +02:00

is_mobile.js

…

load_keyboard_extensions.js

…

load_polyfills.js

…

main.js

…

performance.js

…

ready.js

…

scroll.js

…

settings.js

…

stream.js

…

test_setup.js

…

uuid.js

…