Skip to content
Merged
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
36203dd
Merge pull request #1 from RocketChat/develop
Jeanstaquet Mar 12, 2021
f0ca3f3
Merge pull request #2 from RocketChat/develop
Jeanstaquet Mar 22, 2021
579fecc
Merge pull request #3 from RocketChat/develop
Jeanstaquet Mar 24, 2021
c77a81a
Merge pull request #5 from RocketChat/develop
Jeanstaquet Mar 29, 2021
05fe364
Merge pull request #6 from RocketChat/develop
Jeanstaquet Apr 1, 2021
5d756bd
Merge pull request #7 from RocketChat/develop
Jeanstaquet Apr 7, 2021
9d0361a
Merge pull request #8 from RocketChat/develop
Jeanstaquet Apr 13, 2021
3d57173
Merge pull request #9 from RocketChat/develop
Jeanstaquet Apr 15, 2021
a94b15f
Merge pull request #10 from RocketChat/develop
Jeanstaquet Apr 17, 2021
04e64c3
Merge pull request #11 from RocketChat/develop
Jeanstaquet Apr 20, 2021
4ba0ac7
Merge pull request #12 from RocketChat/develop
Jeanstaquet Apr 21, 2021
6c6fe18
Adding the RO permission on the Channel Modal
Jeanstaquet Apr 22, 2021
3ea8158
Adding the Fix
Jeanstaquet Apr 23, 2021
63bc7e9
Merge pull request #13 from RocketChat/develop
Jeanstaquet Apr 24, 2021
e6247c8
Merge branch 'develop' of https://github.com/Jeanstaquet/Rocket.Chat …
Jeanstaquet Apr 24, 2021
790ccab
Merge branch 'FixPermission2' into develop
Jeanstaquet Apr 24, 2021
8f22262
Merge pull request #14 from RocketChat/develop
Jeanstaquet Apr 26, 2021
096cb36
Merge branch 'develop' of https://github.com/Jeanstaquet/Rocket.Chat …
Jeanstaquet Apr 26, 2021
ca1ec19
.
Jeanstaquet Apr 26, 2021
666ef55
Merge pull request #15 from RocketChat/develop
Jeanstaquet Apr 28, 2021
2db4458
Merge branch 'develop' of https://github.com/Jeanstaquet/Rocket.Chat …
Jeanstaquet Apr 28, 2021
bbef619
Merge pull request #16 from RocketChat/develop
Jeanstaquet Apr 28, 2021
8030748
Merge branch 'develop' of https://github.com/Jeanstaquet/Rocket.Chat …
Jeanstaquet Apr 28, 2021
c754b3a
Merge pull request #17 from RocketChat/develop
Jeanstaquet Apr 30, 2021
adb1b79
Merge branch 'develop' of https://github.com/Jeanstaquet/Rocket.Chat …
Jeanstaquet Apr 30, 2021
40ebb18
Cleaning
Jeanstaquet Apr 30, 2021
97c03a9
Merge pull request #34 from RocketChat/develop
Jeanstaquet Apr 30, 2021
3b48b0b
Merge pull request #39 from RocketChat/develop
Jeanstaquet May 6, 2021
4b1fcb7
Merge pull request #40 from RocketChat/develop
Jeanstaquet May 10, 2021
4416c8f
Merge pull request #47 from RocketChat/develop
Jeanstaquet May 14, 2021
1d77bfe
Adding the fix
Jeanstaquet May 14, 2021
00cd8b2
Cleaning
Jeanstaquet May 14, 2021
b17c15b
Cleaning
Jeanstaquet May 14, 2021
fb50a62
Adding the fix
Jeanstaquet May 14, 2021
edcde21
Merge branch 'develop' into FixUserInfo
Jeanstaquet May 14, 2021
98b749f
Update UserInfo.js
Jeanstaquet May 14, 2021
fa5945b
Update UserInfo.js
Jeanstaquet May 14, 2021
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
7 changes: 6 additions & 1 deletion client/views/room/contextualBar/UserInfo/UserInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,12 @@ function UserInfo({
const t = useTranslation();
const timeAgo = useTimeAgo();
const customFieldsToShowSetting = useSetting('Accounts_CustomFieldsToShowInUserInfo');
const customFieldsToShowObj = JSON.parse(customFieldsToShowSetting);
let customFieldsToShowObj;
try {
customFieldsToShowObj = JSON.parse(customFieldsToShowSetting);
} catch (error) {
customFieldsToShowObj = undefined;
}

const customFieldsToShow = customFieldsToShowObj
? Object.values(customFieldsToShowObj).map((value) => {
Expand Down