diff --git a/bigbluebutton-client/locale/am_ET/bbbResources.properties b/bigbluebutton-client/locale/am_ET/bbbResources.properties index f5f028b52b..f862e589ed 100644 --- a/bigbluebutton-client/locale/am_ET/bbbResources.properties +++ b/bigbluebutton-client/locale/am_ET/bbbResources.properties @@ -1,6 +1,6 @@ bbb.mainshell.locale.version = -bbb.mainshell.statusProgress.connecting = -bbb.mainshell.statusProgress.loading = +bbb.mainshell.statusProgress.connecting = ከአገልጋዩ ጋር በመገናኘት ላይ +bbb.mainshell.statusProgress.loading = በመጫን ላይ bbb.mainshell.statusProgress.cannotConnectServer = bbb.mainshell.copyrightLabel2 = bbb.mainshell.logBtn.toolTip = @@ -50,7 +50,7 @@ bbb.micSettings.nextButton = bbb.micSettings.nextButton.toolTip = bbb.micSettings.join = bbb.micSettings.join.toolTip = -bbb.micSettings.cancel = +bbb.micSettings.cancel = ሰርዝ bbb.micSettings.connectingtoecho = bbb.micSettings.connectingtoecho.error = bbb.micSettings.cancel.toolTip = @@ -97,14 +97,14 @@ bbb.webrtcWarning.connection.reestablished = bbb.inactivityWarning.title = bbb.inactivityWarning.message = bbb.shuttingDown.message = -bbb.inactivityWarning.cancel = -bbb.mainToolbar.helpBtn = -bbb.mainToolbar.logoutBtn = -bbb.mainToolbar.logoutBtn.toolTip = +bbb.inactivityWarning.cancel = ሰርዝ +bbb.mainToolbar.helpBtn = እገዛ +bbb.mainToolbar.logoutBtn = ውጣ +bbb.mainToolbar.logoutBtn.toolTip = ውጣ bbb.mainToolbar.idleLogoutBtn = -bbb.mainToolbar.langSelector = -bbb.mainToolbar.settingsBtn = -bbb.mainToolbar.settingsBtn.toolTip = +bbb.mainToolbar.langSelector = ቋንቋ ይምረጡ +bbb.mainToolbar.settingsBtn = ቅንብሮች +bbb.mainToolbar.settingsBtn.toolTip = ቅንብሮችን ክፈት bbb.mainToolbar.shortcutBtn = bbb.mainToolbar.shortcutBtn.toolTip = bbb.mainToolbar.recordBtn.toolTip.start = @@ -138,7 +138,7 @@ bbb.guests.askModerator = bbb.guests.Management = bbb.clientstatus.title = bbb.clientstatus.notification = -bbb.clientstatus.close = +bbb.clientstatus.close = ይዝጉ bbb.clientstatus.tunneling.title = bbb.clientstatus.tunneling.message = bbb.clientstatus.browser.title = @@ -155,9 +155,9 @@ bbb.clientstatus.java.title = bbb.clientstatus.java.notdetected = bbb.clientstatus.java.notinstalled = bbb.clientstatus.java.oldversion = -bbb.window.minimizeBtn.toolTip = +bbb.window.minimizeBtn.toolTip = አሳንስ bbb.window.maximizeRestoreBtn.toolTip = -bbb.window.closeBtn.toolTip = +bbb.window.closeBtn.toolTip = ይዝጉ bbb.videoDock.titleBar = bbb.presentation.titleBar = bbb.chat.titleBar = @@ -166,7 +166,7 @@ bbb.users.titleBar = bbb.users.quickLink.label = bbb.users.minimizeBtn.accessibilityName = bbb.users.maximizeRestoreBtn.accessibilityName = -bbb.users.settings.buttonTooltip = +bbb.users.settings.buttonTooltip = ቅንብሮች bbb.users.settings.audioSettings = bbb.users.settings.webcamSettings = bbb.users.settings.muteAll = @@ -179,16 +179,16 @@ bbb.users.roomLocked.text = bbb.users.pushToTalk.toolTip = bbb.users.pushToMute.toolTip = bbb.users.muteMeBtnTxt.talk = -bbb.users.muteMeBtnTxt.mute = -bbb.users.muteMeBtnTxt.muted = +bbb.users.muteMeBtnTxt.mute = ድምጸ-ከል ያድርጉ +bbb.users.muteMeBtnTxt.muted = ድምጸ-ከል ተደርጓል bbb.users.usersGrid.contextmenu.exportusers = bbb.users.usersGrid.accessibilityName = -bbb.users.usersGrid.nameItemRenderer = -bbb.users.usersGrid.nameItemRenderer.youIdentifier = -bbb.users.usersGrid.statusItemRenderer = +bbb.users.usersGrid.nameItemRenderer = ስም +bbb.users.usersGrid.nameItemRenderer.youIdentifier = አንተ +bbb.users.usersGrid.statusItemRenderer = ሁኔታ bbb.users.usersGrid.statusItemRenderer.changePresenter = bbb.users.usersGrid.statusItemRenderer.presenter = -bbb.users.usersGrid.statusItemRenderer.moderator = +bbb.users.usersGrid.statusItemRenderer.moderator = አወያይ bbb.users.usersGrid.statusItemRenderer.voiceOnlyUser = bbb.users.usersGrid.statusItemRenderer.raiseHand = bbb.users.usersGrid.statusItemRenderer.applause = @@ -204,14 +204,14 @@ bbb.users.usersGrid.statusItemRenderer.neutral = bbb.users.usersGrid.statusItemRenderer.happy = bbb.users.usersGrid.statusItemRenderer.sad = bbb.users.usersGrid.statusItemRenderer.clearStatus = -bbb.users.usersGrid.statusItemRenderer.viewer = +bbb.users.usersGrid.statusItemRenderer.viewer = ተመልካች bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = bbb.users.usersGrid.mediaItemRenderer = bbb.users.usersGrid.mediaItemRenderer.talking = bbb.users.usersGrid.mediaItemRenderer.webcam = bbb.users.usersGrid.mediaItemRenderer.webcamBtn = -bbb.users.usersGrid.mediaItemRenderer.pushToTalk = +bbb.users.usersGrid.mediaItemRenderer.pushToTalk = ድምጸ-ከል አንሳ {0} bbb.users.usersGrid.mediaItemRenderer.pushToMute = bbb.users.usersGrid.mediaItemRenderer.pushToLock = bbb.users.usersGrid.mediaItemRenderer.pushToUnlock = @@ -284,10 +284,10 @@ bbb.fileupload.selectBtn.toolTip = bbb.fileupload.uploadBtn = bbb.fileupload.uploadBtn.toolTip = bbb.fileupload.deleteBtn.toolTip = -bbb.fileupload.showBtn = +bbb.fileupload.showBtn = አሳይ bbb.fileupload.retry = bbb.fileupload.showBtn.toolTip = -bbb.fileupload.close.tooltip = +bbb.fileupload.close.tooltip = ይዝጉ bbb.fileupload.close.accessibilityName = bbb.fileupload.genThumbText = bbb.fileupload.progBarLbl = @@ -295,7 +295,7 @@ bbb.fileupload.fileFormatHint = bbb.fileupload.letUserDownload = bbb.fileupload.letUserDownload.tooltip = bbb.filedownload.title = -bbb.filedownload.close.tooltip = +bbb.filedownload.close.tooltip = ይዝጉ bbb.filedownload.close.accessibilityName = bbb.filedownload.fileLbl = bbb.filedownload.downloadBtn = @@ -367,7 +367,7 @@ bbb.video.publish.hint.cameraDenied = bbb.video.publish.hint.cameraIsBeingUsed = bbb.video.publish.hint.publishing = bbb.video.publish.closeBtn.accessName = -bbb.video.publish.closeBtn.label = +bbb.video.publish.closeBtn.label = ሰርዝ bbb.video.publish.titleBar = bbb.video.streamClose.toolTip = bbb.video.message.browserhttp = @@ -379,11 +379,11 @@ bbb.screensharePublish.restart.label = bbb.screensharePublish.maximizeRestoreBtn.toolTip = bbb.screensharePublish.closeBtn.toolTip = bbb.screensharePublish.closeBtn.accessibilityName = -bbb.screensharePublish.minimizeBtn.toolTip = +bbb.screensharePublish.minimizeBtn.toolTip = አሳንስ bbb.screensharePublish.minimizeBtn.accessibilityName = bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = bbb.screensharePublish.commonHelpText.text = -bbb.screensharePublish.helpButton.toolTip = +bbb.screensharePublish.helpButton.toolTip = እገዛ bbb.screensharePublish.helpButton.accessibilityName = bbb.screensharePublish.helpText.PCIE1 = bbb.screensharePublish.helpText.PCIE2 = @@ -422,7 +422,7 @@ bbb.screensharePublish.jwsCrashed.label = bbb.screensharePublish.commonErrorMessage.label = bbb.screensharePublish.tunnelingErrorMessage.one = bbb.screensharePublish.tunnelingErrorMessage.two = -bbb.screensharePublish.cancelButton.label = +bbb.screensharePublish.cancelButton.label = ሰርዝ bbb.screensharePublish.startButton.label = bbb.screensharePublish.stopButton.label = bbb.screensharePublish.stopButton.toolTip = @@ -464,7 +464,7 @@ bbb.layout.combo.custom = bbb.layout.combo.customName = bbb.layout.combo.remote = bbb.layout.window.name = -bbb.layout.window.close.tooltip = +bbb.layout.window.close.tooltip = ይዝጉ bbb.layout.window.close.accessibilityName = bbb.layout.save.complete = bbb.layout.save.ioerror = @@ -517,9 +517,9 @@ bbb.logout.refresh.message = bbb.logout.refresh.label = bbb.logout.feedback.hint = bbb.logout.feedback.label = -bbb.settings.title = +bbb.settings.title = ቅንብሮች bbb.settings.ok = -bbb.settings.cancel = +bbb.settings.cancel = ሰርዝ bbb.settings.btn.toolTip = bbb.logout.confirm.title = bbb.logout.confirm.message = @@ -542,7 +542,7 @@ bbb.notes.saveBtn.toolTip = bbb.sharedNotes.title = bbb.sharedNotes.quickLink.label = bbb.sharedNotes.createNoteWindow.label = -bbb.sharedNotes.createNoteWindow.close.tooltip = +bbb.sharedNotes.createNoteWindow.close.tooltip = ይዝጉ bbb.sharedNotes.createNoteWindow.close.accessibilityName = bbb.sharedNotes.typing.single = bbb.sharedNotes.typing.double = @@ -762,7 +762,7 @@ bbb.shortcutkey.caption.takeOwnership.function = bbb.polling.startButton.tooltip = bbb.polling.startButton.label = bbb.polling.publishButton.label = -bbb.polling.closeButton.label = +bbb.polling.closeButton.label = ይዝጉ bbb.polling.customPollOption.label = bbb.polling.pollModal.title = bbb.polling.pollModal.hint = @@ -810,7 +810,7 @@ bbb.users.settings.roomIsMuted = bbb.lockSettings.save = bbb.lockSettings.save.tooltip = -bbb.lockSettings.cancel = +bbb.lockSettings.cancel = ሰርዝ bbb.lockSettings.cancel.toolTip = bbb.lockSettings.hint = @@ -845,7 +845,7 @@ bbb.users.breakout.notAssigned = bbb.users.breakout.dragAndDropToolTip = bbb.users.breakout.start = bbb.users.breakout.invite = -bbb.users.breakout.close = +bbb.users.breakout.close = ይዝጉ bbb.users.breakout.closeAllRooms = bbb.users.breakout.insufficientUsers = bbb.users.breakout.confirm = @@ -853,7 +853,7 @@ bbb.users.breakout.invited = bbb.users.breakout.accept = bbb.users.breakout.joinSession = bbb.users.breakout.joinSession.accessibilityName = -bbb.users.breakout.joinSession.close.tooltip = +bbb.users.breakout.joinSession.close.tooltip = ይዝጉ bbb.users.breakout.joinSession.close.accessibilityName = bbb.users.breakout.youareinroom = bbb.users.roomsGrid.room = @@ -865,7 +865,7 @@ bbb.users.roomsGrid.noUsers = bbb.langSelector.default= -bbb.alert.cancel = +bbb.alert.cancel = ሰርዝ bbb.alert.ok = bbb.alert.no = bbb.alert.yes = diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf index 4e7f8707c0..f5f1f8eda5 100755 --- a/bigbluebutton-config/bin/bbb-conf +++ b/bigbluebutton-config/bin/bbb-conf @@ -1476,6 +1476,13 @@ check_state() { echo "#" fi + if bbb-conf --status | grep -q inactive; then + echo "# Error: Detected some processes have not started correctly" + echo "#" + echo "# $(bbb-conf --status | grep inactive)" + echo "#" + fi + exit 0 } diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss old mode 100644 new mode 100755 index bafdf69f8e..790ecf4d14 --- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss @@ -51,7 +51,7 @@ flex: 1; display: flex; flex-flow: column; - overflow: hidden; + width: calc(100% - 1.7rem); } .meta { @@ -70,9 +70,15 @@ min-width: 0; font-weight: 600; color: $color-heading; + width: 100%; + position: relative; > span { @extend %text-elipsis; + padding: .5rem 0; + position: absolute; + top: -.5rem; + width: 100%; } } diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/list/styles.scss b/bigbluebutton-html5/imports/ui/components/dropdown/list/styles.scss index 6cc1d09bf3..a6508e7e0e 100755 --- a/bigbluebutton-html5/imports/ui/components/dropdown/list/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/dropdown/list/styles.scss @@ -29,6 +29,7 @@ $item-border-focus: $color-blue-lighter; flex-direction: row; @include mq($small-only) { flex-direction: column; + padding: $line-height-computed; } } diff --git a/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx b/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx old mode 100644 new mode 100755 index ad2f3b6bc1..2b20c0193d --- a/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx @@ -18,6 +18,14 @@ const defaultProps = { }; class Tooltip extends Component { + static wait(show, event) { + const tooltipTarget = event.target; + const expandedEl = tooltipTarget.parentElement.querySelector('[aria-expanded="true"]'); + const isTarget = expandedEl === tooltipTarget; + if (expandedEl && !isTarget) return; + show(); + } + constructor(props) { super(props); @@ -40,12 +48,11 @@ class Tooltip extends Component { delay: this.delay, onShow: this.onShow, onHide: this.onHide, + wait: Tooltip.wait, touchHold: true, }; - this.tooltip = Tippy(`#${this.tippySelectorId}`, options); } - onShow() { document.addEventListener('keyup', this.handleEscapeHide); } @@ -56,7 +63,6 @@ class Tooltip extends Component { handleEscapeHide(e) { if (e.keyCode !== ESCAPE) return; - this.tooltip.tooltips[0].hide(); } diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-name/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-name/styles.scss old mode 100644 new mode 100755 index de5714574d..45ef15c2ff --- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-name/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-name/styles.scss @@ -18,6 +18,7 @@ transition: all 0.3s; font-weight: 400; color: $color-gray-dark; + padding: .5rem 0; } .userNameSub { @@ -34,5 +35,3 @@ font-size: 75%; } } - - diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx index 39101c2110..867ba8f7ba 100755 --- a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx @@ -19,6 +19,10 @@ const intlMessages = defineMessages({ id: 'app.video.videoMenuDesc', description: 'video menu description', }, + videoMenuDisabled: { + id: 'app.video.videoMenuDisabled', + description: 'video menu label', + }, }); @@ -32,6 +36,7 @@ const JoinVideoOptions = ({ intl, isSharingVideo, videoItems, + videoShareAllowed, }) => { const menuItems = videoItems .filter(item => !item.disabled) @@ -54,8 +59,11 @@ const JoinVideoOptions = ({ >