Merge branch 'release'

mdesiderio · mdesiderio · commit 8e24f855240f · 2016-05-17T11:20:51.000-05:00
diff --git a/src/conf/tc-prod-nginx.conf b/src/conf/tc-prod-nginx.conf
@@ -18,6 +18,14 @@ server {
 
     client_max_body_size 100M;
 
+    location  = / {
+        proxy_pass https://wwwtc.wpengine.com/;
+        proxy_set_header Host wwwtc.wpengine.com;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
 	location / {
 		index index.php;
 		try_files $uri $uri/ /index.php?$args;
@@ -33,7 +41,7 @@ server {
     }
 
     location ~ ^/challenge-details/\d+/$ {
-        index /challenge-details/index.html;               
+        index /challenge-details/index.html;
     }
 
     location ~ ^/challenge-details/register(.*) {
@@ -46,7 +54,7 @@ server {
 
     location /my-dashboard {
         try_files $uri /my-dashboard/index.html;
-        root $root_base/dist/html;       
+        root $root_base/dist/html;
     }
 
     location ~ ^/js/ {
diff --git a/src/footer.html b/src/footer.html
@@ -6,7 +6,7 @@
     <ul class="submenu">
       <li class="submenu-item"><a ng-click="$event.stopPropagation();" href="/sitemap" class="menu-link">SITEMAP</a></li>
       <li class="submenu-item"><a ng-click="$event.stopPropagation();" href="/about" class="menu-link">ABOUT US</a></li>
-      <li class="submenu-item"><a ng-click="$event.stopPropagation();" href="/contact-us" class="menu-link">CONTACT US</a></li>
+      <li class="submenu-item"><a ng-click="$event.stopPropagation();" href="http://help.topcoder.com/hc/en-us/articles/219069687-Contact-Support" class="menu-link">CONTACT US</a></li>
       <li class="submenu-item"><a ng-click="$event.stopPropagation();" href="http://help.topcoder.com" target="_blank" class="menu-link">HELP CENTER</a></li>
       <li class="submenu-item"><a ng-click="$event.stopPropagation();" href="http://topcoder.com/community/how-it-works/privacy-policy/" class="menu-link">PRIVACY POLICY</a></li>
       <li class="submenu-item"><a ng-click="$event.stopPropagation();" href="http://topcoder.com/community/how-it-works/terms/" class="menu-link">TERMS</a></li>
diff --git a/src/js/app/challenges/services/challengeService.js b/src/js/app/challenges/services/challengeService.js
@@ -186,7 +186,7 @@
             // Add My Challenges Filter and Improve Filters challenge -- different api endpoint
             return UserChallengesService.getUserChallenges(listType === 'user-past' ? 'past' : 'active', params);
           } else {
-            params.review = 'COMMUNITY,INTERNAL';
+            params.review = 'COMMUNITY,INTERNAL,PEER';
             return Restangular.one('challenges').getList(listType, params);
           }
         }
@@ -378,4 +378,4 @@
           RestangularConfigurer.setBaseUrl(API_URL + '/dataScience/challenges');
         });
       }]);
-}(angular));
+}(angular));
diff --git a/wp/wp-content/themes/tcs-responsive/footer.php b/wp/wp-content/themes/tcs-responsive/footer.php
@@ -231,6 +231,11 @@ function _kms(u){
 </script>
 <!-- END KISSmetrics -->
 
+<!-- Start of topcoder Zendesk Widget script -->
+<script>/*<![CDATA[*/window.zEmbed||function(e,t){var n,o,d,i,s,a=[],r=document.createElement("iframe");window.zEmbed=function(){a.push(arguments)},window.zE=window.zE||window.zEmbed,r.src="javascript:false",r.title="",r.role="presentation",(r.frameElement||r).style.cssText="display: none",d=document.getElementsByTagName("script"),d=d[d.length-1],d.parentNode.insertBefore(r,d),i=r.contentWindow,s=i.document;try{o=s}catch(c){n=document.domain,r.src='javascript:var d=document.open();d.domain="'+n+'";void(0);',o=s}o.open()._l=function(){var o=this.createElement("script");n&&(this.domain=n),o.id="js-iframe-async",o.src=e,this.t=+new Date,this.zendeskHost=t,this.zEQueue=a,this.body.appendChild(o)},o.write('<body onload="document._l();">'),o.close()}("https://assets.zendesk.com/embeddable_framework/main.js","topcoder.zendesk.com");
+/*]]>*/</script>
+<!-- End of topcoder Zendesk Widget script -->
+
 <script>
 (function() {
   var headerApp = angular.module('tc.header', [])

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@`
`186`	`186`	`// Add My Challenges Filter and Improve Filters challenge -- different api endpoint`
`187`	`187`	`return UserChallengesService.getUserChallenges(listType === 'user-past' ? 'past' : 'active', params);`
`188`	`188`	`} else {`
`189`		`- params.review = 'COMMUNITY,INTERNAL';`
	`189`	`+ params.review = 'COMMUNITY,INTERNAL,PEER';`
`190`	`190`	`return Restangular.one('challenges').getList(listType, params);`
`191`	`191`	`}`
`192`	`192`	`}`
`@@ -378,4 +378,4 @@`
`378`	`378`	`RestangularConfigurer.setBaseUrl(API_URL + '/dataScience/challenges');`
`379`	`379`	`});`
`380`	`380`	`}]);`
`381`		`-}(angular));`
	`381`	`+}(angular));`