Merge pull request #127 from appirio-tech/dev

Release Dev to QA

Author: thabofletcher

src/analytics.html

@@ -5,38 +5,6 @@
 <script>Munchkin.init('921-UOU-112', {"wsInfo":"jFRS"});</script>
 <!-- END Marketo Code -->
 
-<!-- START Google Retargeting Marketing Code -->
-<script type="text/javascript">
-adroll_adv_id = "LOUA2FVRTJDYZC2BMX72Z7";
-adroll_pix_id = "4XU6H3BYL5EQBFHZM4DIUU";
-(function () {
-var oldonload = window.onload;
-window.onload = function(){
-   __adroll_loaded=true;
-   var scr = document.createElement("script");
-   var host = (("https:" == document.location.protocol) ? "https://s.adroll.com" : "http://a.adroll.com");
-   scr.setAttribute('async', 'true');
-   scr.type = "text/javascript";
-   scr.src = host + "/j/roundtrip.js";
-   ((document.getElementsByTagName('head') || [null])[0] ||
-    document.getElementsByTagName('script')[0].parentNode).appendChild(scr);
-   if(oldonload){oldonload()}};
-}());
-</script>
-<!-- END Google Retargeting Marketing Code -->
-
-
-<!-- START Twitter Marketing Code -->
-<script src="//platform.twitter.com/oct.js" type="text/javascript"></script>
-<script type="text/javascript">
-twttr.conversion.trackPid('l4r4k');
-</script>
-<noscript>
-<img height="1" width="1" style="display:none;" alt="" src="https://analytics.twitter.com/i/adsct?txn_id=l4r4k&p_id=Twitter" />
-<img height="1" width="1" style="display:none;" alt="" src="//t.co/i/adsct?txn_id=l4r4k&p_id=Twitter" />
-</noscript>
-<!-- END Twitter Marketing Code -->
-
 <!-- START KISSmetrics -->
 <script type="text/javascript">var _kmq = _kmq || [];
 var _kmk = _kmk || 'aa23cd43c455ef33b6a0df3de81a79af9ea30f75';

src/conf/tc-prod-nginx.conf

@@ -9,9 +9,7 @@ server {
 	listen [::]:8080 default_server ipv6only=on;
 
 	if ($http_x_forwarded_proto != "https") {
-		rewrite ^/challenges https://$http_host$request_uri? permanent;
-        rewrite ^/challenge-details https://$http_host$request_uri? permanent;
-        rewrite ^/my-dashboard https://$http_host$request_uri? permanent;
+        return 301 https://$server_name$request_uri;
    	}
 
    	set $root_base /home/ubuntu/tc-site;

src/js/app/my-dashboard/partials/welcome-back.html

@@ -3,7 +3,7 @@
     <div class="profile-image"><img width="130px" src="{{vm.photoLink}}"></div>
     <div rel="upload-photo" ng-show="vm.showUploadPhotoLink"><a href="{{vm.uploadPhotoLink}}">Upload Photo</a></div>
     <div class="handle" style="{{vm.ratingColor}}">{{vm.profile.handle}}</div>
-    <div class="doj">Joined: <span ng-bind="vm.profile.memberSince | date"></span></div>
+    <div class="doj">Member Since: <span ng-bind="vm.profile.memberSince | date"></span></div>
   </div>
   <div class="profile-right col-xs-12 col-sm-10">
     <div class="col-xs-{{12/vm.statsToShow}}" ng-show="vm.profile && vm.profile.overallEarning > 0">