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 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		6 years ago
..
account_batch.rb	Add batch actions for approving and rejecting pending accounts (#10469)	6 years ago
admin_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
delete_confirmation.rb	Account deletion (#3728)	8 years ago
migration.rb	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	7 years ago
status_batch.rb	Remove Form::StatusBatch::ACTION_TYPE unused (#9623)	6 years ago
two_factor_confirmation.rb	Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)	8 years ago