Skip to content

Hot fixes #2334

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 27 commits into from
Apr 26, 2019
Merged

Hot fixes #2334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9db5d08
fix notification not showing up for settings tabs and clear notificat…
applehit16 Apr 18, 2019
5a1df6c
fix issue-2163 by revert its pr-2257
applehit16 Apr 18, 2019
b90aa79
show error message when user email is used
applehit16 Apr 18, 2019
ce8b675
Merge pull request #2317 from applehit16/fix-settings-notifications-i…
ThomasKranitsas Apr 18, 2019
65070be
Fixes #2306
kkartunov Apr 18, 2019
81d79bc
Merge pull request #2319 from applehit16/email-conflicts
sushilshinde Apr 18, 2019
b88831e
upgrading topcoder-react-lib version and deploying on test and beta
sushilshinde Apr 18, 2019
f69570a
fix #2080
marioskranitsas Apr 20, 2019
5444304
Merge pull request #2321 from marioskranitsas/issues-2080
ThomasKranitsas Apr 20, 2019
f8918ef
Added validation message
Apr 20, 2019
80e301a
Merge pull request #2323 from nahidshahin/issues-2052_b
ThomasKranitsas Apr 20, 2019
61023d5
fix #2087
marioskranitsas Apr 20, 2019
176bb68
Merge pull request #2324 from marioskranitsas/issue-2087
ThomasKranitsas Apr 20, 2019
a49c8ae
fix #2097
marioskranitsas Apr 21, 2019
043aa6d
Merge pull request #2325 from marioskranitsas/issue2097
ThomasKranitsas Apr 21, 2019
73d98b5
fix #2137
marioskranitsas Apr 21, 2019
a75e153
Merge pull request #2326 from marioskranitsas/issue2137
ThomasKranitsas Apr 21, 2019
ea41c59
issue 2132 fix
rashmi73 Apr 22, 2019
9622e18
Remove V2 API from Dashboard and Profile Page
Apr 24, 2019
43174fb
update email part 2
applehit16 Apr 21, 2019
c886a58
Merge pull request #2331 from applehit16/update-email-2
ThomasKranitsas Apr 24, 2019
1e50858
Merge pull request #2330 from nauhil/hot-fixes
ThomasKranitsas Apr 24, 2019
7e2860a
Update topcoder-react-lib version
ThomasKranitsas Apr 24, 2019
eb1f0ef
issue 2132 patch
rashmi73 Apr 24, 2019
a341f81
Merge pull request #2327 from rashmi73/issue_2132
ThomasKranitsas Apr 25, 2019
f5486cc
The country value of Profile page get from lookup data
Apr 25, 2019
714edb0
Merge pull request #2332 from nauhil/hot-fixes
ThomasKranitsas Apr 25, 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
9 changes: 5 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,11 @@ workflows:
- "build-test":
context : org-global
filters:
branches:
only:
- legacy-tco
- general-features
branches:
only:
- hot-fixes
- legacy-tco
- general-features
# This is beta env for production soft releases
- "build-prod-beta":
context : org-global
Expand Down
4 changes: 2 additions & 2 deletions __tests__/shared/components/ProfilePage/__snapshots__/index.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ exports[`renders a full Profile correctly 1`] = `
>
<ProfileHeader
copilot={true}
country="United States"
country=""
info={
Object {
"competitionCountryCode": "USA",
Expand Down Expand Up @@ -631,7 +631,7 @@ exports[`renders an empty Profile correctly 1`] = `
>
<ProfileHeader
copilot={false}
country="United States"
country=""
info={
Object {
"competitionCountryCode": "USA",
Expand Down
29 changes: 0 additions & 29 deletions __tests__/shared/components/Settings/Account/__snapshots__/index.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,6 @@ exports[`renders account setting page correctly 1`] = `
<div
className="src-shared-components-Settings-Account-___styles__account-container___2rdYG"
>
<div
className="src-shared-components-Settings-Account-___styles__mobile-view___s8M3A"
>
<Accordion
icons={
Object {
"linked accounts": <LinkedAccountIcon
height="30"
viewBox="0 0 30 30"
width="30"
xmlns="http://www.w3.org/2000/svg"
/>,
"my account": <MyAccountIcon
height="30"
viewBox="0 0 30 30"
width="30"
xmlns="http://www.w3.org/2000/svg"
/>,
}
}
names={
Array [
"my account",
"linked account",
]
}
renderTabContent={[Function]}
/>
</div>
<div
className="src-shared-components-Settings-Account-___styles__col-bar___3MCVp"
>
Expand Down
50 changes: 0 additions & 50 deletions __tests__/shared/components/Settings/Preferences/__snapshots__/index.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,56 +4,6 @@ exports[`renders preferences setting page correctly 1`] = `
<div
className="src-shared-components-Settings-Preferences-___styles__preferences-container___m6Zzc"
>
<div
className="src-shared-components-Settings-Preferences-___styles__mobile-view___C-Nae"
>
<Accordion
currentSidebarTab="e-mail"
icons={
Object {
"e-mail": <EmailIcon
height="30"
viewBox="0 0 30 30"
width="30"
xmlns="http://www.w3.org/2000/svg"
/>,
"forum": <Forum
height="30"
viewBox="0 0 30 30"
width="30"
xmlns="http://www.w3.org/2000/svg"
/>,
"invitation letter": <Invletter
height="30"
viewBox="0 0 30 30"
width="30"
xmlns="http://www.w3.org/2000/svg"
/>,
"payment": <Payment
viewBox="0 0 34 30"
xmlns="http://www.w3.org/2000/svg"
/>,
"referrals": <Referral
height="30"
viewBox="0 0 30 30"
width="30"
xmlns="http://www.w3.org/2000/svg"
/>,
}
}
names={
Array [
"e-mail",
"forum",
"payment",
"invitation letter",
"referrals",
]
}
renderTabContent={[Function]}
toggleSidebarTab={[Function]}
/>
</div>
<div
className="src-shared-components-Settings-Preferences-___styles__col-bar___2Fr2T"
>
Expand Down
Loading