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
..
_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)	4 years ago
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
basics.scss	Fix various issues around OpenGraph representation of media (#14133)	4 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	…
emoji_picker.scss	…
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	…
polls.scss	Fix end-user-facing uses of inline CSS (#13438)	5 years ago
reset.scss	…
rtl.scss	Add a visibility icon to status (#14123)	4 years ago
statuses.scss	Fix avatar size in public page detailed status (#14140)	4 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