Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		2019-06-07 17:00:36 +02:00
..
account_actions_controller.rb
account_moderation_notes_controller.rb
accounts_controller.rb	Add waiting time to list of pending accounts in admin UI (#10985)	2019-06-07 03:24:10 +02:00
action_logs_controller.rb
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb	Randomize emoji filename (#10090)	2019-02-22 16:52:04 +01:00
dashboard_controller.rb	Fix keybase indication on dashboard	2019-04-19 00:57:39 +02:00
domain_blocks_controller.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
email_domain_blocks_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
followers_controller.rb
instances_controller.rb
invites_controller.rb	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02:00
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	Add federation relay support (#7998)	2018-07-13 02:16:06 +02:00
report_notes_controller.rb
reported_statuses_controller.rb	Do not error out when performing admin actions on no statuses (#10094)	2019-02-21 19:36:48 +01:00
reports_controller.rb
resets_controller.rb
roles_controller.rb
settings_controller.rb
statuses_controller.rb
subscriptions_controller.rb
tags_controller.rb
two_factor_authentications_controller.rb
warning_presets_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00