luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-18 21:03:27 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/admin
History
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
..
account_moderation_notes_controller.rb
accounts_controller.rb Change admin accounts default sort to most recent (#8813) 2018-10-04 16:05:38 +02:00
action_logs_controller.rb
base_controller.rb Fix statuses batch checkboxes in admin panel (fixes #411) 2018-08-11 15:45:12 +02:00
change_emails_controller.rb Feature: Allow staff to change user emails (#7074) 2018-04-10 09:16:06 +02:00
confirmations_controller.rb Add resend confirmation for admin (#7378) 2018-05-06 10:59:03 +02:00
custom_emojis_controller.rb
dashboard_controller.rb Display trending hashtags on admin dashboard (#8038) 2018-07-16 19:21:27 +02:00
domain_blocks_controller.rb Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
email_domain_blocks_controller.rb
instances_controller.rb
invites_controller.rb Add admin function to deactivate all invites (#8279) 2018-08-19 00:58:53 +02:00
relays_controller.rb Add federation relay support (#7998) 2018-07-13 02:16:06 +02:00
report_notes_controller.rb Feature: Improve reports ui (#7032) 2018-04-10 20:27:59 +02:00
reported_statuses_controller.rb Improve admin UI for accounts (#7360) 2018-05-05 23:06:29 +02:00
reports_controller.rb Add "disable" button to report screen (#9024) 2018-10-20 02:39:39 +02:00
resets_controller.rb
roles_controller.rb
settings_controller.rb Allow selecting both default flavour and theme 2018-10-12 19:06:35 +02:00
silences_controller.rb
statuses_controller.rb Allow to show a specific status in the admin interface 2018-09-03 18:19:11 +02:00
subscriptions_controller.rb
suspensions_controller.rb Fix regression when suspending not from report (#8400) 2018-08-23 21:51:56 +02:00
two_factor_authentications_controller.rb