Skip to content

Conversation

@RishiRajSahu
Copy link
Contributor

@RishiRajSahu RishiRajSahu commented Oct 30, 2018

FYI @maxceem @vikasrohit this PR contains squashed commits from the older PR #2655 . For safety, I have checked the git diff feature/connect_user_profile_settings..feature/avatar-and-user-profile-settings between the source branches in both PRs to be none.

maxceem and others added 4 commits October 30, 2018 12:15
…on was provided by participant via email and may be different from the one in the system)

issue #2654 - reverted changes regarding showing avatar from connect_info trait, also hiding Footer in the way it's done for other cases
…y connect_info and partially by basic_info trait. Make user data updated in the store after settings updated. Code of settings almost fully refactored to keep services separate from actions.

issue #2654 - renamed route from settings/system to settings/account
# Conflicts:
#	package-lock.json
#	src/projects/detail/containers/ScopeAndSpecificationContainer.jsx
@RishiRajSahu RishiRajSahu merged commit 7a185cb into dev Nov 1, 2018
@vikasrohit vikasrohit deleted the feature/connect_user_profile_settings branch December 4, 2018 05:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants