Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2022-11-06 09:50:41 +01:00
..
importer
push_notifications	Disable push notification when not logged in (#19272)	2022-10-03 18:15:47 +02:00
account_notes.js
accounts.js	Add logged-out access to the web UI (#18961)	2022-09-29 04:39:33 +02:00
alerts.js
announcements.js
app.js
blocks.js
bookmarks.js
boosts.js
bundles.js
columns.js
compose.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
conversations.js
custom_emojis.js
directory.js
domain_blocks.js
dropdown_menu.js
emojis.js
favourites.js
featured_tags.js	Add featured tags selector for WebUI (#19358)	2022-10-16 08:43:59 +02:00
filters.js
height_cache.js
history.js
interactions.js
languages.js
lists.js
markers.js	Add logged-out access to the web UI (#18961)	2022-09-29 04:39:33 +02:00
modal.js
mutes.js
notifications.js
onboarding.js
picture_in_picture.js
pin_statuses.js
polls.js
reports.js
search.js	Fix logged out search and changed logged-in search placeholder (#19514)	2022-10-29 13:32:49 +02:00
server.js	Change about page to be mounted in the web UI (#19345)	2022-10-13 14:42:37 +02:00
settings.js
statuses.js
store.js
streaming.js
suggestions.js
tags.js
timelines.js	Add featured tags selector for WebUI (#19358)	2022-10-16 08:43:59 +02:00
trends.js