mastodon/app/javascript/mastodon
Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +01:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
components Fix opening wrong profile when clicking on username of boosting user in WebUI (#17060) 2021-11-26 22:04:09 +01:00
containers Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 20:44:59 +02:00
features Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2021-11-06 00:15:38 +01:00
middleware
reducers ignore hashtag suggestions if they vary only in case (#16460) 2021-12-15 23:47:19 +01:00
selectors Fix unnecessary re-rendering of various components when typing in web UI (#15286) 2020-12-07 19:36:36 +01:00
service_worker Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02: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 Fix not being able to open audio modal in web UI (#15283) 2020-12-07 04:29:37 +01:00
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 Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01:00
load_keyboard_extensions.js
load_polyfills.js
main.js
performance.js
ready.js
scroll.js
settings.js
stream.js Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
test_setup.js
uuid.js