This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code		2019-09-18 17:25:56 +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	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
action_logs_controller.rb	…
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	Add batch actions and categories to admin UI for custom emojis (#11793)	2019-09-09 22:44:17 +02: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	…
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	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
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	Add validations to admin settings (#10348)	2019-03-23 14:07:04 +01:00
statuses_controller.rb	…
subscriptions_controller.rb	…
tags_controller.rb	Add search and sort functions to hashtag admin UI (#11829)	2019-09-16 14:27:29 +02:00
two_factor_authentications_controller.rb	…
warning_presets_controller.rb	…