From 65bc8bd7396f0bb57e681f81900616578a00aa6c Mon Sep 17 00:00:00 2001 From: prakashdurlabhji Date: Thu, 27 Jun 2019 14:36:03 +0530 Subject: [PATCH 1/6] issue 2599 fix --- src/shared/components/tc-communities/Footer2/index.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shared/components/tc-communities/Footer2/index.jsx b/src/shared/components/tc-communities/Footer2/index.jsx index e10ffaf3d1..e58409af22 100644 --- a/src/shared/components/tc-communities/Footer2/index.jsx +++ b/src/shared/components/tc-communities/Footer2/index.jsx @@ -7,6 +7,7 @@ import React from 'react'; import TopcoderLogoGray from '../../../../assets/images/tc-communities/logo_topcoder_gray.svg'; import './style.scss'; +import moment from 'moment'; export default function Footer2() { return ( @@ -14,7 +15,7 @@ export default function Footer2() {
-© Topcoder, 2017 +© Topcoder, {moment().year()}
Date: Thu, 27 Jun 2019 14:42:10 +0530 Subject: [PATCH 2/6] Update index.jsx --- src/shared/components/tc-communities/Footer2/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/components/tc-communities/Footer2/index.jsx b/src/shared/components/tc-communities/Footer2/index.jsx index e58409af22..b642e279d3 100644 --- a/src/shared/components/tc-communities/Footer2/index.jsx +++ b/src/shared/components/tc-communities/Footer2/index.jsx @@ -4,10 +4,10 @@ */ import React from 'react'; - +import moment from 'moment'; import TopcoderLogoGray from '../../../../assets/images/tc-communities/logo_topcoder_gray.svg'; import './style.scss'; -import moment from 'moment'; + export default function Footer2() { return ( From 3f9509fdcfe00083c8d97c420f28f435b4086d58 Mon Sep 17 00:00:00 2001 From: gurmeetb Date: Fri, 28 Jun 2019 14:57:28 +0530 Subject: [PATCH 3/6] Add hot-fixes-3 for DEV build --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index ceb823731b..6e6371890a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -175,6 +175,7 @@ workflows: branches: only: - develop-from-master-23may + - hot-fixes-3 # This is alternate dev env for parallel testing - "build-test": context : org-global From eb36d12f731a848394bd821d4a479487657a6d05 Mon Sep 17 00:00:00 2001 From: prakashdurlabhji Date: Sun, 30 Jun 2019 03:26:19 +0530 Subject: [PATCH 4/6] issu 2599 fixes --- .../tc-communities/communities/veterans/Footer/index.jsx | 3 ++- .../tc-communities/communities/wipro/Footer/index.jsx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/shared/components/tc-communities/communities/veterans/Footer/index.jsx b/src/shared/components/tc-communities/communities/veterans/Footer/index.jsx index 57aa66dc30..2fdb2051c9 100644 --- a/src/shared/components/tc-communities/communities/veterans/Footer/index.jsx +++ b/src/shared/components/tc-communities/communities/veterans/Footer/index.jsx @@ -1,3 +1,4 @@ +import moment from 'moment'; import React from 'react'; import PT from 'prop-types'; import { themr } from 'react-css-super-themr'; @@ -8,7 +9,7 @@ function Footer({ theme }) { return (
- © Copyright Topcoder Ltd 2017 + © Copyright Topcoder Ltd {moment().year()}
); diff --git a/src/shared/components/tc-communities/communities/wipro/Footer/index.jsx b/src/shared/components/tc-communities/communities/wipro/Footer/index.jsx index a7c0d5aba3..b55e42ccd9 100644 --- a/src/shared/components/tc-communities/communities/wipro/Footer/index.jsx +++ b/src/shared/components/tc-communities/communities/wipro/Footer/index.jsx @@ -1,3 +1,4 @@ +import moment from 'moment'; import React from 'react'; import PT from 'prop-types'; import { themr } from 'react-css-super-themr'; @@ -8,7 +9,7 @@ function Footer({ theme }) { return (
- © Copyright Wipro Ltd 2017 + © Copyright Wipro Ltd {moment().year()}
); From f271faac328213857e9d3559f5eda5e3af12a90a Mon Sep 17 00:00:00 2001 From: codeMinter Date: Sun, 21 Jul 2019 20:48:21 +0530 Subject: [PATCH 5/6] Revert hot-fixes-3 from auto-deployment --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6e6371890a..9a1714e648 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -175,7 +175,6 @@ workflows: branches: only: - develop-from-master-23may - - hot-fixes-3 # This is alternate dev env for parallel testing - "build-test": context : org-global @@ -183,7 +182,6 @@ workflows: branches: only: - legacy-tco - - hot-fixes-3 # This is beta env for production soft releases - "build-prod-beta": context : org-global From ce5e8567af91c7c2c11b7048a5d8474ff98c99d7 Mon Sep 17 00:00:00 2001 From: codeMinter Date: Sun, 21 Jul 2019 20:49:59 +0530 Subject: [PATCH 6/6] sync with develop branch --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a1714e648..ceb823731b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -182,6 +182,7 @@ workflows: branches: only: - legacy-tco + - hot-fixes-3 # This is beta env for production soft releases - "build-prod-beta": context : org-global