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 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		6 years ago
..
account_moderation_notes_controller.rb	…
accounts_controller.rb	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)	7 years ago
action_logs_controller.rb	…
base_controller.rb	Add “public” pack to admin controller, as it is included in upstream admin layout	7 years ago
change_emails_controller.rb	Feature: Allow staff to change user emails (#7074)	7 years ago
confirmations_controller.rb	Add resend confirmation for admin (#7378)	6 years ago
custom_emojis_controller.rb	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	7 years ago
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	…
instances_controller.rb	…
invites_controller.rb	…
report_notes_controller.rb	Feature: Improve reports ui (#7032)	7 years ago
reported_statuses_controller.rb	Improve admin UI for accounts (#7360)	6 years ago
reports_controller.rb	Improve report layout (#7188)	7 years ago
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	Redesign landing page (again) (#6486)	7 years ago
silences_controller.rb	…
statuses_controller.rb	Improve admin UI for accounts (#7360)	6 years ago
subscriptions_controller.rb	…
suspensions_controller.rb	…
two_factor_authentications_controller.rb	…