Glitch-Shrike/app/javascript/mastodon
Claire 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/admin/dashboard_controller.rb`:
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.
- `app/views/admin/dashboard/index.html.haml`
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.
2021-10-14 21:44:57 +02:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2021-09-28 12:37:54 +02:00
components Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 20:44:59 +02: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-10-14 21:44:57 +02:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2021-06-03 20:47:02 +02:00
middleware
reducers Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
selectors
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
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