Glitch-Shrike/app/javascript/mastodon
Claire bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
..
actions Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
components Remove 16:9 cropping from web UI (#26132) 2023-07-24 13:46:55 +02:00
containers Replace 'favourite' by 'favorite' for American English (#26009) 2023-07-21 19:09:13 +02:00
features Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
locales Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
polyfills Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
reducers Wrong count in response when removing favourite/reblog (#24365) 2023-07-19 09:02:30 +02:00
selectors Add toast with option to open post after publishing in web UI (#25564) 2023-07-08 20:01:08 +02:00
service_worker
store Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
utils Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
api.js
blurhash.ts Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
common.js
compare_id.ts
initial_state.js Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
is_mobile.ts Change links in multi-column mode so tabs are open in single-column mode (#25893) 2023-07-13 17:18:09 +02:00
load_keyboard_extensions.js
main.jsx
performance.js
permissions.ts
ready.js
scroll.ts Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
settings.js
stream.js
test_setup.js
uuid.ts Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00