Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly.		2025-01-10 20:41:36 +01:00
..
importer	Convert polls to Typescript / Immutable Records (#29789)	2024-12-10 22:54:07 +00:00
push_notifications	…
account_notes.ts	Fix spurious loading bar middleware usage (#31592)	2024-08-26 16:38:34 +00:00
accounts.js	Fix too many requests caused by relationship look-ups in web UI (#32042)	2024-09-24 17:02:36 +00:00
accounts_typed.ts	…
alerts.ts	Add ability to search for all accounts when creating a list in web UI (#33036)	2024-12-03 09:42:52 +00:00
announcements.js	…
app.ts	…
blocks.js	…
bookmarks.js	…
bundles.js	…
columns.js	…
compose.js	Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream	2024-07-23 19:31:23 +02:00
conversations.js	…
custom_emojis.js	…
directory.ts	Convert `<Directory>` to Typescript / function component (#30829)	2024-06-26 18:04:50 +00:00
domain_blocks.js	…
domain_blocks_typed.ts	…
dropdown_menu.ts	…
emojis.js	…
favourites.js	…
featured_tags.js	…
filters.js	…
height_cache.js	…
history.js	…
interactions.js	Fix boost dialog visibility selection not being taken into account (#31523)	2024-08-21 13:11:36 +00:00
interactions_typed.ts	…
lists.js	Change design of lists in web UI (#32881)	2024-11-21 16:10:04 +00:00
lists_typed.ts	Change design of lists in web UI (#32881)	2024-11-21 16:10:04 +00:00
markers.ts	Fix incorrect `'navigator'` check (#32219)	2024-10-02 10:03:04 +00:00
modal.ts	…
mutes.js	…
notification_groups.ts	Fix processing of incoming notifications for unfilterable types (#33429)	2025-01-02 13:22:25 +00:00
notification_policies.ts	Fix multiple bugs in notification requests and notification policies (#32062)	2024-09-24 15:03:38 +00:00
notification_requests.ts	Fix multiple bugs in notification requests and notification policies (#32062)	2024-09-24 15:03:38 +00:00
notifications.js	Further remove old notifications code (#33465)	2025-01-06 18:22:07 +00:00
notifications_typed.ts	Remove old notifications actions and reducers (#31843)	2025-01-03 16:12:08 +00:00
onboarding.js	…
picture_in_picture.ts	…
pin_statuses.js	…
polls.ts	Convert polls to Typescript / Immutable Records (#29789)	2024-12-10 22:54:07 +00:00
reports.js	…
search.ts	Fix WebUI erroneously stopping to offer expanding search results after second page (#33428)	2025-01-02 10:58:00 +00:00
server.js	…
settings.js	…
statuses.js	Change embedded posts to use web UI (#31766)	2024-09-12 09:41:19 +00:00
store.js	Fix use of deprecated `Iterable.isIndexed` from immutable (#33510)	2025-01-08 16:25:41 +00:00
streaming.js	Remove old notifications actions and reducers (#31843)	2025-01-03 16:12:08 +00:00
suggestions.ts	Change onboarding flow in web UI (#32998)	2024-11-26 16:10:12 +00:00
tags.js	Refactor `<HashtagHeader>` to TypeScript (#33096)	2024-12-06 08:42:24 +00:00
tags_typed.ts	Refactor `<HashtagHeader>` to TypeScript (#33096)	2024-12-06 08:42:24 +00:00
timelines.js	Refactor some actions to be proper async actions instead of passing a continuation (#31453)	2024-08-19 14:41:32 +00:00
timelines_typed.ts	Convert `disconnectTimeline` and `timelineDelete` actions to Typescript (#30777)	2024-06-20 11:56:52 +00:00
trends.js	Change `author_account` to be `authors` in REST API (#30846)	2024-06-27 13:17:18 +00:00