57 Commits (447d7339134a505732ea6602ec5bfa2e7b59d932)

Author	SHA1	Message	Date
Eugen Rochko	5e8d037e27	Fix #3910 - Require OTP authentication to disable 2FA (#3935) ... * Fix #3910 - Require OTP authentication to disable 2FA. Also, remove ability to generate new OTP backup codes *after* initial backup codes were handed out during activation * Restore recovery code re-generation * Improve display of some 2FA elements	8 years ago
spla	4367443287	Added new Catalan strings (#3843) ... * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master	8 years ago
Eugen Rochko	8902e265b4	Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640) ... * Add explit admin actions to (re)subscribe/unsubscribe remote accounts and re-download avatar/header * Improve how admin NSFW toggle looks	8 years ago
Matt Jankowski	de4681b2be	Move admin/pubsubhubbub controller to admin/subscriptions (#3442)	8 years ago
spla	93de41b39b	Catalan language updates (#3454) ... * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated	8 years ago
Eugen Rochko	48e7a22e34	Fix locale regression from #3055 (#3231)	8 years ago
spla	a51c8074df	Add catalan language (#3084) ... * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225	8 years ago