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 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.		2019-08-29 12:07:50 +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	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
accounts_controller.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +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	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
custom_emojis_controller.rb	Randomize emoji filename (#10090)	2019-02-22 16:52:04 +01: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	Fix list of local followers showing remote followers in admin UI (#9700)	2019-01-03 06:40:16 +01:00
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	Do not error out when performing admin actions on no statuses (#10094)	2019-02-21 19:36:48 +01:00
reports_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
resets_controller.rb	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
roles_controller.rb	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
settings_controller.rb	Add validations to admin settings (#10348)	2019-03-23 14:07:04 +01:00
statuses_controller.rb	Add quick links to the admin interface in the WebUI (#8545)	2019-01-04 13:10:43 +01:00
subscriptions_controller.rb	…
tags_controller.rb	Fix weekly usage not being displayed correctly in hashtag admin UI (#11524)	2019-08-08 23:03:28 +02:00
two_factor_authentications_controller.rb	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
warning_presets_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00