Skip to content

Release 2021/02/16 (v1.7.6) #5360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Feb 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
fa14294
init code #5341
kkartunov Feb 8, 2021
222ce86
Fixes for #5341
kkartunov Feb 9, 2021
4b9f820
ci: on test
kkartunov Feb 9, 2021
bf5437d
fixed tests
kkartunov Feb 9, 2021
3012dd7
Merge branch 'email-pref-revamp' of https://github.com/topcoder-platf…
kkartunov Feb 9, 2021
e34f185
implements #5343
kkartunov Feb 10, 2021
5a22c37
ci: on test
kkartunov Feb 10, 2021
c5ac5cc
fixes for #5341
kkartunov Feb 10, 2021
ef40455
updated text for unsubscribed
kkartunov Feb 10, 2021
f9b4a21
Fixed Docker file
kkartunov Feb 11, 2021
cf02e74
Merge branch 'gsheet-contentful' of https://github.com/topcoder-platf…
kkartunov Feb 11, 2021
141525b
Final fixes email revamp
kkartunov Feb 11, 2021
719c10b
Merge pull request #5348 from topcoder-platform/email-pref-revamp
luizrrodrigues Feb 16, 2021
4857f16
Merge branch 'develop' into gsheet-contentful
luizrrodrigues Feb 16, 2021
8517bfe
Merge pull request #5345 from topcoder-platform/gsheet-contentful
luizrrodrigues Feb 16, 2021
5ed0def
Revert "Gsheet contentful"
luizrrodrigues Feb 16, 2021
51fc65e
Merge pull request #5355 from topcoder-platform/revert-5345-gsheet-co…
luizrrodrigues Feb 16, 2021
51c196a
Revert "Email pref revamp"
luizrrodrigues Feb 16, 2021
799ff74
Merge pull request #5356 from topcoder-platform/revert-5348-email-pre…
luizrrodrigues Feb 16, 2021
717b177
Revert "Merge branch 'develop' into gsheet-contentful"
luizrrodrigues Feb 16, 2021
f9e7bc5
Merge branch 'develop' into gsheet-contentful
luizrrodrigues Feb 16, 2021
8704b34
Revert "Merge pull request #5355 from topcoder-platform/revert-5345-g…
luizrrodrigues Feb 16, 2021
48b92f3
ci: deploy gsheet-contentful-develop to Test env
luizrrodrigues Feb 16, 2021
3692d7b
Merge pull request #5358 from topcoder-platform/gsheet-contentful-dev…
luizrrodrigues Feb 16, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ workflows:
filters:
branches:
only:
- free
- gsheet-contentful-develop
# This is alternate dev env for parallel testing
- "build-qa":
context : org-global
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ ARG TC_M2M_AUTH0_URL
ARG AUTH_SECRET

ARG COMMUNITY_APP_URL
ARG GSHEETS_API_KEY

################################################################################
# Setting of environment variables in the Docker image.
Expand Down Expand Up @@ -120,6 +121,7 @@ ENV CONTENTFUL_EDU_CDN_API_KEY=$CONTENTFUL_EDU_CDN_API_KEY
ENV CONTENTFUL_EDU_PREVIEW_API_KEY=$CONTENTFUL_EDU_PREVIEW_API_KEY
ENV RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY
ENV COMMUNITY_APP_URL=$COMMUNITY_APP_URL
ENV GSHEETS_API_KEY=$GSHEETS_API_KEY

################################################################################
# Testing and build of the application inside the container.
Expand Down
1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ docker build -t $TAG \
--build-arg CONTENTFUL_COMCAST_CDN_API_KEY=$CONTENTFUL_COMCAST_CDN_API_KEY \
--build-arg CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY \
--build-arg RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY \
--build-arg GSHEETS_API_KEY=$GSHEETS_API_KEY \
--build-arg COMMUNITY_APP_URL=$COMMUNITY_APP_URL .

# Copies "node_modules" from the created image, if necessary for caching.
Expand Down
1 change: 1 addition & 0 deletions config/custom-environment-variables.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,5 @@ module.exports = {
AUTH0_PROXY_SERVER_URL: 'TC_M2M_AUTH0_PROXY_SERVER_URL',
TOKEN_CACHE_TIME: 'TOKEN_CACHE_TIME',
},
GSHEETS_API_KEY: 'GSHEETS_API_KEY',
};
2 changes: 2 additions & 0 deletions config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ module.exports = {
RECRUITCRM_API_KEY: '',
},

GSHEETS_API_KEY: 'AIzaSyBRdKySN5JNCb2H6ZxJdTTvp3cWU51jiOQ',

AUTH_CONFIG: {
AUTH0_URL: 'TC_M2M_AUTH0_URL',
AUTH0_AUDIENCE: 'TC_M2M_AUDIENCE',
Expand Down
Loading