Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Change registration message when user need to confirm email #9336

Merged
merged 12 commits into from
Nov 12, 2018
Merged

[FIX] Change registration message when user need to confirm email #9336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1e79975
Change registration message when user need to confirm email
karlprieb Jan 4, 2018
9fcc159
Merge branch 'develop' into change-registration-message
tassoevan Jul 19, 2018
d0b0dc7
Revert "Change registration message when user need to confirm email"
tassoevan Jul 19, 2018
a589d98
Deprecate toast message for email activation
tassoevan Jul 19, 2018
3384ebc
Merge branch 'develop' into change-registration-message
tassoevan Jul 23, 2018
581fbde
Fix Rocket.Chat logo responsiveness in login form
tassoevan Jul 23, 2018
48ff299
Merge branch 'develop' into change-registration-message
ggazzo Oct 2, 2018
109132a
Merge branch 'develop' into change-registration-message
tassoevan Oct 17, 2018
30b89ad
Fix stylelint error
tassoevan Oct 17, 2018
7b9562f
Merge branch 'develop' into change-registration-message
tassoevan Oct 22, 2018
978b966
Merge branch 'develop' into change-registration-message
tassoevan Nov 7, 2018
d17b743
Merge branch 'develop' into change-registration-message
rodrigok Nov 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions packages/rocketchat-ui-login/client/login/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@
{{#if state 'wait-activation'}}
<header>
<h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
<p>{{{_ "Wait_activation_warning"}}}</p>
<p>{{{_ "Please_wait_activation"}}}</p>
<p>{{_ "Wait_activation_warning"}}</p>
<p>{{_ "Please_wait_activation"}}</p>
</header>
{{else if state 'wait-email-activation'}}
<header>
<h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
<p>{{_ "We_have_sent_registration_email"}}</p>
</header>
{{else}}
{{> loginServices }}
Expand Down
3 changes: 1 addition & 2 deletions packages/rocketchat-ui-login/client/login/form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ Template.loginForm.events({
RocketChat.callbacks.run('userRegistered');
return Meteor.loginWithPassword(s.trim(formData.email), formData.pass, function(error) {
if (error && error.error === 'error-invalid-email') {
toastr.success(t('We_have_sent_registration_email'));
return instance.state.set('login');
return instance.state.set('wait-email-activation');
} else if (error && error.error === 'error-user-is-not-activated') {
return instance.state.set('wait-activation');
} else {
Expand Down
5 changes: 5 additions & 0 deletions packages/rocketchat_theme/client/imports/general/base_old.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4666,6 +4666,11 @@ body:not(.is-cordova) {
& .logo {
display: block;

width: 100%;
max-width: 520px;
margin: 0 auto;
padding: 0 20px;

& > img {
position: relative;
z-index: 20;
Expand Down