vt-social/app/javascript/mastodon
Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict caused because we have additional code to make sure pinned
  local-only toots don't get rendered on the ActivityPub endpoints.
  Ported upstream changes.
2020-09-07 09:21:38 +02:00
..
actions Merge branch 'master' into glitch-soc/merge-upstream 2020-09-07 09:21:38 +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 fix multiple space (#12655) 2019-12-19 07:39:08 +09:00
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
is_mobile.js
load_keyboard_extensions.js fix: support KaiOS arrow navigation on public pages (#12251) 2019-11-04 13:03:09 +01:00
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