Claire 734e186717 Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/load_locale.js`: The file moved to `app/javascript/mastodon/locales/load_locale.ts`. Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`. - `app/javascript/mastodon/locales/index.js`: The file moved to `app/javascript/mastodon/locales/index.ts`. Did *not* port the changes as I want to try something a bit different.		2023-06-10 15:32:29 +02:00
..
actions	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream	2023-06-10 15:32:29 +02:00
components	Fix overflow behavior of account rows (#25131)	2023-06-01 14:47:55 +02:00
containers	Fix /share and cleanup and reorganize frontend locale loading (#25240)	2023-06-02 15:00:27 +02:00
features	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream	2023-06-10 14:38:04 +02:00
locales	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream	2023-06-10 15:32:29 +02:00
polyfills	Upgrade react-intl (#24906)	2023-05-31 23:43:39 +02:00
reducers	Translate CW, poll options and media descriptions (#24175)	2023-06-01 00:10:21 +02:00
selectors	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
service_worker	Upgrade react-intl (#24906)	2023-05-31 23:43:39 +02:00
store	Add stricter ESLint rules for Typescript files (#24926)	2023-05-10 12:59:29 +02:00
utils	Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 (#25172)	2023-05-31 09:27:21 +02:00
api.js	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
blurhash.ts	Use Prettier for ESLint formatting TypeScript (#23631)	2023-05-09 19:02:12 +02:00
common.js	Dont use CommonJS (require, module.exports) anywhere (#24913)	2023-05-09 03:08:47 +02:00
compare_id.ts	Use Prettier for ESLint formatting TypeScript (#23631)	2023-05-09 19:02:12 +02:00
initial_state.js	[Glitch] [Proposal] Make able to write React in Typescript (#2190)	2023-04-26 21:30:41 +02:00
is_mobile.ts	Add stricter ESLint rules for Typescript files (#24926)	2023-05-10 12:59:29 +02:00
load_keyboard_extensions.js	fix: support KaiOS arrow navigation on public pages (#12251)	2019-11-04 13:03:09 +01:00
main.jsx	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
performance.js	Dont use CommonJS (require, module.exports) anywhere (#24913)	2023-05-09 03:08:47 +02:00
permissions.ts	Use Prettier for ESLint formatting TypeScript (#23631)	2023-05-09 19:02:12 +02:00
ready.js	Disable push notification when not logged in (#19272)	2022-10-03 18:15:47 +02:00
scroll.ts	Use Prettier for ESLint formatting TypeScript (#23631)	2023-05-09 19:02:12 +02:00
settings.js	Add dismissable hints to various timelines in web UI (#19315)	2022-10-09 06:08:37 +02:00
stream.js	Add eslint-plugin-jsdoc (#24719)	2023-04-30 02:29:54 +02:00
test_setup.js	Replace to testing-library from enzyme (#14152)	2020-06-29 13:58:07 +02:00
uuid.ts	Add stricter ESLint rules for Typescript files (#24926)	2023-05-10 12:59:29 +02:00