Merge develop and remove comments

This commit is contained in:
Torjus
2018-07-18 14:35:55 +02:00
parent 89465e71f9
commit a1fad12b5c
20 changed files with 161 additions and 120 deletions
@@ -70,6 +70,8 @@ const ListPeer = (props) =>
off : !micEnabled,
disabled : peer.peerAudioInProgress
})}
style={{ opacity : micEnabled && micConsumer ? (micConsumer.volume/10)
+ 0.2 :1 }}
onClick={(e) =>
{
e.stopPropagation();
@@ -143,7 +145,7 @@ const mapDispatchToProps = (dispatch) =>
},
onEnableWebcam : (peerName) =>
{
dispatch(requestActions.resumePeerVideo(peerName));
},
onDisableWebcam : (peerName) =>