You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire c22b032483 Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, but we've deleted it. Keep it deleted. - `app/javascript/mastodon/locales/index.js`: Reworked upstream, but the code was mostly in `app/javascript/locales/index.js` in glitch-soc. Updated that file accordingly. - `app/javascript/packs/public.jsx`: Not a real conflict, but different imports in glitch-soc and upstream. - `app/views/layouts/application.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `app/views/layouts/embedded.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `config/webpack/generateLocalePacks.js`: Deleted upstream, as upstream now directly loads the JSON at runtime. Deleted as well, will switch to runtime loading in an upcoming commit. - `config/webpack/shared.js`: Not a real conflict, but different imports in glitch-soc and upstream. - `config/webpack/translationRunner.js`: Mostly deleted upstream, to be replaced with `formatjs-formatter.js` instead. Moved the glitch-soc logic there and deleted the file.		1 year ago
..
actions	Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream	1 year ago
components	Upgrade react-intl (#24906)	1 year ago
containers	Upgrade react-intl (#24906)	1 year ago
features	Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream	1 year ago
locales	Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream	1 year ago
polyfills	Upgrade react-intl (#24906)	1 year ago
reducers	Rewrite actions/modal and reducers/modal with typescript (#24833)	2 years ago
selectors	Enforce import order with ESLint (#25096)	2 years ago
service_worker	Upgrade react-intl (#24906)	1 year ago
store	Add stricter ESLint rules for Typescript files (#24926)	2 years ago
utils	Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 (#25172)	1 year ago
api.js	Enforce import order with ESLint (#25096)	2 years ago
blurhash.ts	Use Prettier for ESLint formatting TypeScript (#23631)	2 years ago
common.js	Dont use CommonJS (`require`, `module.exports`) anywhere (#24913)	2 years ago
compare_id.ts	Use Prettier for ESLint formatting TypeScript (#23631)	2 years ago
initial_state.js	[Glitch] [Proposal] Make able to write React in Typescript (#2190)	2 years ago
is_mobile.ts	Add stricter ESLint rules for Typescript files (#24926)	2 years ago
load_keyboard_extensions.js	fix: support KaiOS arrow navigation on public pages (#12251)	5 years ago
load_locale.js	Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream	1 year ago
main.jsx	Enforce import order with ESLint (#25096)	2 years ago
performance.js	Dont use CommonJS (`require`, `module.exports`) anywhere (#24913)	2 years ago
permissions.ts	Use Prettier for ESLint formatting TypeScript (#23631)	2 years ago
ready.js	Disable push notification when not logged in (#19272)	2 years ago
scroll.ts	Use Prettier for ESLint formatting TypeScript (#23631)	2 years ago
settings.js	Add dismissable hints to various timelines in web UI (#19315)	2 years ago
stream.js	Add eslint-plugin-jsdoc (#24719)	2 years ago
test_setup.js	Replace to testing-library from enzyme (#14152)	4 years ago
uuid.ts	Add stricter ESLint rules for Typescript files (#24926)	2 years ago