queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/controllers/admin
History
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +01:00
..
account_actions_controller.rb Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
account_moderation_notes_controller.rb
accounts_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
action_logs_controller.rb
announcements_controller.rb Add publish/unpublish controls to announcements in admin UI (#12967) 2020-01-27 11:05:33 +01:00
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
dashboard_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-08 08:44:33 +02:00
domain_allows_controller.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
domain_blocks_controller.rb Add domain block notes (#11515) 2019-08-07 20:20:23 +02:00
email_domain_blocks_controller.rb 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_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
invites_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
pending_accounts_controller.rb
relationships_controller.rb Fix relationships page not showing results in admin UI (#12934) 2020-01-24 00:20:23 +01:00
relays_controller.rb Fix relays UI being available in whitelist/secure mode (#11963) 2019-09-27 02:13:34 +02:00
report_notes_controller.rb Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
reported_statuses_controller.rb
reports_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
resets_controller.rb
roles_controller.rb
settings_controller.rb
site_uploads_controller.rb Add ability to delete files uploaded for settings in admin UI (#13192) 2020-03-08 16:00:24 +01:00
statuses_controller.rb
subscriptions_controller.rb
tags_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
two_factor_authentications_controller.rb Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +02:00
warning_presets_controller.rb Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00