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	…
push_notifications	…
account_notes.js	…
accounts.js	Add duration parameter to muting. (#13831)	4 years ago
alerts.js	…
announcements.js	…
app.js	…
blocks.js	…
bookmarks.js	…
bundles.js	…
columns.js	…
compose.js	…
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	…
lists.js	…
markers.js	Fix mark as read in notifications to be saved immediately (#14907)	4 years ago
modal.js	…
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	…
pin_statuses.js	…
polls.js	…
reports.js	…
search.js	…
settings.js	…
statuses.js	…
store.js	…
streaming.js	…
suggestions.js	…
timelines.js	…
trends.js	…