mastodon/app/views/admin
Thibaut Girka cc94c90bf1 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
account_actions Add option to include reported statuses in warning e-mail () 2019-08-23 22:37:23 +02:00
account_moderation_notes Improve admin UI for accounts () 2018-05-05 23:06:29 +02:00
account_warnings Add moderation warnings () 2018-12-22 20:02:09 +01:00
accounts Add account bio to account admin view () 2019-09-09 14:15:52 +02:00
action_logs Use local time in audit log () 2019-05-11 06:46:01 +02:00
change_emails Hide misleading “You will be sent a confirmation e-mail” hint from admin view () 2019-02-05 15:11:35 +01:00
custom_emojis Fix upstream changes breaking because of glitch-soc's theming engine 2019-09-13 20:28:22 +02:00
dashboard Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
domain_allows Fix upstream changes breaking because of glitch-soc's theming engine 2019-09-13 20:28:22 +02:00
domain_blocks Fix domain block edition in glitch-soc 2019-08-08 09:14:20 +02:00
email_domain_blocks Add option to block reports from domain () 2018-10-20 08:02:44 +02:00
followers Fix admin UI view of local followers () 2019-01-04 11:28:14 +01:00
instances Fix admin interface showing superfluous reject media/reports on suspended blocks () 2019-09-03 22:53:27 +02:00
invites Fix maxed-out invites not showing up as expired in UI () 2019-03-15 05:35:17 +01:00
pending_accounts Merge branch 'master' into glitch-soc/merge-upstream 2019-06-07 17:00:36 +02:00
relays Display pending message on admin relays UI () 2018-08-28 05:39:43 +02:00
report_notes Improve report layout () 2018-04-20 02:28:48 +02:00
reports Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
statuses Add quick links to the admin interface in the WebUI () 2019-01-04 13:10:43 +01:00
tags Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
warning_presets Add moderation warnings () 2018-12-22 20:02:09 +01:00