mastodon/app/javascript/mastodon
Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system.
2023-10-17 20:59:18 +02:00
..
actions Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream 2023-10-09 21:12:28 +02:00
api_types Add Typescript types for some API objects (#26602) 2023-09-26 11:25:01 +02:00
components Change `eslint` config to autofix missing comma and indentation in JS files (#26711) 2023-10-09 13:38:29 +02:00
containers Convert `dropdown_menu` state to Typescript (#25585) 2023-09-22 18:18:46 +02:00
features Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream 2023-10-10 19:53:41 +02:00
locales Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream 2023-10-17 20:59:18 +02:00
polyfills Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
reducers Convert `dropdown_menu` state to Typescript (#25585) 2023-09-22 18:18:46 +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 Fix Redux types (#26899) 2023-09-12 12:18:19 +02:00
utils Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
api.ts Convert `actions/account_notes` into Typescript (#26601) 2023-09-11 16:09:22 +02:00
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 '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +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 Fix notification permissions being requested immediately after login (#26472) 2023-09-12 18:27:01 +02:00
performance.js
permissions.ts
ready.js
scroll.ts Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
settings.js Add recent searches in web UI (#26834) 2023-09-07 14:56:19 +02:00
stream.js
test_setup.js Update dependency @testing-library/jest-dom to v6 (#26479) 2023-08-28 12:19:42 +02:00
uuid.ts Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00