nyastodon/app/views/admin
Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
  Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
  Two changes too close to each other
- app/models/media_attachment.rb
  New changes too close to glitch-soc only changes.
- app/models/user.rb
  Two changes too close to each other.
- app/services/remove_status_service.rb
  Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
  Two changes too close to each other.
- config/locales/en.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
  Reverted upstream's decision of enabling posting application by default.
2019-02-10 21:10:09 +01:00
..
account_actions Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
account_moderation_notes Improve admin UI for accounts (#7360) 2018-05-05 23:06:29 +02:00
account_warnings Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
accounts Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
action_logs Improve report layout (#7188) 2018-04-20 02:28:48 +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 Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
dashboard Add instance-wide setting to disable profile directory (#9497) 2018-12-11 19:18:29 +01:00
domain_blocks Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01: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 Change "federation" admin UI link to point to "limited" domains (#9762) 2019-01-08 17:41:27 +01:00
invites Add admin function to deactivate all invites (#8279) 2018-08-19 00:58:53 +02:00
relays Display pending message on admin relays UI (#8494) 2018-08-28 05:39:43 +02:00
report_notes Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
reports Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
settings Add admin setting to disable followers count 2018-12-20 14:51:12 +01:00
statuses Add quick links to the admin interface in the WebUI (#8545) 2019-01-04 13:10:43 +01:00
subscriptions Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02: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