107 Commits

Author	SHA1	Message	Date
Matt Jankowski	de4681b2be	Move admin/pubsubhubbub controller to admin/subscriptions (#3442)	2017-05-31 20:39:35 +02:00
Hiroaki Ninomiya	cb50ecdb07	chore(landing_strip): hide signup path unless the instance allows registration. (#3055)	2017-05-16 00:41:09 +02:00
Matt Jankowski	2bd132d458	Replace best_in_place editor on admin settings page (#2789) ... * Remove best_in_place * Replace best_in_place usage with rails helpers * Move admin/settings#index to #edit action * Remove click_to__edit from i18n	2017-05-04 18:12:44 +02:00
Alvina Putri	282427cdd9	Updating Indonesian locale (#2644) ... * update id.jsx file * update id.yml for new strings and improvements * add activerecord.id.yml * improve translation that out of context * fix another ooc string * fix main key	2017-04-30 11:35:15 -04:00
ymmtmdk	072c6f1527	Add link for domain in land strip (#2306) ... * Add link for domain in land strip * Use root_path * Avoid repeating code	2017-04-23 21:45:03 +02:00
Matt Jankowski	67dea31b0f	2FA controller cleanup (#2296) ... * Add spec coverage for settings/two_factor_auth area * extract setup method for qr code * Move otp required check to before action * Merge method only used once * Remove duplicate view * Consolidate creation of @codes for backup * Move settings/2fq#recovery_codes to settings/recovery_codes#create * Rename settings/two_factor_auth#disable to #destroy * Add coverage for the otp required path on 2fa#show * Clean up the recovery codes list styles * Move settings/two_factor_auth to settings/two_factor_authentication * Reorganize the settings two factor auth area Updated to use a flow like: - settings/two_factor_authentication goes to a #show view which has a button either enable or disable 2fa on the account - the disable button turns off the otp requirement for the user - the enable button cycles the user secret and redirects to a confirmation page - the confirmation page is a #new view which shows the QR code for user - that page posts to #create which verifies the code, and creates the recovery codes - that create action shares a view with a recovery codes controller which can be used separately to reset codes if needed	2017-04-22 04:23:17 +02:00
Koala Yeung	935aecdc32	Add Indonesian (Bahasa Indonesia / id) translation (#2200) ... * add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * fix InvalidLocaleData on a string * fix InvalidLocaleData on a string * Fix language keys in Indonesian ruby locale (id) Use "id" instead of "en" as object keys. * Removed obsoleted translation (id)	2017-04-21 19:16:26 +02:00