Skip to content
Snippets Groups Projects
Commit 0e7dfcb6 authored by Marcelo Schmidt's avatar Marcelo Schmidt
Browse files

Fix #766; Disable E-mail Confirmation setting when SMTP is not set.

parent 79c64fcf
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
- Fixes #924. Admin users may now login without verifying their e-mails. - Fixes #924. Admin users may now login without verifying their e-mails.
- Makes channels list load faster by not getting full channel data, such as usernames. - Makes channels list load faster by not getting full channel data, such as usernames.
- Fixes #2399. Fixes bug with highlighted words which allowed an empty string to be defined as highlight. - Fixes #2399. Fixes bug with highlighted words which allowed an empty string to be defined as highlight.
- Fix #766; Disable E-mail Confirmation setting when SMTP is not set.
## 0.20.0, 2016-Feb-29 ## 0.20.0, 2016-Feb-29
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
"Accounts_AvatarStoreType" : "Avatar Storage Type", "Accounts_AvatarStoreType" : "Avatar Storage Type",
"Accounts_denyUnverifiedEmail" : "Deny unverified e-mail", "Accounts_denyUnverifiedEmail" : "Deny unverified e-mail",
"Accounts_EmailVerification" : "E-mail Verification", "Accounts_EmailVerification" : "E-mail Verification",
"Accounts_EmailVerification_Description" : "Make sure you have correct SMTP settings to use this feature",
"Accounts_Enrollment_Email" : "Enrollment E-mail", "Accounts_Enrollment_Email" : "Enrollment E-mail",
"Accounts_Enrollment_Email_Description" : "You may use [name], [fname], [lname] for the user's full name, first name or last name, respectively.<br />You may use [email] for the user's e-mail.", "Accounts_Enrollment_Email_Description" : "You may use [name], [fname], [lname] for the user's full name, first name or last name, respectively.<br />You may use [email] for the user's e-mail.",
"Accounts_LoginExpiration" : "Login Expiration in Days", "Accounts_LoginExpiration" : "Login Expiration in Days",
......
...@@ -16,7 +16,7 @@ RocketChat.settings.addGroup 'Accounts', -> ...@@ -16,7 +16,7 @@ RocketChat.settings.addGroup 'Accounts', ->
@add 'Accounts_PasswordPlaceholder', '', { type: 'string', public: true, i18nLabel: 'Placeholder_for_password_login_field' } @add 'Accounts_PasswordPlaceholder', '', { type: 'string', public: true, i18nLabel: 'Placeholder_for_password_login_field' }
@section 'Registration', -> @section 'Registration', ->
@add 'Accounts_EmailVerification', false, { type: 'boolean', public: true } @add 'Accounts_EmailVerification', false, { type: 'boolean', public: true, enableQuery: {_id: 'SMTP_Host', value: { $exists: 1, $ne: "" } } }
@add 'Accounts_ManuallyApproveNewUsers', false, { type: 'boolean' } @add 'Accounts_ManuallyApproveNewUsers', false, { type: 'boolean' }
@add 'Accounts_AllowedDomainsList', '', { type: 'string', public: true } @add 'Accounts_AllowedDomainsList', '', { type: 'string', public: true }
@add 'Accounts_RegistrationForm', 'Public', { type: 'select', public: true, values: [ { key: 'Public', i18nLabel: 'Accounts_RegistrationForm_Public' }, { key: 'Disabled', i18nLabel: 'Accounts_RegistrationForm_Disabled' }, { key: 'Secret URL', i18nLabel: 'Accounts_RegistrationForm_Secret_URL' } ] } @add 'Accounts_RegistrationForm', 'Public', { type: 'select', public: true, values: [ { key: 'Public', i18nLabel: 'Accounts_RegistrationForm_Public' }, { key: 'Disabled', i18nLabel: 'Accounts_RegistrationForm_Disabled' }, { key: 'Secret URL', i18nLabel: 'Accounts_RegistrationForm_Secret_URL' } ] }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment