Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.

2018-12-15 10:45:53 +01:00

..

account_moderation_notes_controller.rb

…

accounts_controller.rb

Add admin ability to remove an user's header image (#9495)

2018-12-11 19:28:03 +01:00

action_logs_controller.rb

…

base_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-26 20:41:43 +02:00

change_emails_controller.rb

Feature: Allow staff to change user emails (#7074)

2018-04-10 09:16:06 +02:00

confirmations_controller.rb

Add resend confirmation for admin (#7378)

2018-05-06 10:59:03 +02:00

custom_emojis_controller.rb

keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)

2017-12-30 02:43:43 +01:00

dashboard_controller.rb

Add instance-wide setting to disable profile directory (#9497)

2018-12-11 19:18:29 +01:00

domain_blocks_controller.rb

Add option to block reports from domain (#8830)

2018-10-20 08:02:44 +02:00

email_domain_blocks_controller.rb

…

instances_controller.rb

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

invites_controller.rb

Add admin function to deactivate all invites (#8279)

2018-08-19 00:58:53 +02:00

relays_controller.rb

Add federation relay support (#7998)

2018-07-13 02:16:06 +02:00

report_notes_controller.rb

Feature: Improve reports ui (#7032)

2018-04-10 20:27:59 +02:00

reported_statuses_controller.rb

Improve admin UI for accounts (#7360)

2018-05-05 23:06:29 +02:00

reports_controller.rb

Add "disable" button to report screen (#9024)

2018-10-20 02:39:39 +02:00

resets_controller.rb

…

roles_controller.rb

…

settings_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-15 10:45:53 +01:00

silences_controller.rb

…

statuses_controller.rb

Allow to show a specific status in the admin interface

2018-09-03 18:19:11 +02:00

subscriptions_controller.rb

…

suspensions_controller.rb

Fix regression when suspending not from report (#8400)

2018-08-23 21:51:56 +02:00

tags_controller.rb

Fix Admin::TagsController#unhide (#9481)

2018-12-10 21:37:38 +01:00

two_factor_authentications_controller.rb

…