Mastodon

History

Merge remote-tracking branch 'origin/master' into gs-master

Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json

2018-04-18 18:48:12 -05:00

account_moderation_note_policy.rb

…

account_policy.rb

Implement the ability for an Administrator or Moderator to remove an account avatar (#6998 )

2018-04-02 13:45:07 +02:00

application_policy.rb

Account archive download (#6460 )

2018-02-21 23:21:32 +01:00

backup_policy.rb

Account archive download (#6460 )

2018-02-21 23:21:32 +01:00

custom_emoji_policy.rb

…

domain_block_policy.rb

…

email_domain_block_policy.rb

…

instance_policy.rb

…

invite_policy.rb

Allow admin to deactivate invite created by users (#5860 )

2017-12-01 12:26:19 +01:00

report_note_policy.rb

Feature: Report improvements (#6967 ) (#7000 )

2018-04-02 22:04:14 +02:00

report_policy.rb

…

settings_policy.rb

…

status_policy.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-18 18:48:12 -05:00

subscription_policy.rb

…

user_policy.rb

Feature: Allow staff to change user emails (#7074 )

2018-04-10 09:16:06 +02:00