Skip to content

Merge Develop to Master #3220

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.

Sign up for GitHub

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 9 commits into from
Aug 15, 2019
Merged

Merge Develop to Master #3220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
04144e2
Merge pull request #3174 from anonymousjaggu/2799_fix
sushilshinde Jul 31, 2019
3d854f0
fixing package-lock.json
sushilshinde Aug 8, 2019
e867fd9
Merge pull request #2966 from nahidshahin/community-app-issue-2853
sushilshinde Jul 28, 2019
2cbc4ff
Merge pull request #3160 from romitgit/MSFT-236-Issue#2893
sushilshinde Jul 31, 2019
ccb8e16
Merge pull request #3153 from r0hit-gupta/issue-3096
sushilshinde Jul 30, 2019
0c83638
Merge pull request #3196 from r0hit-gupta/msft131
sushilshinde Aug 6, 2019
0e1353d
updated kit and new issues PRs
sushilshinde Aug 14, 2019
68104db
Merge branch 'develop' into release-qa-accessibility
sushilshinde Aug 15, 2019
7a45f90
Release qa accessibility (#3219)
sushilshinde Aug 15, 2019
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
5,406 changes: 3,151 additions & 2,255 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"supertest": "^3.1.0",
"tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
"topcoder-react-lib": "0.7.11",
"topcoder-react-ui-kit": "^1.0.10",
"topcoder-react-ui-kit": "^1.0.11",
"topcoder-react-utils": "0.7.8",
"turndown": "^4.0.2",
"url-parse": "^1.4.1",
Expand Down
1 change: 1 addition & 0 deletions src/client/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ function authenticate(store) {
configureConnector({
connectorUrl: window.CONFIG.URL.ACCOUNTS_APP_CONNECTOR,
frameId: 'tc-accounts-iframe',
frameTitle: 'Accounts authentication window',
});
}

Expand Down
4 changes: 4 additions & 0 deletions src/shared/components/Contentful/ContentBlock/themes/general.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@

// color: $tc-black;
font-size: 15px;
letter-spacing: 2px;
line-height: 25px;
margin-bottom: 30px;
word-spacing: 2.5px;
}

table {
Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/SubmissionPage/Header/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ const Header = ({
Back to challenge
</p>
</Link>
<h2>
<h1>
{title}
</h2>
</h1>
</div>
);

Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/SubmissionPage/Header/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}
}

h2 {
h1 {
font-weight: 300;
font-size: 24px;
color: #3d3d3d;
Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/TopcoderHeader/Auth/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ export default function Auth({ column }) {
styleName="auth"
>
<a
role="button"
className="tc-btn-sm tc-btn-primary"
href={`${config.URL.AUTH}/member/registration?utm_source=community-app-main`}
role="button"
>
Join
</a>
<a
role="button"
className="tc-btn-sm tc-btn-default"
href={`${config.URL.AUTH}/member?utm_source=community-app-main`}
onClick={(event) => {
const retUrl = encodeURIComponent(window.location.href);
window.location = `${config.URL.AUTH}/member?retUrl=${retUrl}&utm_source=community-app-main`;
event.preventDefault();
}}
role="button"
>
Log In
</a>
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/challenge-detail/Header/Prizes.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default function Prizes({ pointPrizes, prizes }) {
role="figure"
aria-label={`${rank}${getOrdinal(rank)} prize is ${!_.isUndefined(prizes[index]) ? '$' : ''}${pair.join(' + ')}`}
>
<div id={`rank${rank}`} styleName="prize-card">
<div id={`rank${rank}`} styleName="prize-card" aria-hidden="true">
<p styleName="prize-rank">
{rank}
<span styleName="rank-ordinal">
Expand Down