fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-25 07:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/admin
History
Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
- `app/controllers/oauth/authorized_applications_controller.rb`:
  Upstream changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/base_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/sessions_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/models/user.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc not preventing moved accounts from logging
  in.
  Ported upstream changes while keeping the ability for moved accounts to log
  in.
- `app/policies/status_policy.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `app/serializers/rest/account_serializer.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's ability  to hide followers count.
  Ported upstream changes.
- `app/services/process_mentions_service.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `package.json`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
2020-09-28 14:13:30 +02:00
..
account_actions Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
account_moderation_notes
account_warnings
accounts Fix method of the DELETE DATA button (#14855) 2020-09-21 20:37:19 +02:00
action_logs Fix admin audit log crash due to glitch-soc theming changes 2020-04-04 23:15:08 +02:00
announcements Fix design of announcements in admin UI (#12989) 2020-01-28 02:21:00 +01:00
change_emails
custom_emojis Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +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 include resolved DNS records when blacklisting e-mail domains in admin UI (#13254) 2020-03-12 22:35:20 +01:00
instances Improve appearence consistency of settings pages (#13938) 2020-06-26 00:36:30 +02:00
invites
pending_accounts Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
relationships Fix admin-facing uses of inline CSS (#13575) 2020-04-28 19:39:16 +02:00
relays
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
settings Add support for setting Content Warning for CW-less outgoing toots 2020-05-30 18:27:00 +02:00
statuses Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
tags Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
warning_presets Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00