Merge commit '3395820c75a65ea7309a422ef826be62deff0eb1' into HEAD

Author: Jenkins Continuous Integration Server

app/my-dashboard/my-dashboard.jade

@@ -7,18 +7,6 @@
 
   //- .ttl
   //-   tc-banner(theme="black", banner-name="ttl")
-  .one-million
-    tc-banner(theme="black", banner-name="1million")
-      .social-sharing
-        span #TC1MILLION on
-        //- hardcoded domain because we need the links to be shared only for prod
-        //- and after some time we would remove this banner
-        a.twitter(href="//twitter.com/home?status=Topcoder%20has%20reached%20an%20epic%20milestone%20and%20is%20now%20over%201%20Million%20Strong!%20https%3A//www.topcoder.com/blog/1-million-members-strong/%20%23TC1MILLION")
-          img(src="//topcoder.com/wp-content/uploads/2016/05/btn-social-twitter.png")
-
-        a.facebook(href="http://www.facebook.com/sharer/sharer.php?s=100&p[url]=https://www.topcoder.com/blog/1-million-members-strong/&p[images][0]=https://www.topcoder.com/wp-content/uploads/2016/05/Blog_banner_1mil.png&p[title]=1 Million Members Strong&p[summary]=1+Million+Members+Strong%0A")
-          img(src="//topcoder.com/wp-content/uploads/2016/05/btn-social-fb.png")
-
 
   .tco
     tc-banner(theme="black", banner-name="tco16")

app/services/tcAuth.service.js

@@ -25,7 +25,7 @@ import { getCurrentUser, logout as doLogout } from './userv3.service.js'
     }
 
     function isAuthenticated() {
-      return !!getCurrentUser()
+      return !!getCurrentUser() && !!AuthTokenService.getV2Token() && !!AuthTokenService.getTCSSOToken()
     }
 
   }

assets/css/my-dashboard/my-dashboard.scss

@@ -11,7 +11,7 @@
     background-color: $white;
   }
 
-  .challenges, .srms, .programs, .tco, .ttl, .one-million, .community-updates {
+  .challenges, .srms, .programs, .tco, .ttl, .community-updates {
     @include module-l;
     margin-top: 1px;
     width: 100%;
@@ -34,45 +34,7 @@
     }
   }
 
-  .one-million {
-    .tc-banner-placeholder {
-      background: none $tc-gray-90;
-
-      .image {
-        img {
-          width: auto;
-        }
-      }
-
-      .content {
-        margin-top: 0px;
-      }
-
-      .social-sharing {
-        margin-bottom: 20px;
-        span {
-          color: $white;
-          @include sofia-pro-bold;
-          margin-right: 10px;
-        }
-
-        img {
-          height: 40px;
-          padding: 0 10px 0 0px;
-          vertical-align: middle;
-        }
-      }
-
-      .ctas {
-        // specific css override to reduce the gap between image and ctas
-        // ideally we should have separate title, image and description
-        // however, here we have all 3 in single image
-        margin-top: 0px;
-      }
-    }
-  }
-
-  .challenges, .srms, .programs, .tco, .ttl, .one-million, .community-updates {
+  .challenges, .srms, .programs, .tco, .ttl, .community-updates {
     padding-top: 0px;
   }
 

assets/css/settings/edit-profile.scss

@@ -153,6 +153,10 @@
   margin-top: 5px;
 }
 
+.skills .Select-menu-outer {
+  z-index: 101;
+}
+
 .links.settings-section {
   border-bottom: none;
 }

package.json

@@ -72,7 +72,7 @@
     "tc-angular-ellipsis": "^0.1.6",
     "topcoder-app-r": "^1.0.0",
     "xml2js": "^0.4.16",
-    "zepto": "^1.0.1",
+    "zepto": "1.0.1",
     "tc-accounts": "https://github.com/appirio-tech/accounts-app.git#dev"
   }
 }