fix merge conflicts

bigbluebutton-html5/imports/api/shapes/server/modifiers/addShape.js

@@ -43,7 +43,7 @@ export default function addShape(meetingId, whiteboardId, shape) {
         'shape.shape.id': shape.shape.id,
         'shape.shape.y': shape.shape.y,
         'shape.shape.calcedFontSize': shape.shape.calcedFontSize,
-        'shape.shape.text': shape.shape.text,
+        'shape.shape.text': shape.shape.text.replace(/[\r]/g, '\n'),
       });
       break;
 

bigbluebutton-html5/imports/ui/components/user-list/component.jsx

@@ -240,6 +240,7 @@ class UserList extends Component {
       isBreakoutRoom,
       intl,
       makeCall,
+      meeting,
     } = this.props;
 
     const userActions = {

bigbluebutton-html5/imports/ui/components/user-list/container.jsx

@@ -3,6 +3,7 @@ import { createContainer } from 'meteor/react-meteor-data';
 import { meetingIsBreakout } from '/imports/ui/components/app/service';
 import { makeCall } from '/imports/ui/services/api';
 import Service from './service.js';
+import Meetings from '/imports/api/meetings';
 
 import UserList from './component.jsx';
 
@@ -17,12 +18,14 @@ class UserListContainer extends Component {
       userActions,
       isBreakoutRoom,
       children,
+      meeting,
     } = this.props;
 
     return (
       <UserList
         compact={compact}
         users={users}
+        meeting={meeting}
         currentUser={currentUser}
         openChats={openChats}
         openChat={openChat}
@@ -37,6 +40,7 @@ class UserListContainer extends Component {
 
 export default createContainer(({ params }) => ({
   users: Service.getUsers(),
+  meeting: Meetings.findOne({}),
   currentUser: Service.getCurrentUser(),
   openChats: Service.getOpenChats(params.chatID),
   openChat: params.chatID,

bigbluebutton-html5/imports/ui/components/user-list/user-list-item/component.jsx

@@ -382,6 +382,7 @@ class UserListItem extends Component {
       user,
       intl,
       compact,
+      meeting,
     } = this.props;
 
     if (compact) {
@@ -400,6 +401,8 @@ class UserListItem extends Component {
 
     userNameSub = userNameSub.join(' ');
 
+    const { disablePrivateChat, disableCam, disableMic, lockedLayout, disablePublicChat } = meeting.roomLockSettings;
+
     return (
       <div className={styles.userName}>
         <span className={styles.userNameMain}>
@@ -407,8 +410,12 @@ class UserListItem extends Component {
         </span>
         <span className={styles.userNameSub}>
           {userNameSub}
-          {(user.isLocked) ?
-            <span> {user.isCurrent ? ' | ' : null}
+          {(user.isLocked && (disablePrivateChat
+            || disableCam
+            || disableMic
+            || lockedLayout
+            || disablePublicChat)) ?
+            <span> {(user.isCurrent ? ' | ' : null)}
               <Icon iconName='lock' />
               {intl.formatMessage(messages.locked)}
             </span> : null}

bigbluebutton-html5/imports/ui/components/whiteboard/shapes/text/component.jsx

@@ -38,6 +38,7 @@ export default class TextDrawComponent extends React.Component {
       fontStretch: 'normal',
       lineHeight: 'normal',
       fontFamily: 'Arial',
+      whiteSpace: 'pre-wrap',
       wordWrap: 'break-word',
       wordBreak: 'normal',
       textAlign: 'left',