mastodon/app/javascript/mastodon
Claire 33d30632fb Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/public_feed.rb`:
  Upstream refactored a bit, glitch-soc had specific code for local-only
  statuses.
  Updated glitch-soc's specific code accordingly.
2021-01-11 11:55:42 +01:00
..
actions Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
components Fix logo button style (#15428) 2020-12-26 23:50:34 +01:00
containers Fix expand video on public page (#15469) 2020-12-30 23:18:11 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
middleware
reducers Change notification permission handling (#15176) 2020-12-15 18:43:54 +01:00
selectors Fix unnecessary re-rendering of various components when typing in web UI (#15286) 2020-12-07 19:36:36 +01:00
service_worker
storage
store
utils Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
api.js
base_polyfills.js
blurhash.js Fix not being able to open audio modal in web UI (#15283) 2020-12-07 04:29:37 +01:00
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
scroll.js
settings.js
stream.js Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
test_setup.js
uuid.js