Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
e8e85ad
remove prerender.io proxy (now handled by nginx)
thabofletcher Jun 17, 2015
9f72b6e
SUP-1050, Hitting back button after any my-dashboard link breaks my-d…
vikasrohit Jul 20, 2015
bdd1bff
Merge pull request #137 from appirio-tech/vikas-sup-1050-dashboard-ba…
thabofletcher Jul 24, 2015
b47694f
SUP-1165 js redirections for login/reg modals on app
thabofletcher Jul 31, 2015
c243805
Merge pull request #138 from appirio-tech/SUP-318-login-reg-app
thabofletcher Jul 31, 2015
8133cda
add utm params to register api call
thabofletcher Aug 3, 2015
3120351
Merge pull request #139 from appirio-tech/SUP-1153-utm-params
thabofletcher Aug 3, 2015
ef6ed6c
pass current page as next param on to /login whenever login is clicked
thabofletcher Aug 12, 2015
f0a7a04
Merge pull request #144 from appirio-tech/SUP-318-login-reg-next-flow
thabofletcher Aug 12, 2015
185ccd5
use encodeURIComponent rather than escape
thabofletcher Aug 14, 2015
89eb8ad
Merge pull request #145 from appirio-tech/SUP-318-login-reg-next-flow
thabofletcher Aug 14, 2015
12f28c8
Merge branch 'master' of https://github.com/appirio-tech/tc-site into…
thabofletcher Aug 24, 2015
088488e
remove digital run
thabofletcher Aug 24, 2015
0e42215
update data science links
thabofletcher Aug 24, 2015
b7b6817
Merge pull request #146 from appirio-tech/sup-1312-remove-dr
thabofletcher Aug 24, 2015
4adb667
Merge pull request #147 from appirio-tech/sup-1313-upcoming-srm-chall…
thabofletcher Aug 24, 2015
8ad9dc1
Merge branch 'release' of https://github.com/appirio-tech/tc-site int…
thabofletcher Aug 26, 2015
98fddef
Merge branch 'release' of https://github.com/appirio-tech/tc-site int…
thabofletcher Aug 26, 2015
981c45b
added homepage API default
dmessing Sep 15, 2015
806ce3e
added homepage API default
dmessing Sep 15, 2015
6b80006
Merge pull request #151 from appirio-tech/SUP-1410
thabofletcher Sep 16, 2015
178ef5e
Merge branch 'master' into dev
thabofletcher Sep 21, 2015
bfaf244
update qa build params (qa env impact only)
thabofletcher Sep 21, 2015
5ae37c8
updates to theme from community team
thabofletcher Sep 21, 2015
9bbb536
add new plugins for community team
thabofletcher Sep 21, 2015
543a51c
include css for master slider per community team
thabofletcher Sep 21, 2015
916aefa
more updates to theme from community team
thabofletcher Sep 21, 2015
5eb989c
updates from community team
thabofletcher Sep 21, 2015
a62fb90
add plugin for community team
thabofletcher Sep 25, 2015
0742a0d
updates to onboarding from community team
thabofletcher Sep 25, 2015
d99aaf7
updates from community team
thabofletcher Sep 28, 2015
3defe96
add plugin per community team
thabofletcher Sep 28, 2015
5e1d467
sup-1573 add wr plugin
thabofletcher Sep 30, 2015
1c52bed
Merge branch 'dev' of https://github.com/appirio-tech/tc-site into su…
thabofletcher Sep 30, 2015
618bd43
Merge pull request #154 from appirio-tech/sup-1780-saved-searches-fix
thabofletcher Oct 1, 2015
8a93c37
updates from community team
thabofletcher Oct 2, 2015
ab00d4b
add plugin for community team
thabofletcher Oct 2, 2015
d0188f4
Merge branch 'master' of https://github.com/appirio-tech/tc-site into…
thabofletcher Oct 2, 2015
a77cf4a
Merge branch 'dev' of https://github.com/appirio-tech/tc-site into su…
thabofletcher Oct 2, 2015
fe0dd3b
Merge branch 'master' of https://github.com/appirio-tech/tc-site into…
thabofletcher Oct 2, 2015
a5873de
Merge branch 'dev' of https://github.com/appirio-tech/tc-site into su…
thabofletcher Oct 2, 2015
97febe7
include sofia pro
thabofletcher Oct 2, 2015
4875b3d
updates for community team
thabofletcher Oct 3, 2015
077dceb
updates for community team
thabofletcher Oct 5, 2015
985da6a
update for community team
thabofletcher Oct 5, 2015
ff56207
remove masterslider plugin per community team
thabofletcher Oct 8, 2015
c7e9126
update layer slider plugin per community team
thabofletcher Oct 8, 2015
cad6eec
updates from community team
thabofletcher Oct 8, 2015
6ac8cdd
member onboarding updates from community
thabofletcher Oct 8, 2015
096307e
top level ui from topcoder-app
thabofletcher Oct 9, 2015
402278e
updates per community
thabofletcher Oct 9, 2015
b3250e9
nav icons
thabofletcher Oct 10, 2015
7903eda
some angular working in header
thabofletcher Oct 10, 2015
a5ad9bb
nav menu functional
thabofletcher Oct 10, 2015
a71adad
Merge pull request #157 from appirio-tech/sup-1498-onboarding
thabofletcher Oct 12, 2015
427ef43
updates from community team
thabofletcher Oct 13, 2015
b2bb8a6
Merge pull request #158 from appirio-tech/sup-1498-onboarding
thabofletcher Oct 13, 2015
17d20e6
Merge pull request #159 from appirio-tech/sup-1498-onboarding
thabofletcher Oct 13, 2015
35e6665
Merge branch 'release' of https://github.com/appirio-tech/tc-site int…
thabofletcher Oct 13, 2015
a7d3650
avoid this version of angular resorting the menu object
thabofletcher Oct 13, 2015
4a213dc
don't use default behavior for header link styles
thabofletcher Oct 13, 2015
256fb23
remove env specific links
thabofletcher Oct 13, 2015
c7d61e3
new nav on php pages
thabofletcher Oct 14, 2015
093f47d
Merge pull request #161 from appirio-tech/sup-1402-new-nav
thabofletcher Oct 14, 2015
f78d29d
fix template path
thabofletcher Oct 14, 2015
fd11ef6
Merge pull request #162 from appirio-tech/sup-1402-new-nav
thabofletcher Oct 14, 2015
9bdc0a8
updates from community team
thabofletcher Oct 14, 2015
d7a2c59
Merge pull request #163 from appirio-tech/sup-1498-onboarding
thabofletcher Oct 14, 2015
055a5bd
fix ng-hrefs to topcoder-app
thabofletcher Oct 14, 2015
4230721
fix search icon size
thabofletcher Oct 14, 2015
d203b24
remove existing challenge track navigation (sup-1475)
thabofletcher Oct 14, 2015
fbca3d9
local env nginx for charset utf8
thabofletcher Oct 14, 2015
9a4eb4c
fix active state for menu items
thabofletcher Oct 14, 2015
97afba1
fix links to my profile
thabofletcher Oct 14, 2015
fc679dc
set charset in nginx conf
thabofletcher Oct 14, 2015
18ed179
Merge pull request #165 from appirio-tech/sup-1402-new-nav
thabofletcher Oct 14, 2015
90d5dda
fix profile links (wp)
thabofletcher Oct 14, 2015
932014a
Merge pull request #166 from appirio-tech/sup-1402-new-nav
thabofletcher Oct 14, 2015
2a26441
external links open in new window
thabofletcher Oct 14, 2015
b40b6e0
undo accidental checkin
thabofletcher Oct 14, 2015
71a16ba
Merge pull request #167 from appirio-tech/sup-1402-new-nav
thabofletcher Oct 14, 2015
46b3935
fix mobile view
thabofletcher Oct 14, 2015
7dd282e
undo local checkin
thabofletcher Oct 14, 2015
23114d5
Merge pull request #168 from appirio-tech/sup-1402-new-nav
thabofletcher Oct 14, 2015
f2ca730
sup-1514 smooth animation
thabofletcher Oct 14, 2015
1eb189e
Merge pull request #169 from appirio-tech/sup-1402-new-nav
thabofletcher Oct 14, 2015
99d5be9
updates for community team
thabofletcher Oct 15, 2015
f0a879c
Merge pull request #170 from appirio-tech/sup-1498-onboarding
thabofletcher Oct 15, 2015
03bc68c
added plugin for communtiy
thabofletcher Oct 15, 2015
3036b63
Merge pull request #172 from appirio-tech/sup-1498-onboarding
thabofletcher Oct 15, 2015
0b850a9
Merge pull request #174 from appirio-tech/dev
thabofletcher Oct 15, 2015
79a7167
use new breakpoint from topcoder-app
thabofletcher Oct 15, 2015
0f0fd44
Merge pull request #175 from appirio-tech/sup-1402-new-nav
thabofletcher Oct 15, 2015
755ffd4
Merge pull request #176 from appirio-tech/dev
thabofletcher Oct 15, 2015
5088295
Merge pull request #177 from appirio-tech/SUP-415-seo-on-topcoder
thabofletcher Oct 16, 2015
c624232
updates for community team
thabofletcher Oct 16, 2015
1752f19
Merge pull request #178 from appirio-tech/sup-1498-onboarding
thabofletcher Oct 16, 2015
9e9e750
Merge pull request #179 from appirio-tech/dev
thabofletcher Oct 16, 2015
e77ed5f
fix footer links
thabofletcher Oct 16, 2015
a25ccc1
Merge pull request #180 from appirio-tech/sup-1782-footer-links
thabofletcher Oct 16, 2015
ba121be
Merge pull request #181 from appirio-tech/dev
thabofletcher Oct 16, 2015
1673272
fix angular binding
thabofletcher Oct 17, 2015
ccdd98a
yes thats right, this trailing space was causing an error. this is wh…
thabofletcher Oct 17, 2015
ecff19c
Merge pull request #183 from appirio-tech/fix-angular-binding
thabofletcher Oct 17, 2015
2880856
Merge pull request #184 from appirio-tech/sup-2161-blog-post-rss
thabofletcher Oct 17, 2015
395423a
Merge pull request #185 from appirio-tech/dev
thabofletcher Oct 17, 2015
6727e43
commit after all changes
shubhendusaurabh Oct 21, 2015
df7ab29
community update after style clean up
shubhendusaurabh Oct 22, 2015
873839f
updated after review
shubhendusaurabh Oct 24, 2015
dd804e8
after 2nd f2f review
shubhendusaurabh Oct 26, 2015
1ed1037
fix back button on challenge details
thabofletcher Oct 26, 2015
7c8ef8f
Merge pull request #188 from appirio-tech/sup-2265-challenge-details-…
thabofletcher Oct 26, 2015
2d88522
Merge pull request #189 from appirio-tech/dev
thabofletcher Oct 26, 2015
302d05e
Merge pull request #187 from shubhendusaurabh/community-after-style-c…
thabofletcher Oct 27, 2015
5d6512d
Revert "Community after style clean"
thabofletcher Oct 27, 2015
b44e53c
Merge pull request #190 from appirio-tech/revert-187-community-after-…
thabofletcher Oct 27, 2015
129cf45
footer from topcoder app
thabofletcher Oct 27, 2015
ef31f87
header style from topcoder app
thabofletcher Oct 28, 2015
4be01da
move sofia pro to where all pages can access
thabofletcher Oct 28, 2015
8c18521
update links per topcoder app changes
thabofletcher Oct 28, 2015
ce224ca
Merge pull request #191 from appirio-tech/sup-2266-nav-changes
thabofletcher Oct 28, 2015
06a1dac
Merge pull request #192 from appirio-tech/dev
thabofletcher Oct 28, 2015
65a181c
update icons per topcoder app
thabofletcher Oct 28, 2015
fb59067
fix join/login style
thabofletcher Oct 28, 2015
adecc69
fix sofia pro font stack
thabofletcher Oct 28, 2015
d3067fc
Merge pull request #193 from appirio-tech/sup-2266-nav-changes
thabofletcher Oct 28, 2015
63f41a5
Merge pull request #194 from appirio-tech/dev
thabofletcher Oct 28, 2015
e5bcec3
include plain review links for all 3 tracks
thabofletcher Oct 28, 2015
fbb8116
Renamed Members nav item to Overview
ajefts Oct 28, 2015
df6a674
Merge pull request #195 from appirio-tech/tony-nav-patch
thabofletcher Oct 28, 2015
2d91502
last few changes for review links
thabofletcher Oct 28, 2015
e66e534
Merge pull request #196 from appirio-tech/review-links
thabofletcher Oct 28, 2015
8f8bb9f
Merge pull request #197 from appirio-tech/dev
thabofletcher Oct 28, 2015
194c620
include link change in footer.php
thabofletcher Oct 29, 2015
c0a9161
add handle color in tc-site nav
thabofletcher Oct 29, 2015
cd6a232
revert personal config changes
thabofletcher Oct 29, 2015
cb157ab
Merge pull request #198 from appirio-tech/tony-nav-patch
thabofletcher Oct 29, 2015
87f4c67
Merge pull request #199 from appirio-tech/sup-2335-handle-color
thabofletcher Oct 29, 2015
7fd8138
Merge pull request #200 from appirio-tech/dev
thabofletcher Oct 29, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ module.exports = function(grunt) {
communityURL: grunt.option('community-url') || '//community.topcoder.com',
reviewAppURL: grunt.option('review-app-url') || 'software.topcoder.com/review',
helpAppURL: grunt.option('help-app-url') || 'help.topcoder.com',
forumsAppURL: grunt.option('forums-app-url') || 'forums.topcoder.com',
forumsAppURL: grunt.option('forums-app-url') || 'apps.topcoder.com/forums/',
swiftProgramId: grunt.option('swift-program-id') || 3445,
swiftProgramURL: grunt.option('swift-program-url') || 'http://ios.topcoder.com',
arenaURL: grunt.option('arena-url') || '//arena.topcoder.com',

// only used on wp setup
useGz: grunt.option('use-gz') || false,
Expand Down
2 changes: 1 addition & 1 deletion src/conf/debug-local-qa.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
grunt --main-url=http://local.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" dev
grunt --main-url=http://local.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --photo-link-base=https://www.topcoder-qa.com --review-app-url=software.topcoder-qa.com/review --help-app-url=help.topcoder-qa.com --forums-app-url=forums.topcoder-qa.com --swift-program-id=3445 --swift-program-url=http://apple.topcoder-qa.com --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" --api3-url=https://api.topcoder-qa.com/v3 --use-cdn=1 --use-min=1
1 change: 1 addition & 0 deletions src/conf/tc-nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ upstream www {
server {
listen 80;
server_name local.topcoder.com local.topcoder-dev.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;
Expand Down
1 change: 1 addition & 0 deletions src/conf/tc-prod-nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ server {
listen 8080 default_server;
listen [::]:80 default_server ipv6only=on;
listen [::]:8080 default_server ipv6only=on;
charset UTF-8;

if ($http_x_forwarded_proto != "https") {
return 301 https://$http_host$request_uri;
Expand Down
Loading