Skip to content
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

[FIX] Avatar url provider ignoring subfolders #17675

Merged
merged 8 commits into from
May 19, 2020
Merged

[FIX] Avatar url provider ignoring subfolders #17675

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1fb7620
Fix concurrency problem while fetching integration data
ggazzo Apr 24, 2020
04e0635
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
ggazzo Apr 30, 2020
8ac2b5c
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
ggazzo May 6, 2020
89f7125
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
ggazzo May 8, 2020
fad71e6
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
ggazzo May 10, 2020
1d2a6c4
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
ggazzo May 16, 2020
4bc5033
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
ggazzo May 18, 2020
2a766b0
Fix avatar provider for subfolders
ggazzo May 18, 2020
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 client/providers/AvatarUrlProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import React, { useMemo } from 'react';
import { Avatar } from '@rocket.chat/fuselage';

import { useSetting } from '../contexts/SettingsContext';
import { baseURI } from '../../app/utils/client/lib/baseuri';

const base = '';
const base = baseURI;

export function AvatarUrlProvider({ children }) {
const cdn = useSetting('CDN_PREFIX_ALL');
Expand Down