This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript/mastodon
Claire 3e63fcd4f0 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/status.rb`:
  Minor upstream refactor moved hook definitions around,
  and glitch-soc has an extra `before_create`.
  Moved the `before_create` accordingly.
- `app/services/batched_remove_status_service.rb`:
  Minor upstream refactor changed a block in which glitch-soc
  had one extra call to handle direct timelines.
  Adapted changes to keep glitch-soc's extra call.
2023-01-12 10:15:46 +01:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00
components Fix dropdown menu positions when scrolling (#22916) 2023-01-11 21:58:46 +01:00
containers Fix dropdown menu positions when scrolling (#22916) 2023-01-11 21:58:46 +01:00
features Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00
middleware Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
reducers Fix dropdown menu positions when scrolling (#22916) 2023-01-11 21:58:46 +01:00
selectors
service_worker
store Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
utils
api.js
base_polyfills.js
blurhash.js
common.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
compare_id.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
extra_polyfills.js Remove object-fit polyfill for the old Microsoft Edge (#22693) 2023-01-05 13:32:02 +01:00
initial_state.js
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js Remove object-fit polyfill for the old Microsoft Edge (#22693) 2023-01-05 13:32:02 +01:00
main.js
performance.js
permissions.js Add dropdown menu item to open admin interface for remote domains (#21895) 2023-01-05 14:03:46 +01:00
ready.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00