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 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		4 years ago
..
importer	…
push_notifications	…
account_notes.js	…
accounts.js	Add duration parameter to muting. (#13831)	4 years ago
alerts.js	…
announcements.js	…
app.js	Fix pop-out player appearing on mobile screens in web UI (#15157)	4 years ago
blocks.js	…
bookmarks.js	…
boosts.js	Add dropdown for boost privacy in boost confirmation modal (#15704)	4 years ago
bundles.js	…
columns.js	…
compose.js	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
conversations.js	…
custom_emojis.js	…
directory.js	…
domain_blocks.js	…
dropdown_menu.js	…
emojis.js	…
favourites.js	…
filters.js	…
height_cache.js	…
identity_proofs.js	…
interactions.js	Add dropdown for boost privacy in boost confirmation modal (#15704)	4 years ago
lists.js	…
markers.js	Fix alert when failing to save timeline markers in web UI (#15285)	4 years ago
modal.js	…
mutes.js	Add duration parameter to muting. (#13831)	4 years ago
notifications.js	Change notification permission handling (#15176)	4 years ago
onboarding.js	Change how missing desktop notifications permission is displayed (#14985)	4 years ago
picture_in_picture.js	Add pop-out player for audio/video in web UI (#14870)	4 years ago
pin_statuses.js	…
polls.js	…
reports.js	…
search.js	…
settings.js	…
statuses.js	Remove obsolete IndexedDB operations from web UI (#14730)	4 years ago
store.js	…
streaming.js	…
suggestions.js	…
timelines.js	…
trends.js	…