Mastodon

History

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

Improve admin UI for accounts (#7360 )

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

accounts

Restore profile links in /admin/accounts (#9494 )

2018-12-14 01:47:50 +01:00

action_logs

Improve report layout (#7188 )

2018-04-20 02:28:48 +02:00

change_emails

Redesign forms, verify link ownership with rel="me" (#8703 )