mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2017-06-25	Fix #3910 - Require OTP authentication to disable 2FA (#3935)	Eugen Rochko
	* 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
2017-06-19	Added new Catalan strings (#3843)	spla
	* 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
2017-06-08	Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640)	Eugen Rochko
	* Add explit admin actions to (re)subscribe/unsubscribe remote accounts and re-download avatar/header * Improve how admin NSFW toggle looks
2017-05-31	Move admin/pubsubhubbub controller to admin/subscriptions (#3442)	Matt Jankowski

2017-05-31	Catalan language updates (#3454)	spla
	* 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
2017-05-22	Fix locale regression from #3055 (#3231)	Eugen Rochko

2017-05-17	Add catalan language (#3084)	spla
	* 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