Glitch-Shrike/app/javascript/mastodon
Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict caused by us having a distinc Direct timeline.
  Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict between glitch-soc's variable character limit and upstream
  refactoring that part of the code.
  Ported upstream changes.
2020-12-05 17:33:37 +01:00
..
actions Merge branch 'master' into glitch-soc/merge-upstream 2020-11-25 15:31:45 +01:00
components Change media modals look in web UI (#15217) 2020-11-27 03:24:11 +01:00
containers Fix media modal regression on public pages (#15221) 2020-11-27 15:41:58 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2020-12-05 17:33:37 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-12-05 17:33:37 +01:00
middleware
reducers Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01: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 Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
api.js
base_polyfills.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
is_mobile.js Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01:00
load_keyboard_extensions.js
load_polyfills.js
main.js Fix browser notification permission request logic (#13543) 2020-10-13 00:37:21 +02:00
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
test_setup.js Replace to testing-library from enzyme (#14152) 2020-06-29 13:58:07 +02:00
uuid.js