imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into bwindels/bacat-scrolling-merged-develop

Browse source
This commit is contained in:
Bruno Windels 2019-03-27 11:46:28 +01:00
commit adf263c4af
26 changed files with 641 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/rooms/AppsDrawer.js
View file

@ -144,7 +144,7 @@ module.exports = React.createClass({
_launchManageIntegrations: function() {
const IntegrationsManager = sdk.getComponent('views.settings.IntegrationsManager');
this._scalarClient.connect().done(() => {
this.scalarClient.connect().done(() => {
const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room, 'add_integ') :
null;

2
src/components/views/rooms/LinkPreviewWidget.js
View file

@ -52,7 +52,7 @@ module.exports = React.createClass({
this.props.onHeightChanged,
);
}, (error)=>{
console.error("Failed to get preview for " + this.props.link + " " + error);
console.error("Failed to get URL preview: " + error);
}).done();
},