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 d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		7 years ago
..
account_moderation_notes_controller.rb	Add logging of admin actions (#5757)	7 years ago
accounts_controller.rb	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)	7 years ago
action_logs_controller.rb	Add logging of admin actions (#5757)	7 years ago
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)	7 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	Add logging of admin actions (#5757)	7 years ago
email_domain_blocks_controller.rb	Add logging of admin actions (#5757)	7 years ago
instances_controller.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
invites_controller.rb	Add invite filter (#5862)	7 years ago
report_notes_controller.rb	Feature: Improve reports ui (#7032)	7 years ago
reported_statuses_controller.rb	Improve admin UI for accounts (#7360)	7 years ago
reports_controller.rb	Improve report layout (#7188)	7 years ago
resets_controller.rb	Add logging of admin actions (#5757)	7 years ago
roles_controller.rb	Add logging of admin actions (#5757)	7 years ago
settings_controller.rb	Add admin setting to enable OG previews for sensitive media (#7962)	7 years ago
silences_controller.rb	Add logging of admin actions (#5757)	7 years ago
statuses_controller.rb	Improve admin UI for accounts (#7360)	7 years ago
subscriptions_controller.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
suspensions_controller.rb	Add logging of admin actions (#5757)	7 years ago
two_factor_authentications_controller.rb	Add logging of admin actions (#5757)	7 years ago