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 a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.		4 years ago
..
importer	FIX: filters ignore media descriptions (#13837)	5 years ago
push_notifications	…
account_notes.js	Change design of account notes in web UI (#14208)	4 years ago
accounts.js	Add option to be notified when a followed user posts (#13546)	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	…
blocks.js	…
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	…
custom_emojis.js	…
directory.js	…
domain_blocks.js	…
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	Add unread notification markers (#14818)	4 years ago
modal.js	…
mutes.js	…
notifications.js	Add unread notification markers (#14818)	4 years ago
onboarding.js	…
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	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	…