Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		2020-03-08 19:38:53 +01: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	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
action_logs_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
announcements_controller.rb	Add publish/unpublish controls to announcements in admin UI (#12967)	2020-01-27 11:05:33 +01:00
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
change_emails_controller.rb	Feature: Allow staff to change user emails (#7074)	2018-04-10 09:16:06 +02:00
confirmations_controller.rb	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
custom_emojis_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +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	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
instances_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
invites_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
pending_accounts_controller.rb	Add invite request to pending account notification e-mail (#10528)	2019-04-10 00:36:01 +02:00
relationships_controller.rb	Fix relationships page not showing results in admin UI (#12934)	2020-01-24 00:20:23 +01:00
relays_controller.rb	Fix relays UI being available in whitelist/secure mode (#11963)	2019-09-27 02:13:34 +02:00
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	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +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
site_uploads_controller.rb	Add ability to delete files uploaded for settings in admin UI (#13192)	2020-03-08 16:00:24 +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	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
tags_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
two_factor_authentications_controller.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
warning_presets_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00