mastodon/app/javascript/mastodon
Claire 93c714417f Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`.
2023-06-10 14:38:04 +02:00
..
actions Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream 2023-06-10 14:38:04 +02:00
components Translate CW, poll options and media descriptions (#24175) 2023-06-01 00:10:21 +02:00
containers Translate CW, poll options and media descriptions (#24175) 2023-06-01 00:10:21 +02:00
features Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream 2023-06-10 14:38:04 +02:00
locales Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream 2023-06-10 12:38:33 +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
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
common.js
compare_id.ts
initial_state.js
is_mobile.ts
load_keyboard_extensions.js
load_locale.js Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream 2023-06-10 12:38:33 +02:00
main.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
performance.js
permissions.ts
ready.js
scroll.ts
settings.js
stream.js
test_setup.js
uuid.ts Add stricter ESLint rules for Typescript files (#24926) 2023-05-10 12:59:29 +02:00