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.

Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2 years ago
..
account_batch.rb	Change batch account suspension to create a strike (#20897)	2 years ago
admin_settings.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
challenge.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
custom_emoji_batch.rb	Cache result of SQL (#14534)	4 years ago
delete_confirmation.rb	Fix 2FA challenge and password challenge for non-database users (#11831)	5 years ago
domain_block_batch.rb	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2 years ago
email_domain_block_batch.rb	Change e-mail domain blocks to block IPs dynamically (#17635)	3 years ago
ip_block_batch.rb	Add IP-based rules (#14963)	4 years ago
redirect.rb	Fix 500 error when trying to migrate to an invalid address (#21462)	2 years ago
status_filter_batch_action.rb	Add ability to filter individual posts (#18945)	2 years ago
two_factor_confirmation.rb	Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)	5 years ago