vt-social/app/javascript/mastodon
Thibaut Girka 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/shared.js`:
  Upstream has changed how Tesseract.js gets included and dropped a dependency.
  The conflict is caused by glitch-soc having different code due to its
  theming system.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream refactor/code style change in a place we replaced upstream's
  repo URL with ours.
  Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
  Upstream dropped dependencies, one of which was textually too close to
  a glitch-soc-specific dependency. Not a real conflict.
2020-09-01 17:02:18 +02:00
..
actions Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
components Fix: also use custom private boost icon for detailed status (#14471) 2020-08-24 14:13:44 +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-09-01 17:02:18 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
middleware Fix 404 and 410 API errors being silently discarded in WebUI (#13279) 2020-03-28 17:59:45 +01:00
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 Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
storage
store Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
utils Replace shortNumberFormat with <ShortNumber> (#14061) 2020-07-06 14:27:32 +02:00
api.js
base_polyfills.js Fix old browsers crashing because of missing `finally` polyfill in web UI (#13115) 2020-02-18 17:22:44 +01:00
common.js Migrate Rails ujs as required for Rails 6 Upgrade. (#13280) 2020-03-21 03:14:50 +01:00
compare_id.js
extra_polyfills.js
initial_state.js
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js Fix old browsers crashing because of missing `finally` polyfill in web UI (#13115) 2020-02-18 17:22:44 +01:00
main.js Fix `/web` redirecting to `/web/web` in web UI (#13128) 2020-02-22 01:27:34 +01:00
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js Better manage subscriptionCounters (#14608) 2020-08-24 14:06:45 +02:00
test_setup.js Replace to testing-library from enzyme (#14152) 2020-06-29 13:58:07 +02:00
uuid.js