matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

more s/Vector/Riot/

Browse Source
This commit is contained in:
Matthew Hodgson
2016-10-03 10:18:32 +01:00
parent 91771ec17d
commit 9d303712f2
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CallHandler.js
View File

@ -268,7 +268,7 @@ function _onAction(payload) {
var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
Modal.createDialog(QuestionDialog, { Modal.createDialog(QuestionDialog, {
title: "Warning!", title: "Warning!",
description: "Conference calling in Vector is in development and may not be reliable.", description: "Conference calling in Riot is in development and may not be reliable.",
onFinished: confirm=>{ onFinished: confirm=>{
if (confirm) { if (confirm) {
ConferenceHandler.createNewMatrixCall( ConferenceHandler.createNewMatrixCall(

2
src/components/structures/TimelinePanel.js
View File

@ -776,7 +776,7 @@ var TimelinePanel = React.createClass({
}); });
}; };
} }
var message = "Vector was trying to load a specific point in this room's timeline but "; var message = "Riot was trying to load a specific point in this room's timeline but ";
if (error.errcode == 'M_FORBIDDEN') { if (error.errcode == 'M_FORBIDDEN') {
message += "you do not have permission to view the message in question."; message += "you do not have permission to view the message in question.";
} else { } else {

2
src/components/views/messages/TextualBody.js
View File

@ -194,7 +194,7 @@ module.exports = React.createClass({
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, { Modal.createDialog(ErrorDialog, {
title: "Integrations disabled", title: "Integrations disabled",
description: "You need to enable the Labs option 'Integrations Management' in your Vector user settings first.", description: "You need to enable the Labs option 'Integrations Management' in your Riot user settings first.",
}); });
return; return;
} }

2
src/components/views/rooms/RoomPreviewBar.js
View File

@ -94,7 +94,7 @@ module.exports = React.createClass({
if (this.props.invitedEmail) { if (this.props.invitedEmail) {
if (this.state.threePidFetchError) { if (this.state.threePidFetchError) {
emailMatchBlock = <div className="error"> emailMatchBlock = <div className="error">
Vector was unable to ascertain that the address this invite was Riot was unable to ascertain that the address this invite was
sent to matches one associated with your account. sent to matches one associated with your account.
</div> </div>
} else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) { } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) {