masto-fe-standalone/app/javascript/mastodon
Thibaut Girka b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.
2020-07-22 13:38:17 +02:00
..
actions Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
components Fix keyboard navigation in scrollable lists (#14348) 2020-07-18 18:55:36 +02:00
containers Freeze scroll position when a dropdown menu is open in the TL (#14271) 2020-07-09 15:09:19 +02:00
features Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
middleware
reducers Fix block/mute pagination in WebUI (#14275) 2020-07-10 18:04:18 +02:00
selectors Fix audio and video items in account gallery in web UI (#14282) 2020-07-10 22:09:28 +02:00
service_worker
storage
store
utils Replace shortNumberFormat with <ShortNumber> (#14061) 2020-07-06 14:27:32 +02:00
api.js
base_polyfills.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js
test_setup.js Replace to testing-library from enzyme (#14152) 2020-06-29 13:58:07 +02:00
uuid.js