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 bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.		6 years ago
..
account_actions	Add moderation warnings (#9519)	6 years ago
account_moderation_notes	…
account_warnings	Add moderation warnings (#9519)	6 years ago
accounts	Improve admin UI for account view (#9643)	6 years ago
action_logs	…
change_emails	Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)	6 years ago
custom_emojis	…
dashboard	Add instance-wide setting to disable profile directory (#9497)	6 years ago
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
email_domain_blocks	…
followers	Fix admin UI view of local followers (#9712)	6 years ago
instances	Change "federation" admin UI link to point to "limited" domains (#9762)	6 years ago
invites	…
relays	…
report_notes	…
reports	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	Add admin setting to disable followers count	6 years ago
statuses	Add quick links to the admin interface in the WebUI (#8545)	6 years ago
subscriptions	…
tags	Add profile directory (#9427)	6 years ago
warning_presets	Add moderation warnings (#9519)	6 years ago