mastodon/app/views/admin
Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
..
account_actions Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
account_moderation_notes
account_warnings Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
accounts Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
action_logs Use local time in audit log (#10751) 2019-05-11 06:46:01 +02:00
change_emails Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973) 2019-02-05 15:11:35 +01:00
custom_emojis
dashboard Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
domain_allows Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
domain_blocks Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
email_domain_blocks Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
followers Fix admin UI view of local followers (#9712) 2019-01-04 11:28:14 +01:00
instances Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
invites Fix maxed-out invites not showing up as expired in UI (#10274) 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
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00
statuses Add quick links to the admin interface in the WebUI (#8545) 2019-01-04 13:10:43 +01:00
tags Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
warning_presets Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00