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.

Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		4 years ago
..
importer	FIX: filters ignore media descriptions (#13837)	4 years ago
push_notifications	…
account_notes.js	Change design of account notes in web UI (#14208)	4 years ago
accounts.js	Add duration parameter to muting. (#13831)	4 years ago
alerts.js	Fix 404 and 410 API errors being silently discarded in WebUI (#13279)	5 years ago
announcements.js	Change how unread announcements are handled (#13020)	5 years ago
app.js	Add indicator of unread content to window title when web UI is out of focus (#11560)	5 years ago
blocks.js	Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)	5 years ago
bookmarks.js	Add bookmarks (#7107)	5 years ago
bundles.js	…
columns.js	…
compose.js	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
conversations.js	Change conversations UI (#11896)	5 years ago
custom_emojis.js	…
directory.js	Add profile directory to web UI (#11688)	5 years ago
domain_blocks.js	Change account domain block to clear out notifications and follows (#11393)	5 years ago
dropdown_menu.js	Freeze scroll position when a dropdown menu is open in the TL (#14271)	4 years ago
emojis.js	…
favourites.js	…
filters.js	…
height_cache.js	…
identity_proofs.js	Fix 404 and 410 API errors being silently discarded in WebUI (#13279)	5 years ago
interactions.js	Add bookmarks (#7107)	5 years ago
lists.js	Add configuration option to filter replies in lists (#9205)	4 years ago
markers.js	Fix mark as read in notifications to be saved immediately (#14907)	4 years ago
modal.js	Improve dropdown menu keyboard navigation (#11491)	5 years ago
mutes.js	Add duration parameter to muting. (#13831)	4 years ago
notifications.js	Fix browser notification permission request logic (#13543)	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	Fix poll options not rendering text after vote/refresh (#10189)	6 years ago
reports.js	…
search.js	Add search results pagination to web UI (#11409)	5 years ago
settings.js	…
statuses.js	Remove obsolete IndexedDB operations from web UI (#14730)	4 years ago
store.js	…
streaming.js	Add support for managing multiple stream subscriptions in a single connection (#14524)	4 years ago
suggestions.js	…
timelines.js	Fix timeline markers not working on Chrome (#13887)	5 years ago
trends.js	Add trends UI with admin and user settings (#11502)	5 years ago