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
..
exports	Add CSV export for lists and domain blocks (#9677)	6 years ago
two_factor_authentication	Create Settings::BaseController (#9507)	6 years ago
applications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
base_controller.rb	Create Settings::BaseController (#9507)	6 years ago
deletes_controller.rb	Create Settings::BaseController (#9507)	6 years ago
exports_controller.rb	Create Settings::BaseController (#9507)	6 years ago
featured_tags_controller.rb	Fix pinned statuses being shown in a featured hashtag (#9971)	6 years ago
flavours_controller.rb	Thank you, Officer Murphy	7 years ago
follower_domains_controller.rb	Create Settings::BaseController (#9507)	6 years ago
imports_controller.rb	Create Settings::BaseController (#9507)	6 years ago
migrations_controller.rb	Create Settings::BaseController (#9507)	6 years ago
notifications_controller.rb	Create Settings::BaseController (#9507)	6 years ago
preferences_controller.rb	Make displaying application used to toot opt-in (#9897)	6 years ago
profiles_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
sessions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
two_factor_authentications_controller.rb	Create Settings::BaseController (#9507)	6 years ago