Skip to content

Release v1.15.13 #6333

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 22 commits into from
May 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d0be12a
Revert "Revert "fix: fix challenge link for marathon match in member …
luizrrodrigues Apr 28, 2022
141121b
Merge pull request #6324 from topcoder-platform/revert-6322-revert-63…
luizrrodrigues Apr 28, 2022
132dc31
fix: issue #5582
yoution May 1, 2022
6c42073
Merge pull request #6325 from yoution/feature/download-submission
jpeg22 May 2, 2022
b86bcaa
discord for Thrive articles
kkartunov May 3, 2022
36d1b54
ci: on beta
kkartunov May 3, 2022
b33909d
fixed lint error
kkartunov May 3, 2022
6cbf7fe
add missing css for buttons
kkartunov May 4, 2022
720f821
fix mixin bug
kkartunov May 4, 2022
aad2110
try no classes
kkartunov May 4, 2022
2d2b8a3
use btn with theme
kkartunov May 5, 2022
93141af
fixed lint bug
kkartunov May 5, 2022
5dd2d2f
add margin right to button
kkartunov May 5, 2022
20a9e8e
fixed lint error
kkartunov May 5, 2022
ef4d89d
fix: fix challenge link for marathon in member statics from feedback
morehappiness May 5, 2022
3c324f3
Fix lint
luizrrodrigues May 6, 2022
1995583
ci: deploy stat_marathon_match_link to Stag env
luizrrodrigues May 6, 2022
fc7f57f
Merge branch 'develop' into stat_marathon_match_link
luizrrodrigues May 6, 2022
ba6abc8
Revert "fix: issue #5582"
luizrrodrigues May 10, 2022
be0d4b5
Merge pull request #6331 from topcoder-platform/revert-6325-feature/d…
luizrrodrigues May 10, 2022
41bb56a
Merge pull request #6326 from topcoder-platform/thrive-discord-button
luizrrodrigues May 10, 2022
7e01e56
Merge pull request #6327 from topcoder-platform/stat_marathon_match_link
luizrrodrigues May 10, 2022
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
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -363,14 +363,15 @@ workflows:
filters:
branches:
only:
- free
- thrive-discord-button
# This is stage env for production QA releases
- "build-prod-staging":
context : org-global
filters: &filters-staging
branches:
only:
- develop
- stat_marathon_match_link
# Production builds are exectuted
# when PR is merged to the master
# Don't change anything in this configuration
Expand Down
19 changes: 19 additions & 0 deletions src/assets/images/tc-edu/discord-icon-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions src/shared/components/Contentful/Article/Article.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@ import {
import qs from 'qs';
import LoginModal from 'components/LoginModal';
import modalStyle from 'components/LoginModal/modal.scss';
import { PrimaryButton } from 'topcoder-react-ui-kit';
import tc from 'components/buttons/themed/tc.scss';
// SVGs and assets
import GestureIcon from 'assets/images/icon-gesture.svg';
import ReadMoreArrow from 'assets/images/read-more-arrow.svg';
import IconFacebook from 'assets/images/icon-facebook.svg';
import IconTwitter from 'assets/images/icon-twitter.svg';
import IconLinkedIn from 'assets/images/icon-linkedIn.svg';
import DiscordIconWhite from 'assets/images/tc-edu/discord-icon-white.svg';

const htmlToText = require('html-to-text');

Expand Down Expand Up @@ -335,6 +338,18 @@ class Article extends React.Component {
<span>{downvotes}</span>
</div>
</div>
{/* Discord */}
<div className={theme.actionContainer}>
<PrimaryButton
to="https://discord.gg/topcoder?ref=thrive-article"
openNewTab
theme={{
button: tc['primary-green-md'],
}}
>
<DiscordIconWhite style={{ marginRight: '5px' }} /> Chat on Discord
</PrimaryButton>
</div>
</div>
</div>
{/* Recommended */}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export default class HistoryGraph extends React.Component {
}
if (track === 'DATA_SCIENCE') {
if (subTrack === 'MARATHON_MATCH') {
return `${config.URL.COMMUNITY}/tc?module=MatchDetails&rd=${challengeId}`;
return `${config.URL.CHALLENGES_URL}/${challengeId}`;
}
if (subTrack === 'SRM') {
return `${config.URL.COMMUNITY}/stat?c=round_overview&rd=${challengeId}`;
Expand Down