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.

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

release candidate #91

Merged
merged 12 commits into from
Apr 16, 2024
58 changes: 58 additions & 0 deletions config.remote.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"default_server_config": {
"m.homeserver": {
"prod_base_url": "http://matrix.superhero.chat",
"base_url": "https://matrix.superhero.chat",
"server_name": "superhero.chat"
},
"m.identity_server": {
"base_url": "https://vector.im"
}
},
"prod_bots_backend_url": "https://matrix.superhero.chat/callback",
"bots_backend_url": "https://matrix.superhero.chat/callback",
kenodressel marked this conversation as resolved.
Show resolved Hide resolved
"permalink_prefix": "http://localhost:8080",
"disable_custom_urls": false,
"disable_guests": false,
"disable_login_language_selector": false,
"disable_3pid_login": false,
"brand": "Superhero",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"integrations_widgets_urls": [
"https://scalar.vector.im/_matrix/integrations/v1",
"https://scalar.vector.im/api",
"https://scalar-staging.vector.im/_matrix/integrations/v1",
"https://scalar-staging.vector.im/api",
"https://scalar-staging.riot.im/scalar/api"
],
"default_country_code": "GB",
"show_labs_settings": false,
"features": {},
"default_federate": true,
"default_theme": "light",
"room_directory": {
"servers": [
"matrix.org"
]
},
"enable_presence_by_hs_url": {
"https://matrix.org": false,
"https://matrix-client.matrix.org": false
},
"setting_defaults": {
"breadcrumbs": true
},
"jitsi": {
"preferred_domain": "c.aeternity.org"
},
"element_call": {
"url": "https://call.element.io",
"participant_limit": 8,
"brand": "Superhero Call"
},
"map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx",
"branding": {
"auth_header_logo_url": "themes/superhero/img/logos/superhero-logo.svg"
}
}
3 changes: 1 addition & 2 deletions src/components/views/avatars/BaseAvatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ const BaseAvatar: React.FC<IProps> = forwardRef<HTMLElement, IProps>((props, ref
urls,
size = "40px",
onClick,
inputRef,
className,
type = "round",
altText = _t("common|avatar"),
Expand All @@ -128,7 +127,7 @@ const BaseAvatar: React.FC<IProps> = forwardRef<HTMLElement, IProps>((props, ref

return (
<Avatar
ref={inputRef}
ref={ref}
src={imageUrl}
id={idName ?? ""}
name={getSafeRoomName(name)}
Expand Down
Loading