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
..
account	Add option to be notified when a followed user posts (#13546)	4 years ago
account_gallery	Change web UI to show empty profile for suspended accounts (#14766)	4 years ago
account_timeline	Add option to be notified when a followed user posts (#13546)	4 years ago
audio	Add pop-out player for audio/video in web UI (#14870)	4 years ago
blocks	…
bookmarked_statuses	…
community_timeline	…
compose	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
direct_timeline	Freeze scroll position when a dropdown menu is open in the TL (#14271)	4 years ago
directory	…
domain_blocks	…
emoji	Add border around 🕺 emoji (#14769)	4 years ago
favourited_statuses	…
favourites	…
follow_requests	…
followers	…
following	…
generic_not_found	…
getting_started	Add back “Home” link to the “Getting Started” column when the “Home” column isn't mounted (#14707)	4 years ago
hashtag_timeline	…
home_timeline	…
introduction	…
keyboard_shortcuts	…
list_adder	…
list_editor	…
list_timeline	Add configuration option to filter replies in lists (#9205)	4 years ago
lists	…
mutes	…
notifications	Add unread notification markers (#14818)	4 years ago
picture_in_picture	Add pop-out player for audio/video in web UI (#14870)	4 years ago
pinned_statuses	…
public_timeline	…
reblogs	…
report	…
search	…
standalone	…
status	Add pop-out player for audio/video in web UI (#14870)	4 years ago
ui	Add pop-out player for audio/video in web UI (#14870)	4 years ago
video	Add pop-out player for audio/video in web UI (#14870)	4 years ago