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
..
_mixins.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
about.scss	Fix use of inline CSS in public pages (#13576)	5 years ago
accessibility.scss	Improve rendering of emoji which do not contrast with background (#13772)	5 years ago
accounts.scss	Fix lock icon not being shown when locking account in profile settings (#14190)	5 years ago
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
basics.scss	Fix various issues around OpenGraph representation of media (#14133)	5 years ago
boost.scss	Fix: also use custom private boost icon for detailed status (#14471)	4 years ago
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
containers.scss	Fix counter sizing (#12446)	5 years ago
dashboard.scss	Fix height of dashboard counters (#11736)	5 years ago
emoji_picker.scss	Fix sass-lint config (#10982)	6 years ago
footer.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
forms.scss	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
introduction.scss	Fix performance of home feed regeneration (#12084)	5 years ago
lists.scss	…
modal.scss	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
polls.scss	Fix end-user-facing uses of inline CSS (#13438)	5 years ago
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	6 years ago
rtl.scss	Add a visibility icon to status (#14123)	5 years ago
statuses.scss	Fix avatar size in public page detailed status (#14140)	5 years ago
tables.scss	Fix batch actions being hidden from mobile view (#12183)	5 years ago
variables.scss	Add bookmarks (#7107)	5 years ago
widgets.scss	Fix use of inline CSS in public pages (#13576)	5 years ago