diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-27 00:15:00 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-27 00:15:00 +0100 |
| commit | 175a9b9caa92ad90bf2e8b68c299a00adb1f9751 (patch) | |
| tree | ac9ee673567dd8661fce0644193377af5818b08e /config | |
| parent | 2826e6dada94da4508ab89f137b456145656d2d9 (diff) | |
Fix #104 - Style OAuth authorized applications page
Add ability to search accounts by display name
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/doorkeeper.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 3 | ||||
| -rw-r--r-- | config/navigation.rb | 3 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml index aaf5df6fc..97dd9c049 100644 --- a/config/locales/doorkeeper.en.yml +++ b/config/locales/doorkeeper.en.yml @@ -65,7 +65,7 @@ en: revoke: Are you sure? index: application: Application - created_at: Created At + created_at: Authorized date_format: "%Y-%m-%d %H:%M:%S" title: Your authorized applications errors: diff --git a/config/locales/en.yml b/config/locales/en.yml index e7d39327e..6da30acda 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -94,6 +94,7 @@ en: settings: back: Back to Mastodon edit_profile: Edit profile + export: Data export preferences: Preferences settings: Settings two_factor_auth: Two-factor Authentication @@ -118,7 +119,7 @@ en: disable: Disable enable: Enable instructions_html: "<strong>Scan this QR code into Google Authenticator or a similiar app on your phone</strong>. From now on, that app will generate tokens that you will have to enter when logging in." - plaintext_secret_html: "Plain-text secret: <samp>%{secret}</samp>" + plaintext_secret_html: 'Plain-text secret: <samp>%{secret}</samp>' warning: If you cannot configure an authenticator app right now, you should click "disable" or you won't be able to login. users: invalid_email: The e-mail address is invalid diff --git a/config/navigation.rb b/config/navigation.rb index 0d43a9f73..fd2659923 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -9,7 +9,8 @@ SimpleNavigation::Configuration.run do |navigation| settings.item :preferences, safe_join([fa_icon('sliders fw'), t('settings.preferences')]), settings_preferences_url settings.item :password, safe_join([fa_icon('cog fw'), t('auth.change_password')]), edit_user_registration_url settings.item :two_factor_auth, safe_join([fa_icon('mobile fw'), t('settings.two_factor_auth')]), settings_two_factor_auth_url - # settings.item :authorized_apps, safe_join([fa_icon('list fw'), 'Authorized Apps']), oauth_authorized_applications_url + # settings.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_url + settings.item :authorized_apps, safe_join([fa_icon('list fw'), 'Authorized Apps']), oauth_authorized_applications_url end primary.item :admin, safe_join([fa_icon('cogs fw'), 'Administration']), admin_accounts_url, if: proc { current_user.admin? } do |admin| diff --git a/config/routes.rb b/config/routes.rb index 70e252409..870d8afd4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -46,6 +46,7 @@ Rails.application.routes.draw do namespace :settings do resource :profile, only: [:show, :update] resource :preferences, only: [:show, :update] + resource :export, only: [:show] resource :two_factor_auth, only: [:show] do member do |