mastodon/app/javascript/mastodon
Claire 040b7d37a4 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict due to glitch-soc having extra code for a proper direct visibility
  timeline, in a part of the code upstream refactored.
  Restored glitch-soc's extra code in the refactored bit.
2022-05-16 09:42:32 +02:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00
components Add `limited` attribute to accounts in REST API and a warning in web UI (#18344) 2022-05-10 09:44:35 +02:00
containers Spelling (#17705) 2022-03-06 22:51:40 +01:00
features Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00
middleware
reducers Add `limited` attribute to accounts in REST API and a warning in web UI (#18344) 2022-05-10 09:44:35 +02:00
selectors Add `limited` attribute to accounts in REST API and a warning in web UI (#18344) 2022-05-10 09:44:35 +02:00
service_worker Add notifications for new sign-ups (#16953) 2022-02-23 16:45:22 +01:00
storage
store
utils
api.js
base_polyfills.js
blurhash.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
scroll.js
settings.js
stream.js
test_setup.js
uuid.js