Merge pull request #2285 from vector-im/dbkr/rebrand

Dbkr/rebrand
pull/2359/head
David Baker 2016-09-19 13:37:02 +01:00 committed by GitHub
commit 0f2c41dddc
8 changed files with 11 additions and 11 deletions

View File

@ -39,9 +39,9 @@ module.exports = React.createClass({
return (
<div className="mx_CompatibilityPage">
<div className="mx_CompatibilityPage_box">
<p>Sorry, your browser is <b>not</b> able to run Vector.</p>
<p>Sorry, your browser is <b>not</b> able to run Riot.</p>
<p>
Vector uses many advanced browser features, some of which are not
Riot uses many advanced browser features, some of which are not
available or experimental in your current browser.
</p>
<p>

View File

@ -34,7 +34,7 @@ module.exports = React.createClass({
<div className="mx_GuestWarningBar">
<img className="mx_GuestWarningBar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
<div>
You are using Vector as a guest. <a onClick={this.onRegisterClicked}>Register</a> or <a onClick={this.onLoginClicked}>log in</a> to access more rooms and features.
You are Rioting as a guest. <a onClick={this.onRegisterClicked}>Register</a> or <a onClick={this.onLoginClicked}>log in</a> to access more rooms and features.
</div>
</div>
);

View File

@ -39,7 +39,7 @@ export default function NewVersionBar(props) {
<div className="mx_MatrixToolbar">
<img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
<div className="mx_MatrixToolbar_content">
A new version of Vector is available. Refresh your browser.
A new version of Riot is available. Refresh your browser.
</div>
<button className="mx_MatrixToolbar_action" onClick={onChangelogClicked}>Changelog</button>
</div>
@ -49,4 +49,4 @@ export default function NewVersionBar(props) {
NewVersionBar.propTypes = {
version: React.PropTypes.string.isRequired,
newVersion: React.PropTypes.string.isRequired,
};
};

View File

@ -33,7 +33,7 @@ module.exports = React.createClass({
You can use the custom server options to log into other Matrix
servers by specifying a different Home server URL.
<br/>
This allows you to use Vector with an existing Matrix account on
This allows you to use Riot with an existing Matrix account on
a different home server.
<br/>
<br/>

View File

@ -27,7 +27,7 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_Login_logo">
<img src="img/logo.png" width="249" height="78" alt="vector"/>
<img src="img/logo.png" width="200" height="200" alt="Riot"/>
</div>
);
}

View File

@ -132,7 +132,7 @@ module.exports = React.createClass({
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
title: "Error saving email notification preferences",
description: "Vector was unable to save your email notification preferences.",
description: "An error occurred whilst saving your email notification preferences.",
});
});
},
@ -784,7 +784,7 @@ module.exports = React.createClass({
<div>
<h3>Advanced notifications settings</h3>
There are advanced notifications which are not shown here.<br/>
You might have configured them in another client than Vector. You cannot tune them in Vector but they still apply.
You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply.
<ul>
{ externalRules }
</ul>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -208,13 +208,13 @@ async function loadApp() {
if (!preventRedirect) {
if (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) {
if (confirm("Vector is not supported on mobile web. Install the app?")) {
if (confirm("Riot is not supported on mobile web. Install the app?")) {
window.location = "https://itunes.apple.com/us/app/vector.im/id1083446067";
return;
}
}
else if (/Android/.test(navigator.userAgent)) {
if (confirm("Vector is not supported on mobile web. Install the app?")) {
if (confirm("Riot is not supported on mobile web. Install the app?")) {
window.location = "https://play.google.com/store/apps/details?id=im.vector.alpha";
return;
}