diff options
| author | Unknwon <u@gogs.io> | 2015-09-13 11:07:21 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-09-13 11:07:21 -0400 |
| commit | 83e747bfda43c2c8fa0aceb2c989d42fe5ca1582 (patch) | |
| tree | 1dfee9128010bb08ad2177c24fd1c5c8c53d45cd /conf | |
| parent | e5ed5904c62d9a618cb6f4ad852b021a02c3481e (diff) | |
| download | gitea-83e747bfda43c2c8fa0aceb2c989d42fe5ca1582.tar.gz gitea-83e747bfda43c2c8fa0aceb2c989d42fe5ca1582.zip | |
#697 and #1606 and new admin edit user UI
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/app.ini | 4 | ||||
| -rw-r--r-- | conf/locale/locale_en-US.ini | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/app.ini b/conf/app.ini index 5c50ae4f32..58a79a166d 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -99,8 +99,8 @@ ENABLE_REVERSE_PROXY_AUTHENTICATION = false ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false ; Do not check minimum key size with corresponding type DISABLE_MINIMUM_KEY_SIZE_CHECK = false -; Disable captcha validation for registration -DISABLE_CAPTCHA = false +; Enable captcha validation for registration +ENABLE_CAPTCHA = true [webhook] ; Hook task queue length diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 775951d52a..afcbb12b40 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -785,6 +785,7 @@ users.edit = Edit users.auth_source = Authentication Source users.local = Local users.auth_login_name = Authentication Login Name +users.password_helper = Leave it empty to remain unchanged. users.update_profile_success = Account profile has been updated successfully. users.edit_account = Edit Account users.is_activated = This account is activated |