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 525919c04f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.		2 years ago
..
account_batch.rb	Add ability to select all accounts matching search for batch actions (#19053)	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	Add confirmation page when importing blocked domains (#1773)	3 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 account migration form ever using outdated account data (#18429)	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