You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		5 years ago
..
account_actions_controller.rb	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
account_moderation_notes_controller.rb	…
accounts_controller.rb	Various fixes and improvements (#12878)	5 years ago
action_logs_controller.rb	…
announcements_controller.rb	Add publish/unpublish controls to announcements in admin UI (#12967)	5 years ago
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	Various fixes and improvements (#12878)	5 years ago
dashboard_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
domain_allows_controller.rb	Add whitelist mode (#11291)	5 years ago
domain_blocks_controller.rb	Add domain block notes (#11515)	5 years ago
email_domain_blocks_controller.rb	Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)	5 years ago
instances_controller.rb	Various fixes and improvements (#12878)	5 years ago
invites_controller.rb	Various fixes and improvements (#12878)	5 years ago
pending_accounts_controller.rb	…
relationships_controller.rb	Fix relationships page not showing results in admin UI (#12934)	5 years ago
relays_controller.rb	Fix relays UI being available in whitelist/secure mode (#11963)	5 years ago
report_notes_controller.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
reported_statuses_controller.rb	…
reports_controller.rb	Various fixes and improvements (#12878)	5 years ago
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	…
site_uploads_controller.rb	Add ability to delete files uploaded for settings in admin UI (#13192)	5 years ago
statuses_controller.rb	…
subscriptions_controller.rb	…
tags_controller.rb	Various fixes and improvements (#12878)	5 years ago
two_factor_authentications_controller.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
warning_presets_controller.rb	Add titles to warning presets in admin UI (#13252)	5 years ago