Thibaut Girka 5088eb8388 Merge branch 'master' into glitch-soc/merge-upstream

2019-09-05 11:36:41 +02: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

Remove Salmon and PubSubHubbub (#11205)

2019-07-06 23:26:16 +02:00

action_logs_controller.rb

…

base_controller.rb

…

change_emails_controller.rb

…

confirmations_controller.rb

…

custom_emojis_controller.rb

…

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

…

followers_controller.rb

…

instances_controller.rb

Add domain block notes (#11515)

2019-08-07 20:20:23 +02:00

invites_controller.rb

…

pending_accounts_controller.rb

Add invite request to pending account notification e-mail (#10528)

2019-04-10 00:36:01 +02:00

relays_controller.rb

…

report_notes_controller.rb

…

reported_statuses_controller.rb

…

reports_controller.rb

…

resets_controller.rb

…

roles_controller.rb

…

settings_controller.rb

…

statuses_controller.rb

…

subscriptions_controller.rb

…

tags_controller.rb

Change trending hashtags to not disappear instantly after midnight (#11712)

2019-09-02 18:11:13 +02:00

two_factor_authentications_controller.rb

…

warning_presets_controller.rb

…