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
..
importer	Enforce import order with ESLint (#25096)	2 years ago
push_notifications	Enforce import order with ESLint (#25096)	2 years ago
account_notes.js	Enable eslint:recommended ruleset (#22433)	2 years ago
accounts.js	Enforce import order with ESLint (#25096)	2 years ago
alerts.js	Enable eslint:recommended ruleset (#22433)	2 years ago
announcements.js	Enforce import order with ESLint (#25096)	2 years ago
app.ts	Add stricter ESLint rules for Typescript files (#24926)	2 years ago
blocks.js	Rewrite actions/modal and reducers/modal with typescript (#24833)	2 years ago
bookmarks.js	Enforce import order with ESLint (#25096)	2 years ago
boosts.js	Rewrite actions/modal and reducers/modal with typescript (#24833)	2 years ago
bundles.js	Lazy load components (#3879)	7 years ago
columns.js	Enable eslint:recommended ruleset (#22433)	2 years ago
compose.js	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
conversations.js	Enforce import order with ESLint (#25096)	2 years ago
custom_emojis.js	Enable eslint:recommended ruleset (#22433)	2 years ago
directory.js	Enforce import order with ESLint (#25096)	2 years ago
domain_blocks.js	Enable eslint:recommended ruleset (#22433)	2 years ago
dropdown_menu.js	Fix dropdown menu positions when scrolling (#22916)	2 years ago
emojis.js	Enable eslint:recommended ruleset (#22433)	2 years ago
favourites.js	Enforce import order with ESLint (#25096)	2 years ago
featured_tags.js	Add featured tags selector for WebUI (#19358)	2 years ago
filters.js	Rewrite actions/modal and reducers/modal with typescript (#24833)	2 years ago
height_cache.js	Enable eslint:recommended ruleset (#22433)	2 years ago
history.js	Enforce import order with ESLint (#25096)	2 years ago
interactions.js	Enforce import order with ESLint (#25096)	2 years ago
languages.js	Add language dropdown to compose in web UI (#18420)	3 years ago
lists.js	Enforce import order with ESLint (#25096)	2 years ago
markers.js	Enforce import order with ESLint (#25096)	2 years ago
modal.ts	Rewrite actions/modal and reducers/modal with typescript (#24833)	2 years ago
mutes.js	Rewrite actions/modal and reducers/modal with typescript (#24833)	2 years ago
notifications.js	Upgrade react-intl (#24906)	1 year ago
onboarding.js	Change onboarding by replacing tutorial with follow recommendations in web UI (#16060)	4 years ago
picture_in_picture.js	Add eslint-plugin-jsdoc (#24719)	2 years ago
pin_statuses.js	Enforce import order with ESLint (#25096)	2 years ago
polls.js	Enforce import order with ESLint (#25096)	2 years ago
reports.js	Rewrite actions/modal and reducers/modal with typescript (#24833)	2 years ago
search.js	Enforce import order with ESLint (#25096)	2 years ago
server.js	Enforce import order with ESLint (#25096)	2 years ago
settings.js	Enforce import order with ESLint (#25096)	2 years ago
statuses.js	Enforce import order with ESLint (#25096)	2 years ago
store.js	Enforce import order with ESLint (#25096)	2 years ago
streaming.js	Enforce import order with ESLint (#25096)	2 years ago
suggestions.js	Enforce import order with ESLint (#25096)	2 years ago
tags.js	Separate ESLint CI from Superlinter (#23029)	2 years ago
timelines.js	Enforce import order with ESLint (#25096)	2 years ago
trends.js	Enforce import order with ESLint (#25096)	2 years ago