mastodon/app/javascript/mastodon
Claire 322e907e04 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.
2022-02-09 17:28:33 +01:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +01:00
components Add edit history to web UI (#17390) 2022-02-09 01:17:07 +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 2022-02-09 17:28:33 +01:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2021-11-06 00:15:38 +01:00
middleware
reducers Add edit history to web UI (#17390) 2022-02-09 01:17:07 +01: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