mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-08-25 08:21:41 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #485 from matrix-org/dbkr/riot

Browse Source 
Rebrand
This commit is contained in:
David Baker 2016-09-19 13:36:55 +01:00 committed by GitHub
commit c40a7a696e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/login/Login.js
View File

@ -203,7 +203,7 @@ module.exports = React.createClass({
!this.state.enteredHomeserverUrl.startsWith("http"))) !this.state.enteredHomeserverUrl.startsWith("http")))
{ {
errorText = <span> errorText = <span>
Can't connect to homeserver via HTTP when using a vector served by HTTPS. Can't connect to homeserver via HTTP when using Riot served by HTTPS.
Either use HTTPS or <a href='https://www.google.com/search?&q=enable%20unsafe%20scripts'>enable unsafe scripts</a> Either use HTTPS or <a href='https://www.google.com/search?&q=enable%20unsafe%20scripts'>enable unsafe scripts</a>
</span>; </span>;
} }

2
src/components/views/elements/AddressTile.js
View File

@ -75,7 +75,7 @@ module.exports = React.createClass({
if (this.props.networkUrl !== "") { if (this.props.networkUrl !== "") {
network = ( network = (
<div className="mx_AddressTile_network"> <div className="mx_AddressTile_network">
<BaseAvatar width={25} height={25} name={this.props.networkName} title="vector" url={this.props.networkUrl} /> <BaseAvatar width={25} height={25} name={this.props.networkName} title="Riot" url={this.props.networkUrl} />
</div> </div>
); );
} }