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

Merge remote-tracking branch 'matrix-org/develop' into travis/presence

Browse source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-10-25 11:21:19 -06:00
commit e773585a02
80 changed files with 9256 additions and 2909 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/avatars/BaseAvatar.js
View file

@ -110,7 +110,7 @@ module.exports = React.createClass({
let idx = 0;
const initial = name[0];
if ((initial === '@' || initial === '#') && name[1]) {
if ((initial === '@' || initial === '#' || initial === '+') && name[1]) {
idx++;
}

1
src/components/views/avatars/GroupAvatar.js
View file

@ -28,6 +28,7 @@ export default React.createClass({
width: PropTypes.number,
height: PropTypes.number,
resizeMethod: PropTypes.string,
onClick: PropTypes.func,
},
getDefaultProps: function() {