Merge pull request #278 from appirio-tech/fixes/vikas-beta-release

vikasrohit · vikasrohit · commit 36b09b06922c · 2015-09-30T13:53:48.000-07:00
SUP-1724, no message for log in if the account is unactivated
diff --git a/app/account/login/login.controller.js b/app/account/login/login.controller.js
@@ -32,6 +32,7 @@
         $log.warn(resp);
         switch (resp.status) {
           case "ACCOUNT_INACTIVE":
+            $state.go('registeredSuccessfully');
             // user should already be redirected
             break;
           case "UNKNOWN_ERROR":
diff --git a/app/account/register/registered-successfully.jade b/app/account/register/registered-successfully.jade
@@ -4,4 +4,4 @@
     img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
     .arrow
 
-  p.message Thanks. We've emailed you a reset link. Please check your inbox.
+  p.message Thanks for joining Topcoder.<br> We’ve sent you a confirmation link. Please check your email and click the link to activate your account. If you can't find the message, please email #[a(href="mailto:support@topcoder.com") support@topcoder.com].

-Original file line number
+Diff line change
     img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
     .arrow
 -  p.message Thanks. We've emailed you a reset link. Please check your inbox.
 +  p.message Thanks for joining Topcoder.<br> We’ve sent you a confirmation link. Please check your email and click the link to activate your account. If you can't find the message, please email #[a(href="mailto:[email protected]") [email protected]].