mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' into matthew/notif-panel

Browse source
This commit is contained in:
Matthew Hodgson 2016-09-03 13:33:37 +01:00
commit c597f05e71
12 changed files with 64 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/LeftPanel.js
View file

@ -109,7 +109,7 @@ var LeftPanel = React.createClass({
var CallView = sdk.getComponent('voip.CallView');
callPreview = (
<CallView
className="mx_LeftPanel_callView" onClick={this.onCallViewClick}
className="mx_LeftPanel_callView" showVoice={true} onClick={this.onCallViewClick}
ConferenceHandler={VectorConferenceHandler} />
);
}

4
src/components/views/dialogs/ChangelogDialog.js
View file

@ -50,9 +50,11 @@ export default class ChangelogDialog extends React.Component {
return (
<div key={repo}>
<h2>{repo}</h2>
<ul>
{this.state[repo].map(commit =>
<div key={commit.commit.url}><a href={commit.commit.url}>{commit.commit.message}</a></div>
<li key={commit.commit.url} className="mx_ChangelogDialog_li"><a href={commit.commit.url}>{commit.commit.message}</a></li>
)}
</ul>
</div>
)
});

2
src/components/views/settings/Notifications.js
View file

@ -843,7 +843,7 @@ module.exports = React.createClass({
<th width="55%"></th>
<th width="15%">Off</th>
<th width="15%">On</th>
<th width="15%">Highlight<br/>&amp; sound</th>
<th width="15%">Noisy</th>
</tr>
</thead>
<tbody>