From 390532b586bf2a0378f0e90b731e49543a0a0ff0 Mon Sep 17 00:00:00 2001
From: Proper Name <name@domain.com>
Date: Thu, 9 Jun 2016 15:22:58 +0200
Subject: [PATCH 01/20] Signed-off-by: Tom Ladendorf <tom@tomladendorf.com>

---
 src/conf/tc-nginx.conf                         | 12 +++++++++++-
 src/footer.html                                |  9 +++++++++
 src/js/app/challenge-details/app.js            | 11 +++++++++--
 src/js/app/challenges/module-challenges.js     | 11 +++++++++--
 wp/wp-content/themes/tcs-responsive/footer.php |  9 +++++++++
 5 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/src/conf/tc-nginx.conf b/src/conf/tc-nginx.conf
index f644fa37..cc9dac87 100644
--- a/src/conf/tc-nginx.conf
+++ b/src/conf/tc-nginx.conf
@@ -1,4 +1,6 @@
 #include this file in your http block
+map_hash_bucket_size 128;
+
 upstream rss {
     server tc1-rss-service.herokuapp.com:443;
     ## server localhost:3333;
@@ -8,15 +10,23 @@ upstream www {
     server www.topcoder.com:443;
 }
 
+map $http_origin $cors_header {
+    default "";
+    "~(local|member\.local)\.(topcoder|topcoder-dev|topcoder-qa)\.com$" "$http_origin";
+}
+
 server {
     listen  80;
-    server_name  local.topcoder.com local.topcoder-dev.com local.topcoder-qa.com;
+    server_name  member.local.topcoder.com local.topcoder.com member.local.topcoder-dev.com local.topcoder-dev.com member.local.topcoder-qa.com local.topcoder-qa.com;
     charset UTF-8;
 
     set $app_base /home/vagrant;            ## CHANGE ME root apps folder reference 
     set $root_base $app_base/tc-site;
     set $app_review_base $app_base/ap-app-review;            
     root $root_base/wp;
+    
+    add_header 'Access-Control-Allow-Origin' "$cors_header";
+    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PUT, PATCH, DELETE';
 
     client_max_body_size 20M;
 
diff --git a/src/footer.html b/src/footer.html
index ff105b7b..a374f57a 100644
--- a/src/footer.html
+++ b/src/footer.html
@@ -153,6 +153,15 @@ <h2>Comment Examples</h2>
 <script>
 (function() {
   var headerApp = angular.module('tc.header', [])
+  headerApp.config(function($sceDelegateProvider) {
+    $sceDelegateProvider.resourceUrlWhitelist([
+      // Allow same origin resource loads.
+      'self',
+      // Allow loading from subdomains.  Notice the difference between * and **.
+      'http://*.topcoder.com/**',
+      'https://*.topcoder.com/**'
+    ]);
+  });
   headerApp.directive('ngHeaderBootstrap', function(){
     return {
       restrict: 'C',
diff --git a/src/js/app/challenge-details/app.js b/src/js/app/challenge-details/app.js
index 2ec94381..591e05fa 100644
--- a/src/js/app/challenge-details/app.js
+++ b/src/js/app/challenge-details/app.js
@@ -33,8 +33,15 @@
     .config(['cfpLoadingBarProvider', function(cfpLoadingBarProvider) {
       cfpLoadingBarProvider.includeSpinner = false;
     }])
-    .config(['$locationProvider',
-      function ($locationProvider) {
+    .config(['$locationProvider', '$sceDelegateProvider',
+      function ($locationProvider, $sceDelegateProvider) {
+        $sceDelegateProvider.resourceUrlWhitelist([
+          // Allow same origin resource loads.
+          'self',
+          // Allow loading from subdomains.  Notice the difference between * and **.
+          'http://*.topcoder.com/**',
+          'https://*.topcoder.com/**'
+        ]);        
         $locationProvider.html5Mode(true);
     }])
   .config(DataPreProcessing);
diff --git a/src/js/app/challenges/module-challenges.js b/src/js/app/challenges/module-challenges.js
index 6ced261a..da2d6643 100644
--- a/src/js/app/challenges/module-challenges.js
+++ b/src/js/app/challenges/module-challenges.js
@@ -3,8 +3,15 @@
     
   'use strict';
   var challengesModule = angular.module('tc.challenges', ['ngRoute', 'ngCookies']);
-  challengesModule.config(['$httpProvider', '$routeProvider', '$locationProvider',
-  function ($httpProvider, $routeProvider, $locationProvider) {
+  challengesModule.config(['$httpProvider', '$routeProvider', '$locationProvider', '$sceDelegateProvider',
+  function ($httpProvider, $routeProvider, $locationProvider, $sceDelegateProvider) {  
+    $sceDelegateProvider.resourceUrlWhitelist([
+      // Allow same origin resource loads.
+      'self',
+      // Allow loading from subdomains.  Notice the difference between * and **.
+      'http://*.topcoder.com/**',
+      'https://*.topcoder.com/**'
+    ]);
 
     $locationProvider.html5Mode(true).hashPrefix('!');
 
diff --git a/wp/wp-content/themes/tcs-responsive/footer.php b/wp/wp-content/themes/tcs-responsive/footer.php
index b406d374..2d5de75a 100644
--- a/wp/wp-content/themes/tcs-responsive/footer.php
+++ b/wp/wp-content/themes/tcs-responsive/footer.php
@@ -239,6 +239,15 @@ function _kms(u){
 <script>
 (function() {
   var headerApp = angular.module('tc.header', [])
+  headerApp.config(function($sceDelegateProvider) {
+    $sceDelegateProvider.resourceUrlWhitelist([
+      // Allow same origin resource loads.
+      'self',
+      // Allow loading from subdomains.  Notice the difference between * and **.
+      'http://*.topcoder.com/**',
+      'https://*.topcoder.com/**'
+    ]);
+  });
   headerApp.directive('ngHeaderBootstrap', function(){
     return {
       restrict: 'C',

From 2ebde1ac53e009ddb7707f22ad48b31bfa72b9a9 Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Fri, 10 Jun 2016 16:33:04 +0200
Subject: [PATCH 02/20] fixed base URLs for challenge listings

---
 wp/wp-content/themes/tcs-responsive/ng-page-challenges.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp/wp-content/themes/tcs-responsive/ng-page-challenges.php b/wp/wp-content/themes/tcs-responsive/ng-page-challenges.php
index 4c2a1c99..6d6124ca 100644
--- a/wp/wp-content/themes/tcs-responsive/ng-page-challenges.php
+++ b/wp/wp-content/themes/tcs-responsive/ng-page-challenges.php
@@ -19,7 +19,7 @@
  */
 
 function add_base_url() {
-  $output = "<base href=\"" . get_site_url() . "/" . ACTIVE_CONTESTS_PERMALINK . "/\" />";
+  $output = "<base href=\"" . "/" . ACTIVE_CONTESTS_PERMALINK . "/\" />";
   echo $output;
 }
 

From 8ddf4f14c53588835b44a404c8f9657867b2f41b Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Tue, 14 Jun 2016 14:22:11 +0200
Subject: [PATCH 03/20] Copied nginx config changes to prod config

---
 src/conf/tc-prod-nginx.conf | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/conf/tc-prod-nginx.conf b/src/conf/tc-prod-nginx.conf
index e33c827b..ec63de3b 100644
--- a/src/conf/tc-prod-nginx.conf
+++ b/src/conf/tc-prod-nginx.conf
@@ -1,10 +1,18 @@
+map_hash_bucket_size 128;
+
 upstream rss {
     server tc1-rss-service.herokuapp.com:443;
 }
 
+map $http_origin $cors_header {
+    default "";
+    "~(member)\.(topcoder|topcoder-dev|topcoder-qa)\.com$" "$http_origin";
+}
+
 server {
 	listen 80 default_server;
 	listen 8080 default_server;
+  server_name  member.topcoder.com topcoder.com member.topcoder-dev.com topcoder-dev.com member.topcoder-qa.com topcoder-qa.com;
 	listen [::]:80 default_server ipv6only=on;
 	listen [::]:8080 default_server ipv6only=on;
     charset UTF-8;
@@ -16,6 +24,9 @@ server {
    	set $root_base /home/ubuntu/tc-site;
     root $root_base/wp;
 
+    add_header 'Access-Control-Allow-Origin' "$cors_header";
+    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PUT, PATCH, DELETE';
+
     client_max_body_size 100M;
 
     location  = / {
@@ -99,4 +110,4 @@ server {
     }
 
 	include /etc/nginx/drop.conf;
-}
\ No newline at end of file
+}

From e9599321353ca97d6e4b97ec58cffa49d220c047 Mon Sep 17 00:00:00 2001
From: TonyJ <tjefts@appirio.com>
Date: Tue, 14 Jun 2016 10:27:01 -0400
Subject: [PATCH 04/20] changed to member.topcoder...

---
 src/conf/build-dev.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf/build-dev.sh b/src/conf/build-dev.sh
index 56fef5e5..2f03949f 100755
--- a/src/conf/build-dev.sh
+++ b/src/conf/build-dev.sh
@@ -1 +1 @@
-grunt --main-url=https://www.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=https://www.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=apps.topcoder-dev.com/forums/ --swift-program-id=3445 --swift-program-url=http://ios.topcoder-dev.com --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1
+grunt --main-url=https://member.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=https://www.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=apps.topcoder-dev.com/forums/ --swift-program-id=3445 --swift-program-url=http://ios.topcoder-dev.com --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1

From 302f475df810a85bd83c5bc492c364b8f1ebb757 Mon Sep 17 00:00:00 2001
From: TonyJ <tjefts@appirio.com>
Date: Tue, 14 Jun 2016 10:33:59 -0400
Subject: [PATCH 05/20] reverting www to member change

---
 src/conf/build-dev.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf/build-dev.sh b/src/conf/build-dev.sh
index 2f03949f..56fef5e5 100755
--- a/src/conf/build-dev.sh
+++ b/src/conf/build-dev.sh
@@ -1 +1 @@
-grunt --main-url=https://member.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=https://www.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=apps.topcoder-dev.com/forums/ --swift-program-id=3445 --swift-program-url=http://ios.topcoder-dev.com --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1
+grunt --main-url=https://www.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=https://www.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=apps.topcoder-dev.com/forums/ --swift-program-id=3445 --swift-program-url=http://ios.topcoder-dev.com --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1

From 57a46d50daf5f92f05b4330e7a85eb3ff25fac52 Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Thu, 16 Jun 2016 15:16:01 +0200
Subject: [PATCH 06/20] Changes for dev

---
 src/footer.html                                | 6 +++++-
 src/js/app/challenge-details/app.js            | 6 +++++-
 src/js/app/challenges/module-challenges.js     | 6 +++++-
 wp/wp-content/themes/tcs-responsive/footer.php | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/footer.html b/src/footer.html
index a374f57a..2d912639 100644
--- a/src/footer.html
+++ b/src/footer.html
@@ -159,7 +159,11 @@ <h2>Comment Examples</h2>
       'self',
       // Allow loading from subdomains.  Notice the difference between * and **.
       'http://*.topcoder.com/**',
-      'https://*.topcoder.com/**'
+      'https://*.topcoder.com/**',
+      'http://*.topcoder-qa.com/**',
+      'https://*.topcoder-qa.com/**',
+      'http://*.topcoder-dev.com/**',
+      'https://*.topcoder-dev.com/**'
     ]);
   });
   headerApp.directive('ngHeaderBootstrap', function(){
diff --git a/src/js/app/challenge-details/app.js b/src/js/app/challenge-details/app.js
index 591e05fa..9ddc8fea 100644
--- a/src/js/app/challenge-details/app.js
+++ b/src/js/app/challenge-details/app.js
@@ -40,7 +40,11 @@
           'self',
           // Allow loading from subdomains.  Notice the difference between * and **.
           'http://*.topcoder.com/**',
-          'https://*.topcoder.com/**'
+          'https://*.topcoder.com/**',
+          'http://*.topcoder-qa.com/**',
+          'https://*.topcoder-qa.com/**',
+          'http://*.topcoder-dev.com/**',
+          'https://*.topcoder-dev.com/**'
         ]);        
         $locationProvider.html5Mode(true);
     }])
diff --git a/src/js/app/challenges/module-challenges.js b/src/js/app/challenges/module-challenges.js
index da2d6643..957254d1 100644
--- a/src/js/app/challenges/module-challenges.js
+++ b/src/js/app/challenges/module-challenges.js
@@ -10,7 +10,11 @@
       'self',
       // Allow loading from subdomains.  Notice the difference between * and **.
       'http://*.topcoder.com/**',
-      'https://*.topcoder.com/**'
+      'https://*.topcoder.com/**',
+      'http://*.topcoder-qa.com/**',
+      'https://*.topcoder-qa.com/**',
+      'http://*.topcoder-dev.com/**',
+      'https://*.topcoder-dev.com/**'
     ]);
 
     $locationProvider.html5Mode(true).hashPrefix('!');
diff --git a/wp/wp-content/themes/tcs-responsive/footer.php b/wp/wp-content/themes/tcs-responsive/footer.php
index 2d5de75a..e0c3c447 100644
--- a/wp/wp-content/themes/tcs-responsive/footer.php
+++ b/wp/wp-content/themes/tcs-responsive/footer.php
@@ -245,7 +245,11 @@ function _kms(u){
       'self',
       // Allow loading from subdomains.  Notice the difference between * and **.
       'http://*.topcoder.com/**',
-      'https://*.topcoder.com/**'
+      'https://*.topcoder.com/**',
+      'http://*.topcoder-qa.com/**',
+      'https://*.topcoder-qa.com/**',
+      'http://*.topcoder-dev.com/**',
+      'https://*.topcoder-dev.com/**'
     ]);
   });
   headerApp.directive('ngHeaderBootstrap', function(){

From fa54c69cbcc47d29130eea73d2b0ecdbad5d0ddc Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Thu, 16 Jun 2016 15:24:55 +0200
Subject: [PATCH 07/20] change member to members

---
 src/conf/tc-nginx.conf      | 4 ++--
 src/conf/tc-prod-nginx.conf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/conf/tc-nginx.conf b/src/conf/tc-nginx.conf
index cc9dac87..98bd354a 100644
--- a/src/conf/tc-nginx.conf
+++ b/src/conf/tc-nginx.conf
@@ -12,12 +12,12 @@ upstream www {
 
 map $http_origin $cors_header {
     default "";
-    "~(local|member\.local)\.(topcoder|topcoder-dev|topcoder-qa)\.com$" "$http_origin";
+    "~(local|members\.local)\.(topcoder|topcoder-dev|topcoder-qa)\.com$" "$http_origin";
 }
 
 server {
     listen  80;
-    server_name  member.local.topcoder.com local.topcoder.com member.local.topcoder-dev.com local.topcoder-dev.com member.local.topcoder-qa.com local.topcoder-qa.com;
+    server_name  members.local.topcoder.com local.topcoder.com members.local.topcoder-dev.com local.topcoder-dev.com members.local.topcoder-qa.com local.topcoder-qa.com;
     charset UTF-8;
 
     set $app_base /home/vagrant;            ## CHANGE ME root apps folder reference 
diff --git a/src/conf/tc-prod-nginx.conf b/src/conf/tc-prod-nginx.conf
index ec63de3b..f377783a 100644
--- a/src/conf/tc-prod-nginx.conf
+++ b/src/conf/tc-prod-nginx.conf
@@ -6,13 +6,13 @@ upstream rss {
 
 map $http_origin $cors_header {
     default "";
-    "~(member)\.(topcoder|topcoder-dev|topcoder-qa)\.com$" "$http_origin";
+    "~(members)\.(topcoder|topcoder-dev|topcoder-qa)\.com$" "$http_origin";
 }
 
 server {
 	listen 80 default_server;
 	listen 8080 default_server;
-  server_name  member.topcoder.com topcoder.com member.topcoder-dev.com topcoder-dev.com member.topcoder-qa.com topcoder-qa.com;
+  server_name  members.topcoder.com topcoder.com members.topcoder-dev.com topcoder-dev.com members.topcoder-qa.com topcoder-qa.com;
 	listen [::]:80 default_server ipv6only=on;
 	listen [::]:8080 default_server ipv6only=on;
     charset UTF-8;

From 8bc8c94f5a0e21792391b15e1af9618108a14ec3 Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Wed, 22 Jun 2016 18:06:35 +0200
Subject: [PATCH 08/20] add www to conf

---
 src/conf/tc-prod-nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf/tc-prod-nginx.conf b/src/conf/tc-prod-nginx.conf
index f377783a..e8e97e68 100644
--- a/src/conf/tc-prod-nginx.conf
+++ b/src/conf/tc-prod-nginx.conf
@@ -6,7 +6,7 @@ upstream rss {
 
 map $http_origin $cors_header {
     default "";
-    "~(members)\.(topcoder|topcoder-dev|topcoder-qa)\.com$" "$http_origin";
+    "~(www|members)\.(topcoder|topcoder-dev|topcoder-qa)\.com$" "$http_origin";
 }
 
 server {

From d78de90440ebbe84d6ce5e185a3548a6857d6e0d Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Wed, 22 Jun 2016 18:27:04 +0200
Subject: [PATCH 09/20] more conf changes

---
 src/conf/tc-prod-nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf/tc-prod-nginx.conf b/src/conf/tc-prod-nginx.conf
index e8e97e68..2feefffa 100644
--- a/src/conf/tc-prod-nginx.conf
+++ b/src/conf/tc-prod-nginx.conf
@@ -6,7 +6,7 @@ upstream rss {
 
 map $http_origin $cors_header {
     default "";
-    "~(www|members)\.(topcoder|topcoder-dev|topcoder-qa)\.com$" "$http_origin";
+    "~^https?://(www|members)\.(topcoder|topcoder-dev|topcoder-qa)\.com$" "$http_origin";
 }
 
 server {

From 9764c83fdd27710a85d7656d169f5e361117febf Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Thu, 23 Jun 2016 18:05:03 +0200
Subject: [PATCH 10/20] modify regex

---
 src/conf/tc-prod-nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf/tc-prod-nginx.conf b/src/conf/tc-prod-nginx.conf
index 2feefffa..e8e97e68 100644
--- a/src/conf/tc-prod-nginx.conf
+++ b/src/conf/tc-prod-nginx.conf
@@ -6,7 +6,7 @@ upstream rss {
 
 map $http_origin $cors_header {
     default "";
-    "~^https?://(www|members)\.(topcoder|topcoder-dev|topcoder-qa)\.com$" "$http_origin";
+    "~(www|members)\.(topcoder|topcoder-dev|topcoder-qa)\.com$" "$http_origin";
 }
 
 server {

From 64ccce02a0f50189acb0fff1f1ca027c95f8be1a Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Mon, 18 Jul 2016 17:43:34 +0200
Subject: [PATCH 11/20] attempt to fix login

---
 .../js/controllers/challenge-details-controller.js             | 3 ++-
 src/js/app/header/partials/header-nav.html                     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
index e47ace2e..8325be74 100644
--- a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
+++ b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
@@ -218,7 +218,8 @@
           path: '/',
           domain: '.' + tcconfig.domain
         });
-        $('.actionLogin').click();
+        $('.tc-header-login').click();
+        console.log('yo!');
       }
 
 
diff --git a/src/js/app/header/partials/header-nav.html b/src/js/app/header/partials/header-nav.html
index c621c551..2a8be93c 100644
--- a/src/js/app/header/partials/header-nav.html
+++ b/src/js/app/header/partials/header-nav.html
@@ -41,7 +41,7 @@
         </div>
         <div ng-switch-when="false" class="menu-item-header">
           <a href="/register" class="tc-btn tc-btn-s btn-link">JOIN</a>
-          <a ng-click="vm.login()" class="tc-btn tc-btn-s tc-btn-ghost btn-link">LOG IN</a>
+          <a ng-click="vm.login()" class="tc-btn tc-btn-s tc-btn-ghost btn-link tc-header-login">LOG IN</a>
         </div>
       </li>
       <li ng-repeat="header in vm.menuHeaders" class="menu-item link-group">

From fe0f4c5b08a1a7aa7ce518f1fef74d8207ddaabf Mon Sep 17 00:00:00 2001
From: thkang91 <thkang91@gmail.com>
Date: Thu, 28 Jul 2016 02:19:12 +0900
Subject: [PATCH 12/20] allow subdomains for submissions module

Signed-off-by: Tom Ladendorf <tom@tomladendorf.com>
---
 src/js/app/submission-upload/app.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/js/app/submission-upload/app.js b/src/js/app/submission-upload/app.js
index 424cfb4e..de1e4336 100644
--- a/src/js/app/submission-upload/app.js
+++ b/src/js/app/submission-upload/app.js
@@ -25,6 +25,22 @@
 
   .constant("API_URL", tcconfig.apiURL)
 
+  .config(['$locationProvider', '$sceDelegateProvider',
+    function ($locationProvider, $sceDelegateProvider) {
+      $sceDelegateProvider.resourceUrlWhitelist([
+        // Allow same origin resource loads.
+        'self',
+        // Allow loading from subdomains.  Notice the difference between * and **.
+        'http://*.topcoder.com/**',
+        'https://*.topcoder.com/**',
+        'http://*.topcoder-qa.com/**',
+        'https://*.topcoder-qa.com/**',
+        'http://*.topcoder-dev.com/**',
+        'https://*.topcoder-dev.com/**'
+      ]);        
+      $locationProvider.html5Mode(true);
+  }])
+  
   .config(DataPreProcessing);
 
   DataPreProcessing.$inject = ['$httpProvider', 'RestangularProvider', 'API_URL'];

From bb0cb11a08df355179f0dad8c77e0f93bb2e51ac Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Thu, 28 Jul 2016 14:44:08 +0200
Subject: [PATCH 13/20] Updated links to siteURL based on presence of member
 subdomain

---
 src/header.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/header.html b/src/header.html
index 73168fd1..2e6a6afd 100644
--- a/src/header.html
+++ b/src/header.html
@@ -23,6 +23,11 @@
     var myFiltersURL = tcconfig.myFiltersURL;
 
     var siteURL = tcconfig.mainURL;
+
+    if (!location.hostname.search('members')) {
+      siteURL = 'https://' + location.hostname;
+    }
+
     var communityURL = tcconfig.communityURL;
     
     var base_url = tcconfig.mainURL + '/wp-content/themes/tcs-responsive'; // can use '' ?

From 14900d2fc4de2a327159d1b2e6ab2c4fceaf7732 Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Thu, 28 Jul 2016 14:47:51 +0200
Subject: [PATCH 14/20] comment out siteurl stuff

---
 src/header.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/header.html b/src/header.html
index 2e6a6afd..3b62d6c4 100644
--- a/src/header.html
+++ b/src/header.html
@@ -24,9 +24,9 @@
 
     var siteURL = tcconfig.mainURL;
 
-    if (!location.hostname.search('members')) {
-      siteURL = 'https://' + location.hostname;
-    }
+    //if (!location.hostname.search('members')) {
+    //  siteURL = 'https://' + location.hostname;
+    //}
 
     var communityURL = tcconfig.communityURL;
     

From fa46df12e2a8e6ce4bbc6a25549a8c9f3562afc3 Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Thu, 28 Jul 2016 14:52:18 +0200
Subject: [PATCH 15/20] try removing siteURL

---
 src/js/app/challenge-details/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/app/challenge-details/index.html b/src/js/app/challenge-details/index.html
index 328dff32..e5fd10d4 100644
--- a/src/js/app/challenge-details/index.html
+++ b/src/js/app/challenge-details/index.html
@@ -618,7 +618,7 @@ <h2>Reliability Rating and Bonus</h2>
                 <tr ng-repeat="registrant in CD.challenge.registrants | orderBy:'registrationDate'">
                   <td ng-class="CD.challengeType == 'design' ? 'handleColumnDesign' : 'handleColumn'">
                     <span>
-                        <a ng-href="{{CD.siteURL + '/member-profile/' + registrant.handle}}" ng-bind="registrant.handle"></a>
+                        <a ng-href="{{'/member-profile/' + registrant.handle}}" ng-bind="registrant.handle"></a>
                     </span>
                   </td>
                   <td ng-if="!CD.isDesign" class="ratingColumn">

From 4cc084316993eca72172db160d5bf23e5e842ed8 Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Thu, 28 Jul 2016 15:09:52 +0200
Subject: [PATCH 16/20] removed siteURL reference

---
 .../js/controllers/challenge-details-controller.js              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
index 8325be74..0c16cde7 100644
--- a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
+++ b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
@@ -203,7 +203,7 @@
               }
             }, function (reason) {
               if (reason["error"]["details"] === "You should agree with all terms of use.") {
-                window.location = siteURL + "/challenge-details/terms/" + vm.challenge.challengeId + "?challenge-type=" + challengeType;
+                window.location = "/challenge-details/terms/" + vm.challenge.challengeId + "?challenge-type=" + challengeType;
               } else if (reason["error"]["details"]) {
                 showError(reason["error"]["details"]);
               }

From 6c14626c4ec281efb5cc836a186b5bb8bc0cb454 Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Thu, 28 Jul 2016 15:10:56 +0200
Subject: [PATCH 17/20] cleanup

---
 src/header.html                                               | 4 ----
 .../js/controllers/challenge-details-controller.js            | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/header.html b/src/header.html
index 3b62d6c4..c79a372d 100644
--- a/src/header.html
+++ b/src/header.html
@@ -24,10 +24,6 @@
 
     var siteURL = tcconfig.mainURL;
 
-    //if (!location.hostname.search('members')) {
-    //  siteURL = 'https://' + location.hostname;
-    //}
-
     var communityURL = tcconfig.communityURL;
     
     var base_url = tcconfig.mainURL + '/wp-content/themes/tcs-responsive'; // can use '' ?
diff --git a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
index 0c16cde7..7c46fbce 100644
--- a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
+++ b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
@@ -219,7 +219,6 @@
           domain: '.' + tcconfig.domain
         });
         $('.tc-header-login').click();
-        console.log('yo!');
       }
 
 

From 938d64b2158995b286b9a9f623fed34dee28bbc5 Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Mon, 1 Aug 2016 14:49:02 +0200
Subject: [PATCH 18/20] fixed link for submissions

---
 src/js/app/challenge-details/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/app/challenge-details/index.html b/src/js/app/challenge-details/index.html
index e5fd10d4..9060667a 100644
--- a/src/js/app/challenge-details/index.html
+++ b/src/js/app/challenge-details/index.html
@@ -22,14 +22,14 @@
                 <span>1</span> <strong>Register For This Challenge</strong>
             </a>
             <a ng-show="CD.isDesign" ng-class="{disabled:CD.challenge.submissionDisabled || !CD.callComplete, disabledNOT:!CD.challenge.submissionDisabled}" class="btn btnAction" target="_blank"
-               ng-href="//www.{{CD.domain}}//challenges/{{CD.challenge.challengeId}}/submit/file">
+               ng-href="/challenges/{{CD.challenge.challengeId}}/submit/file">
                 <span>2</span> <strong>Submit Your Entries</strong>
             </a>
             <a ng-show="CD.isDesign" ng-class="{disabled:CD.challenge.submissionDisabled || !CD.callComplete, disabledNOT:!CD.challenge.submissionDisabled}" class="btn btnAction" target="_blank"
                ng-href="//studio.{{CD.domain}}/?module=ViewSubmission&ct={{CD.challenge.challengeId}}">
                 <span>3</span> <strong>View Your Submission</strong>
             </a>
-            <a ng-show="!CD.isDesign && CD.isPeerReviewed" ng-class="{disabled:CD.challenge.peerReviewDisabled || !CD.callComplete, disabledNOT:!CD.challenge.peerReviewDisabled}" class="btn btnAction" ng-href="//www.{{CD.domain}}/challenges/{{CD.challenge.challengeId}}/reviews/" target="_blank">
+            <a ng-show="!CD.isDesign && CD.isPeerReviewed" ng-class="{disabled:CD.challenge.peerReviewDisabled || !CD.callComplete, disabledNOT:!CD.challenge.peerReviewDisabled}" class="btn btnAction" ng-href="/challenges/{{CD.challenge.challengeId}}/reviews/" target="_blank">
                 <span>3</span><strong>Review This Challenge</strong>
             </a>
           </div>

From 664ebb22f65e9ec490fb40cd168b5640e723bcd0 Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Thu, 4 Aug 2016 15:51:42 +0200
Subject: [PATCH 19/20] fixed terms link

---
 src/js/challenge-detail-software.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/challenge-detail-software.js b/src/js/challenge-detail-software.js
index a6c9c5d5..f1ae72a6 100644
--- a/src/js/challenge-detail-software.js
+++ b/src/js/challenge-detail-software.js
@@ -389,7 +389,7 @@ $(function () {
           if (data["message"] === "ok") {
             showModal("#registerSuccess");
           } else if (data["error"]["details"] === "You should agree with all terms of use.") {
-            window.location = siteURL + "/challenge-details/terms/" + challengeId + "?challenge-type=" + challengeType;
+            window.location = "/challenge-details/terms/" + challengeId + "?challenge-type=" + challengeType;
           } else if (data["error"]["details"]) {
             $("#registerFailed .failedMessage").text(data["error"]["details"]);
             showModal("#registerFailed");

From 7605aa67202f794d47ba520b1293f2d755cc88f6 Mon Sep 17 00:00:00 2001
From: thkang91 <thkang91@gmail.com>
Date: Sat, 6 Aug 2016 03:09:50 +0900
Subject: [PATCH 20/20] load header-nav templates from same domain

---
 src/footer.html                                | 2 +-
 wp/wp-content/themes/tcs-responsive/footer.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/footer.html b/src/footer.html
index 2d912639..22a83d29 100644
--- a/src/footer.html
+++ b/src/footer.html
@@ -169,7 +169,7 @@ <h2>Comment Examples</h2>
   headerApp.directive('ngHeaderBootstrap', function(){
     return {
       restrict: 'C',
-      templateUrl: tcconfig.mainURL + '/mf/js/app/header/partials/header-nav.html',
+      templateUrl: '/mf/js/app/header/partials/header-nav.html',
       controller: function($scope, $timeout){
         $scope.vm = vm = {};
         $scope.main = {};
diff --git a/wp/wp-content/themes/tcs-responsive/footer.php b/wp/wp-content/themes/tcs-responsive/footer.php
index e0c3c447..0b13d96e 100644
--- a/wp/wp-content/themes/tcs-responsive/footer.php
+++ b/wp/wp-content/themes/tcs-responsive/footer.php
@@ -255,7 +255,7 @@ function _kms(u){
   headerApp.directive('ngHeaderBootstrap', function(){
     return {
       restrict: 'C',
-      templateUrl: tcconfig.mainURL + '/mf/js/app/header/partials/header-nav.html',
+      templateUrl: '/mf/js/app/header/partials/header-nav.html',
       controller: function($scope, $timeout){
         $scope.vm = vm = {};
         $scope.main = {};