diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f44632402914b6169cc220ff9bd6221f0188021e..9547614bf47c41fb29c3d141c4b9063f38fc87d7 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -21,6 +21,7 @@ HOW TO WRITE A GOOD PULL REQUEST?
### Closes Issue(s)
+closes #...
<!-- List here all the issues closed by this pull request. Use keyword `closes` before each issue number -->
### Motivation
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000000000000000000000000000000000..a88e6f0a51be5dc1f9e7e66bc332829507984a94
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,17 @@
+# Security Policy
+
+## Supported Versions
+
+We actively support BigBlueButton through the community forums and through security updates.
+
+| Version | Supported |
+| ------- | ------------------ |
+| 2.0.x (or earlier) | :x: |
+| 2.2.x | :white_check_mark: |
+| 2.3-dev | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+If you believe you have found a security vunerability in BigBlueButton please let us know directly by e-mailing security@bigbluebutton.org with as much detail as possible.
+
+Regards,... [BigBlueButton Team](https://docs.bigbluebutton.org/support/faq.html#bigbluebutton-committer)
diff --git a/bbb-common-web/project/Dependencies.scala b/bbb-common-web/project/Dependencies.scala
index c9e9447b525a60c5ba55669370570f9cf1a05c2b..b575348add41b800fda67b0fc66b6bd2e81a82bf 100644
--- a/bbb-common-web/project/Dependencies.scala
+++ b/bbb-common-web/project/Dependencies.scala
@@ -21,7 +21,7 @@ object Dependencies {
val apacheHttpAsync = "4.1.4"
// Office and document conversion
- val jodConverter = "4.2.1"
+ val jodConverter = "4.3.0"
val apachePoi = "4.1.2"
val nuProcess = "1.2.4"
val libreOffice = "5.4.2"
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/ApiErrors.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/ApiErrors.java
index e8d74a8730865456d7c4fe196f7e77efc77e46e4..545f7ad5301a887d63b6e64b8d1e434ade603b02 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/ApiErrors.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/ApiErrors.java
@@ -36,6 +36,10 @@ public class ApiErrors {
errors.add(new String[] {"NotUniqueMeetingID", "A meeting already exists with that meeting ID. Please use a different meeting ID."});
}
+ public void nonUniqueVoiceBridgeError() {
+ errors.add(new String[] {"nonUniqueVoiceBridge", "The selected voice bridge is already in use."});
+ }
+
public void invalidMeetingIdError() {
errors.add(new String[] {"invalidMeetingId", "The meeting ID that you supplied did not match any existing meetings"});
}
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
index cab095cb311f901a3e1c1c1cc5dac68c1012f32e..27127dfc2efddf4c5f6addf6c74ba683f24ce2f2 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
@@ -277,8 +277,10 @@ public class MeetingService implements MessageListener {
public synchronized boolean createMeeting(Meeting m) {
String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(m.getExternalId());
- Meeting existing = getNotEndedMeetingWithId(internalMeetingId);
- if (existing == null) {
+ Meeting existingId = getNotEndedMeetingWithId(internalMeetingId);
+ Meeting existingTelVoice = getNotEndedMeetingWithTelVoice(m.getTelVoice());
+ Meeting existingWebVoice = getNotEndedMeetingWithWebVoice(m.getWebVoice());
+ if (existingId == null && existingTelVoice == null && existingWebVoice == null) {
meetings.put(m.getInternalId(), m);
handle(new CreateMeeting(m));
return true;
@@ -437,6 +439,32 @@ public class MeetingService implements MessageListener {
return null;
}
+ public Meeting getNotEndedMeetingWithTelVoice(String telVoice) {
+ if (telVoice == null)
+ return null;
+ for (Map.Entry<String, Meeting> entry : meetings.entrySet()) {
+ Meeting m = entry.getValue();
+ if (telVoice.equals(m.getTelVoice())) {
+ if (!m.isForciblyEnded())
+ return m;
+ }
+ }
+ return null;
+ }
+
+ public Meeting getNotEndedMeetingWithWebVoice(String webVoice) {
+ if (webVoice == null)
+ return null;
+ for (Map.Entry<String, Meeting> entry : meetings.entrySet()) {
+ Meeting m = entry.getValue();
+ if (webVoice.equals(m.getWebVoice())) {
+ if (!m.isForciblyEnded())
+ return m;
+ }
+ }
+ return null;
+ }
+
public Boolean validateTextTrackSingleUseToken(String recordId, String caption, String token) {
return recordingService.validateTextTrackSingleUseToken(recordId, caption, token);
}
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
index d83c6076b033263c73605b57368fcdfe61a84c3a..4709fe49dec5701e54bc20d504f428acf22300aa 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
@@ -362,7 +362,7 @@ public class Meeting {
} else if (GuestPolicy.ALWAYS_DENY.equals(guestPolicy)) {
return GuestPolicy.DENY;
} else if (GuestPolicy.ASK_MODERATOR.equals(guestPolicy)) {
- if (guest || (!ROLE_MODERATOR.equals(role) && !authned)) {
+ if (guest || (!ROLE_MODERATOR.equals(role) && authned)) {
return GuestPolicy.WAIT ;
}
return GuestPolicy.ALLOW;
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java b/bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
index ecbfac0d8f44d54e1fa75185cdceb45c65dfad89..6d446c32019738be70ef9933b270c03eb664d9c0 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
@@ -13,7 +13,6 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import com.sun.org.apache.xpath.internal.operations.Bool;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java b/bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
index 747cf78a829c98ee50dd7eb575a64c42d26d8be2..96233285cb8cf6c1e5383238c264c64db4d1c84e 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
@@ -20,21 +20,33 @@
package org.bigbluebutton.presentation.imp;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
+import com.sun.org.apache.xerces.internal.impl.xs.opti.DefaultDocument;
+import org.apache.commons.io.FilenameUtils;
import org.bigbluebutton.presentation.UploadedPresentation;
-import org.jodconverter.OfficeDocumentConverter;
+import org.jodconverter.core.document.DefaultDocumentFormatRegistry;
+import org.jodconverter.core.document.DocumentFormat;
+import org.jodconverter.core.job.AbstractConverter;
+import org.jodconverter.local.LocalConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
-public class Office2PdfPageConverter {
+public abstract class Office2PdfPageConverter {
private static Logger log = LoggerFactory.getLogger(Office2PdfPageConverter.class);
- public boolean convert(File presentationFile, File output, int page, UploadedPresentation pres,
- final OfficeDocumentConverter converter){
+ public static boolean convert(File presentationFile, File output, int page, UploadedPresentation pres,
+ LocalConverter converter){
+
+ FileInputStream inputStream = null;
+ FileOutputStream outputStream = null;
+
try {
Map<String, Object> logData = new HashMap<>();
logData.put("meetingId", pres.getMeetingId());
@@ -46,7 +58,15 @@ public class Office2PdfPageConverter {
String logStr = gson.toJson(logData);
log.info(" --analytics-- data={}", logStr);
- converter.convert(presentationFile, output);
+ final DocumentFormat sourceFormat = DefaultDocumentFormatRegistry.getFormatByExtension(
+ FilenameUtils.getExtension(presentationFile.getName()));
+
+ inputStream = new FileInputStream(presentationFile);
+ outputStream = new FileOutputStream(output);
+
+ converter.convert(inputStream).as(sourceFormat).to(outputStream).as(DefaultDocumentFormatRegistry.PDF).execute();
+ outputStream.flush();
+
if (output.exists()) {
return true;
} else {
@@ -74,6 +94,22 @@ public class Office2PdfPageConverter {
String logStr = gson.toJson(logData);
log.error(" --analytics-- data={}", logStr, e);
return false;
+ } finally {
+ if(inputStream!=null) {
+ try {
+ inputStream.close();
+ } catch(Exception e) {
+
+ }
+ }
+
+ if(outputStream!=null) {
+ try {
+ outputStream.close();
+ } catch(Exception e) {
+
+ }
+ }
}
}
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentConversionFilter.java b/bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentConversionFilter.java
new file mode 100644
index 0000000000000000000000000000000000000000..82a8b2daaeb5c5fc91e6ae481f089da0ee8d216b
--- /dev/null
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentConversionFilter.java
@@ -0,0 +1,29 @@
+package org.bigbluebutton.presentation.imp;
+
+import org.jodconverter.core.office.OfficeContext;
+import org.jodconverter.local.filter.Filter;
+import org.jodconverter.local.filter.FilterChain;
+import org.jodconverter.local.office.utils.Lo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.sun.star.lang.XComponent;
+import com.sun.star.sheet.XCalculatable;
+
+public class OfficeDocumentConversionFilter implements Filter {
+
+ private static Logger log = LoggerFactory.getLogger(OfficeDocumentConversionFilter.class);
+
+ @Override
+ public void doFilter(OfficeContext context, XComponent document, FilterChain chain)
+ throws Exception {
+
+ log.info("Applying the OfficeDocumentConversionFilter");
+ Lo.qiOptional(XCalculatable.class, document).ifPresent((x) -> {
+ log.info("Turn AutoCalculate off");
+ x.enableAutomaticCalculation(false);
+ });
+
+ chain.doFilter(context, document);
+ }
+}
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeToPdfConversionService.java b/bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeToPdfConversionService.java
index e60ec5794d86c31bfd4c74bdfad7d1c53e887057..4329308ed79919448a1ff08656c7530abf1f9a7c 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeToPdfConversionService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeToPdfConversionService.java
@@ -20,16 +20,18 @@
package org.bigbluebutton.presentation.imp;
import java.io.File;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import org.bigbluebutton.presentation.ConversionMessageConstants;
import org.bigbluebutton.presentation.SupportedFileTypes;
import org.bigbluebutton.presentation.UploadedPresentation;
-import org.jodconverter.OfficeDocumentConverter;
-import org.jodconverter.office.DefaultOfficeManagerBuilder;
-import org.jodconverter.office.OfficeException;
-import org.jodconverter.office.OfficeManager;
+import org.jodconverter.core.office.OfficeException;
+import org.jodconverter.core.office.OfficeUtils;
+import org.jodconverter.local.LocalConverter;
+import org.jodconverter.local.office.ExternalOfficeManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,15 +41,15 @@ public class OfficeToPdfConversionService {
private static Logger log = LoggerFactory.getLogger(OfficeToPdfConversionService.class);
private OfficeDocumentValidator2 officeDocumentValidator;
- private final OfficeManager officeManager;
- private final OfficeDocumentConverter documentConverter;
+ private final ArrayList<ExternalOfficeManager> officeManagers;
+ private ExternalOfficeManager currentManager = null;
private boolean skipOfficePrecheck = false;
+ private int sofficeBasePort = 0;
+ private int sofficeManagers = 0;
+ private String sofficeWorkingDirBase = null;
- public OfficeToPdfConversionService() {
- final DefaultOfficeManagerBuilder configuration = new DefaultOfficeManagerBuilder();
- configuration.setPortNumbers(8100, 8101, 8102, 8103, 8104);
- officeManager = configuration.build();
- documentConverter = new OfficeDocumentConverter(officeManager);
+ public OfficeToPdfConversionService() throws OfficeException {
+ officeManagers = new ArrayList<>();
}
/*
@@ -116,8 +118,39 @@ public class OfficeToPdfConversionService {
private boolean convertOfficeDocToPdf(UploadedPresentation pres,
File pdfOutput) {
- Office2PdfPageConverter converter = new Office2PdfPageConverter();
- return converter.convert(pres.getUploadedFile(), pdfOutput, 0, pres, documentConverter);
+ boolean success = false;
+ int attempts = 0;
+
+ while(!success) {
+ LocalConverter documentConverter = LocalConverter
+ .builder()
+ .officeManager(currentManager)
+ .filterChain(new OfficeDocumentConversionFilter())
+ .build();
+
+ success = Office2PdfPageConverter.convert(pres.getUploadedFile(), pdfOutput, 0, pres, documentConverter);
+
+ if(!success) {
+ // In case of failure, try with other open Office Manager
+
+ if(++attempts != officeManagers.size()) {
+ // Go to next Office Manager ( if the last retry with the first one )
+ int currentManagerIndex = officeManagers.indexOf(currentManager);
+
+ boolean isLastManager = ( currentManagerIndex == officeManagers.size()-1 );
+ if(isLastManager) {
+ currentManager = officeManagers.get(0);
+ } else {
+ currentManager = officeManagers.get(currentManagerIndex+1);
+ }
+ } else {
+ // We tried to use all our office managers and it's still failing
+ break;
+ }
+ }
+ }
+
+ return success;
}
private void makePdfTheUploadedFileAndSetStepAsSuccess(UploadedPresentation pres, File pdf) {
@@ -133,21 +166,66 @@ public class OfficeToPdfConversionService {
this.skipOfficePrecheck = skipOfficePrecheck;
}
+ public void setSofficeBasePort(int sofficeBasePort) {
+ this.sofficeBasePort = sofficeBasePort;
+ }
+
+ public void setSofficeManagers(int sofficeServiceManagers) {
+ this.sofficeManagers = sofficeServiceManagers;
+ }
+
+ public void setSofficeWorkingDirBase(String sofficeWorkingDirBase) {
+ this.sofficeWorkingDirBase = sofficeWorkingDirBase;
+ }
+
public void start() {
- try {
- officeManager.start();
- } catch (OfficeException e) {
- log.error("Could not start Office Manager", e);
+ log.info("Starting LibreOffice pool with " + sofficeManagers + " managers, starting from port " + sofficeBasePort);
+
+ for(int managerIndex = 0; managerIndex < sofficeManagers; managerIndex ++) {
+ Integer instanceNumber = managerIndex + 1; // starts at 1
+
+ try {
+ final File workingDir = new File(sofficeWorkingDirBase + String.format("%02d", instanceNumber));
+
+ if(!workingDir.exists()) {
+ workingDir.mkdir();
+ }
+
+ ExternalOfficeManager officeManager = ExternalOfficeManager
+ .builder()
+ .connectTimeout(2000L)
+ .retryInterval(500L)
+ .portNumber(sofficeBasePort + managerIndex)
+ .connectOnStart(false) // If it's true and soffice is not available, exception is thrown here ( we don't want exception here - we want the manager alive trying to reconnect )
+ .workingDir(workingDir)
+ .build();
+
+ // Workaround for jodconverter not calling makeTempDir when connectOnStart=false (issue 211)
+ Method method = officeManager.getClass().getSuperclass().getDeclaredMethod("makeTempDir");
+ method.setAccessible(true);
+ method.invoke(officeManager);
+ // End of workaround for jodconverter not calling makeTempDir
+
+ officeManager.start();
+ officeManagers.add(officeManager);
+ } catch (Exception e) {
+ log.error("Could not start Office Manager " + instanceNumber + ". Details: " + e.getMessage());
+ }
}
+ if (officeManagers.size() == 0) {
+ log.error("No office managers could be started");
+ return;
+ }
+
+ currentManager = officeManagers.get(0);
}
public void stop() {
try {
- officeManager.stop();
- } catch (OfficeException e) {
+ officeManagers.forEach(officeManager -> officeManager.stop() );
+ } catch (Exception e) {
log.error("Could not stop Office Manager", e);
}
-
}
}
diff --git a/bbb-libreoffice/assets/bbb-libreoffice.service b/bbb-libreoffice/assets/bbb-libreoffice.service
new file mode 100644
index 0000000000000000000000000000000000000000..a61bdc64731e1a514b6b32f8f8e0e5fdba6793b2
--- /dev/null
+++ b/bbb-libreoffice/assets/bbb-libreoffice.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=BigBlueButton Libre Office container %i
+Requires=network.target
+
+[Service]
+Type=simple
+WorkingDirectory=/tmp
+ExecStart=/usr/share/bbb-libreoffice/libreoffice_container.sh %i
+ExecStop=/usr/bin/docker kill bbb-libreoffice-%i
+Restart=always
+RestartSec=60
+SuccessExitStatus=
+TimeoutStopSec=30
+PermissionsStartOnly=true
+LimitNOFILE=1024
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/bbb-libreoffice/assets/libreoffice_container.sh b/bbb-libreoffice/assets/libreoffice_container.sh
new file mode 100755
index 0000000000000000000000000000000000000000..dc1a4454c6109b420012a59bd475b1056d0ff08f
--- /dev/null
+++ b/bbb-libreoffice/assets/libreoffice_container.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+set -e
+
+INSTANCE_NUMBER=$1
+
+if [ -z "$INSTANCE_NUMBER" ]; then
+ INSTANCE_NUMBER=0
+fi;
+
+_kill() {
+ CHECK_CONTAINER=`docker inspect bbb-libreoffice-${INSTANCE_NUMBER} &> /dev/null && echo 1 || echo 0`
+ if [ "$CHECK_CONTAINER" = "1" ]; then
+ echo "Killing container"
+ docker kill bbb-libreoffice-${INSTANCE_NUMBER};
+ sleep 1
+ fi;
+}
+
+trap _kill SIGINT
+
+
+if (($INSTANCE_NUMBER >= 1)); then
+ PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
+ _kill
+
+ let PORT=8200+${INSTANCE_NUMBER}
+
+ SOFFICE_WORK_DIR="/var/tmp/soffice_"`printf "%02d\n" $INSTANCE_NUMBER`
+
+ INPUT_RULE="INPUT -i br-soffice -m state --state NEW -j DROP"
+ iptables -C $INPUT_RULE || iptables -I $INPUT_RULE
+
+ FORWARD_RULE="FORWARD -i br-soffice -m state --state NEW -j DROP"
+ iptables -C $FORWARD_RULE || iptables -I $FORWARD_RULE
+
+
+ docker run --network bbb-libreoffice --user `id -u bigbluebutton` --name bbb-libreoffice-${INSTANCE_NUMBER} -p $PORT:8000 -v${SOFFICE_WORK_DIR}:${SOFFICE_WORK_DIR} --rm bbb-libreoffice &
+
+ wait $!
+else
+ echo ;
+ echo "Invalid or missing parameter INSTANCE_NUMBER"
+ echo " Usage: $0 INSTANCE_NUMBER"
+ exit 1
+fi;
diff --git a/bbb-libreoffice/docker/Dockerfile b/bbb-libreoffice/docker/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..3f8a9983e9a8e171a33858f4ba7af7d2eb5e7bc7
--- /dev/null
+++ b/bbb-libreoffice/docker/Dockerfile
@@ -0,0 +1,15 @@
+FROM openjdk:8-jre
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt update
+
+RUN apt -y install locales-all fontconfig libxt6 libxrender1
+RUN apt -y install libreoffice --no-install-recommends
+
+RUN dpkg-reconfigure fontconfig && fc-cache -f -s -v
+
+VOLUME ["/usr/share/fonts/"]
+ADD ./bbb-libreoffice-entrypoint.sh /usr/local/bin/
+
+ENTRYPOINT ["/usr/local/bin/bbb-libreoffice-entrypoint.sh" ]
diff --git a/bbb-libreoffice/docker/bbb-libreoffice-entrypoint.sh b/bbb-libreoffice/docker/bbb-libreoffice-entrypoint.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e94594109498762c1c0c4786007d065d1495d1a8
--- /dev/null
+++ b/bbb-libreoffice/docker/bbb-libreoffice-entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+## Initialize environment
+/usr/lib/libreoffice/program/soffice.bin -env:UserInstallation="file:///tmp/"
+
+## Run daemon
+/usr/lib/libreoffice/program/soffice.bin --accept="socket,host=0.0.0.0,port=8000,tcpNoDelay=1;urp;StarOffice.ServiceManager" --headless --invisible --nocrashreport --nodefault --nofirststartwizard --nolockcheck --nologo --norestore -env:UserInstallation="file:///tmp/"
diff --git a/bbb-libreoffice/install.sh b/bbb-libreoffice/install.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c4aa96253730d0a581114dc1577b703d3c624c29
--- /dev/null
+++ b/bbb-libreoffice/install.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+if [ "$EUID" -ne 0 ]; then
+ echo "Please run this script as root ( or with sudo )" ;
+ exit 1;
+fi;
+
+DOCKER_CHECK=`docker --version &> /dev/null && echo 1 || echo 0`
+
+if [ "$DOCKER_CHECK" = "0" ]; then
+ echo "Docker not found";
+ apt update;
+ apt install apt-transport-https ca-certificates curl software-properties-common
+ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+ add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"
+ apt update
+ apt install docker-ce -y
+ systemctl enable docker
+ systemctl start docker
+ systemctl status docker
+else
+ echo "Docker already installed";
+fi
+
+
+IMAGE_CHECK=`docker image inspect bbb-libreoffice &> /dev/null && echo 1 || echo 0`
+if [ "$IMAGE_CHECK" = "0" ]; then
+ echo "Docker image doesn't exists, building"
+ docker build -t bbb-libreoffice docker/
+else
+ echo "Docker image already exists";
+fi
+
+NETWORK_CHECK=`docker network inspect bbb-libreoffice &> /dev/null && echo 1 || echo 0`
+
+if [ "$NETWORK_CHECK" = "0" ]; then
+ echo "Docker network doesn't exists, creating"
+ docker network create bbb-libreoffice -d bridge --opt com.docker.network.bridge.name=br-soffice
+fi
+
+FOLDER_CHECK=`[ -d /usr/share/bbb-libreoffice/ ] && echo 1 || echo 0`
+if [ "$FOLDER_CHECK" = "0" ]; then
+ echo "Install folder doesn't exists, installing"
+ mkdir -m 755 /usr/share/bbb-libreoffice/
+ cp assets/libreoffice_container.sh /usr/share/bbb-libreoffice/
+ chmod 700 /usr/share/bbb-libreoffice/libreoffice_container.sh
+ chown -R root /usr/share/bbb-libreoffice/
+
+ cp assets/bbb-libreoffice.service /lib/systemd/system/bbb-libreoffice@.service
+ systemctl daemon-reload
+
+ for i in `seq 1 4` ; do
+ systemctl enable bbb-libreoffice@${i}
+ systemctl start bbb-libreoffice@${i}
+ done
+
+else
+ echo "Install folder already exists"
+fi;
+
diff --git a/bbb-libreoffice/uninstall.sh b/bbb-libreoffice/uninstall.sh
new file mode 100755
index 0000000000000000000000000000000000000000..991f4e36c81ffdee7f44ae17b6baf264bef6b76a
--- /dev/null
+++ b/bbb-libreoffice/uninstall.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+set -e
+
+if [ "$EUID" -ne 0 ]; then
+ echo "Please run this script as root ( or with sudo )" ;
+ exit 1;
+fi;
+
+IMAGE_CHECK=`docker image inspect bbb-libreoffice 2>&1 > /dev/null && echo 1 || echo 0`
+if [ "$IMAGE_CHECK" = "1" ]; then
+ echo "Stopping services"
+ systemctl --no-pager --no-legend --value --state=running | grep bbb-libreoffice | awk -F '.service' '{print $1}' | xargs --no-run-if-empty -n 1 systemctl stop
+
+ echo "Removing image"
+ docker image rm bbb-libreoffice
+fi
+
+FOLDER_CHECK=`[ -d /usr/share/bbb-libreoffice/ ] && echo 1 || echo 0`
+if [ "$FOLDER_CHECK" = "1" ]; then
+ echo "Stopping services"
+ systemctl --no-pager --no-legend --value --state=running | grep bbb-libreoffice | awk -F '.service' '{print $1}' | xargs --no-run-if-empty -n 1 systemctl stop
+
+ echo "Removing install folder"
+ rm -rf /usr/share/bbb-libreoffice/
+
+ echo "Removing service definitions"
+ rm /lib/systemd/system/bbb-libreoffice@.service
+ find /etc/systemd/ | grep bbb-libreoffice | xargs --no-run-if-empty -n 1 -I __ rm __
+ systemctl daemon-reload
+fi;
+
+NETWORK_CHECK=`docker network inspect bbb-libreoffice &> /dev/null && echo 1 || echo 0`
+if [ "$NETWORK_CHECK" = "1" ]; then
+ echo "Removing docker network"
+ docker network remove bbb-libreoffice
+fi
+
diff --git a/bbb-lti/Dockerfile b/bbb-lti/Dockerfile
index 318681aa416f09e1f6ec6619271eb2771f856dc7..ca6b6e6266ad2f800cd8f7183ce13aec48c4668f 100644
--- a/bbb-lti/Dockerfile
+++ b/bbb-lti/Dockerfile
@@ -2,7 +2,7 @@ FROM java:8-jdk AS builder
RUN mkdir -p /root/tools \
&& cd /root/tools \
- && wget http://services.gradle.org/distributions/gradle-2.12-bin.zip \
+ && wget https://services.gradle.org/distributions/gradle-2.12-bin.zip \
&& unzip gradle-2.12-bin.zip \
&& ln -s gradle-2.12 gradle
diff --git a/bbb-lti/grails-app/views/tool/index.gsp b/bbb-lti/grails-app/views/tool/index.gsp
index 8ae06e529c1b04a2276dedd3b45f63ec9c9e47f9..136e9e1ad8fbb962060188313f1f2acd8e49470a 100644
--- a/bbb-lti/grails-app/views/tool/index.gsp
+++ b/bbb-lti/grails-app/views/tool/index.gsp
@@ -51,9 +51,7 @@
<g:if test="${r.published}">
<div>
<g:each in="${r.thumbnails}" var="thumbnail">
- <g:each in="${thumbnail.content}" var="thumbnail_url">
- <img src="${thumbnail_url}" class="thumbnail"/>
- </g:each>
+ <img src="${thumbnail.content}" class="thumbnail"/>
</g:each>
</div>
</g:if>
diff --git a/bbb-webhooks/callback_emitter.js b/bbb-webhooks/callback_emitter.js
index 9519c9fad10e4567237314184a6bc1512c24c765..3c22fc2f7527f9db90b4848b24d8884f95df31d5 100644
--- a/bbb-webhooks/callback_emitter.js
+++ b/bbb-webhooks/callback_emitter.js
@@ -61,10 +61,11 @@ module.exports = class CallbackEmitter extends EventEmitter {
}
_emitMessage(callback) {
- let data,requestOptions;
+ let data, requestOptions;
const serverDomain = config.get("bbb.serverDomain");
const sharedSecret = config.get("bbb.sharedSecret");
const bearerAuth = config.get("bbb.auth2_0");
+ const timeout = config.get('hooks.requestTimeout');
// data to be sent
// note: keep keys in alphabetical order
@@ -85,7 +86,8 @@ module.exports = class CallbackEmitter extends EventEmitter {
form: data,
auth: {
bearer: sharedSecret
- }
+ },
+ timeout
};
}
else {
@@ -103,7 +105,8 @@ module.exports = class CallbackEmitter extends EventEmitter {
maxRedirects: 10,
uri: callbackURL,
method: "POST",
- form: data
+ form: data,
+ timeout
};
}
diff --git a/bbb-webhooks/config/custom-environment-variables.yml b/bbb-webhooks/config/custom-environment-variables.yml
index 69733ad4a7331b065da09cb6ce18164cd99e1cb1..c8dbc2c0504fbd1811ad890eb59af296fdd13f12 100644
--- a/bbb-webhooks/config/custom-environment-variables.yml
+++ b/bbb-webhooks/config/custom-environment-variables.yml
@@ -6,6 +6,9 @@ hooks:
permanentURLs:
__name: PERMANENT_HOOKS
__format: json
+ requestTimeout:
+ __name: REQUEST_TIMEOUT
+ __format: json
redis:
host: REDIS_HOST
port: REDIS_PORT
diff --git a/bbb-webhooks/config/default.example.yml b/bbb-webhooks/config/default.example.yml
index 037f3b9ad66f4345f7117d45d9bc56edd73830c0..1ca2983dc88ca1499f2c5751f4eb2b9c07541c6a 100644
--- a/bbb-webhooks/config/default.example.yml
+++ b/bbb-webhooks/config/default.example.yml
@@ -47,6 +47,8 @@ hooks:
- 60000
# Reset permanent interval when exceeding maximum attemps
permanentIntervalReset: 8
+ # Hook's request module timeout for socket conn establishment and/or responses (ms)
+ requestTimeout: 5000
# Mappings of internal to external meeting IDs
mappings:
@@ -64,4 +66,4 @@ redis:
mappingPrefix: bigbluebutton:webhooks:mapping
eventsPrefix: bigbluebutton:webhooks:events
userMaps: bigbluebutton:webhooks:userMaps
- userMapPrefix: bigbluebutton:webhooks:userMap
\ No newline at end of file
+ userMapPrefix: bigbluebutton:webhooks:userMap
diff --git a/bbb-webhooks/package-lock.json b/bbb-webhooks/package-lock.json
index 2b48d377cbb3c0d8cc8de49593f649ad40a66967..81b685e5f327588946ff5df33ca318df91e080a2 100644
--- a/bbb-webhooks/package-lock.json
+++ b/bbb-webhooks/package-lock.json
@@ -725,7 +725,7 @@
},
"http-errors": {
"version": "1.6.3",
- "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
"requires": {
"depd": "~1.1.2",
@@ -848,9 +848,9 @@
}
},
"lodash": {
- "version": "4.17.15",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
- "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+ "version": "4.17.19",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+ "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
},
"lodash.get": {
"version": "4.4.2",
@@ -883,7 +883,7 @@
},
"media-typer": {
"version": "0.3.0",
- "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
},
"merge-descriptors": {
@@ -923,17 +923,19 @@
"brace-expansion": "^1.1.7"
}
},
- "minimist": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
- "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
- },
"mkdirp": {
"version": "0.5.1",
"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"requires": {
"minimist": "0.0.8"
+ },
+ "dependencies": {
+ "minimist": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+ }
}
},
"mocha": {
diff --git a/bbb-webhooks/package.json b/bbb-webhooks/package.json
old mode 100755
new mode 100644
index 1af75a84cc2bb25ce6c4454ce622c3bf0ff69a33..d896daea56648a9c1ee1a8e83d31f4c76f40e615
--- a/bbb-webhooks/package.json
+++ b/bbb-webhooks/package.json
@@ -13,7 +13,7 @@
"config": "1.30.0",
"express": "4.16.4",
"js-yaml": "^3.13.1",
- "lodash": "^4.17.15",
+ "lodash": "^4.17.19",
"nock": "^10.0.4",
"redis": "^2.8.0",
"request": "2.88.0",
diff --git a/bigbluebutton-config/bigbluebutton-release b/bigbluebutton-config/bigbluebutton-release
index 7eaaa8ccdda6d216b95cfab9905f5520cbc31c10..2d1a2c0c9e1eeeca9dbb35b798721c5c0f688568 100644
--- a/bigbluebutton-config/bigbluebutton-release
+++ b/bigbluebutton-config/bigbluebutton-release
@@ -1,2 +1 @@
BIGBLUEBUTTON_RELEASE=2.3.0-dev
-
diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index d6d36bba2a35b132d33579a899620a93845209bb..d153f44c7752c0e1a75af39cdcacc79409f69d01 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash
#
# BlueButton open source conferencing system - http://www.bigbluebutton.org/
#
@@ -65,6 +65,7 @@
# 2019-10-31 GTR Set IP and shared secret for bbb-webhooks
# 2019-11-09 GTR Keep HTML5 client logs permissions when cleaning logs
# 2020-05-20 NJH Add port 443 to --Network and clean up tmp file.
+# 2020-06-23 JFS Remove defaultGuestPolicy warning for HTML5 client
#set -x
#set -e
@@ -446,7 +447,7 @@ start_bigbluebutton () {
display_bigbluebutton_status () {
units="nginx freeswitch $REDIS_SERVICE bbb-apps-akka bbb-transcode-akka bbb-fsesl-akka"
-
+
if [ -f /usr/share/red5/red5-server.jar ]; then
units="$units red5"
fi
@@ -734,7 +735,7 @@ check_configuration() {
fi
fi
- if [ "$IP" != "$NGINX_IP" ]; then
+ if [ "$IP" != "$NGINX_IP" ] && [ "_" != "$NGINX_IP" ]; then
if [ "$IP" != "$HOSTS" ]; then
echo "# IP does not match:"
echo "# IP from ifconfig: $IP"
@@ -877,24 +878,10 @@ check_configuration() {
echo "# Warning: Detected the value for jnlpUrl is not configured for HTTPS"
echo "# /usr/share/red5/webapps/screenshare/WEB-INF/screenshare.properties"
echo "#"
- fi
+ fi
fi
fi
- GUEST_POLICY=$(cat $BBB_WEB_CONFIG | grep -v '#' | sed -n '/^defaultGuestPolicy/{s/.*=//;p}')
- if [ "$GUEST_POLICY" == "ASK_MODERATOR" ]; then
- echo
- echo "# Warning: defaultGuestPolicy is set to ASK_MODERATOR in"
- echo "# $BBB_WEB_CONFIG"
- echo "# This is not yet supported yet the HTML5 client."
- echo "#"
- echo "# To revert it to ALWAYS_ALLOW, see"
- echo "#"
- echo "# $SUDO sed -i s/^defaultGuestPolicy=.*$/defaultGuestPolicy=ALWAYS_ALLOW/g $SERVLET_DIR/WEB-INF/classes/bigbluebutton.properties"
- echo "#"
- echo
- fi
-
if [ -f $HTML5_CONFIG ]; then
SVG_IMAGES_REQUIRED=$(cat $BBB_WEB_CONFIG | grep -v '#' | sed -n '/^svgImagesRequired/{s/.*=//;p}')
if [ "$SVG_IMAGES_REQUIRED" != "true" ]; then
@@ -910,12 +897,12 @@ check_configuration() {
fi
fi
- if [ -f /usr/share/red5/red5-server.jar ]; then
- if find /usr/share /var/lib/red5 -name "*bbb-common-message*" | sed 's/\([^_]*_\).*/\1/g' | sort | uniq -c | grep -v 1 > /dev/null; then echo
+ if [ -f /usr/share/red5/red5-server.jar ]; then
+ if find /usr/share /var/lib/red5 -name "*bbb-common-message*" | sed 's/\([^_]*_\).*/\1/g' | sort | uniq -c | grep -v 1 > /dev/null; then echo
echo
echo "# Warning: detected multiple bbb-common-message in the same directory"
- find /usr/share /var/lib/red5 -name "*bbb-common-message*" | sed 's/\([^_]*_\).*/\1/g' | sort | uniq -c | grep -v 1
- echo
+ find /usr/share /var/lib/red5 -name "*bbb-common-message*" | sed 's/\([^_]*_\).*/\1/g' | sort | uniq -c | grep -v 1
+ echo
fi
fi
}
@@ -1122,7 +1109,8 @@ check_state() {
# Check FreeSWITCH
#
- if ! echo "/quit" | /opt/freeswitch/bin/fs_cli - > /dev/null 2>&1; then
+ ESL_PASSWORD=$(xmlstarlet sel -t -m 'configuration/settings/param[@name="password"]' -v @value /opt/freeswitch/etc/freeswitch/autoload_configs/event_socket.conf.xml)
+ if ! echo "/quit" | /opt/freeswitch/bin/fs_cli -p $ESL_PASSWORD - > /dev/null 2>&1; then
echo
echo "#"
echo "# Error: Unable to connect to the FreeSWITCH Event Socket Layer on port 8021"
@@ -1234,7 +1222,7 @@ check_state() {
# Check if the local server can access the API. This is a common problem when setting up BigBlueButton behind
# a firewall
#
- BBB_WEB=$(cat ${SERVLET_DIR}/WEB-INF/classes/bigbluebutton.properties | grep -v '#' | sed -n '/^bigbluebutton.web.serverURL/{s/.*\///;p}')
+ BBB_WEB=$(cat ${SERVLET_DIR}/WEB-INF/classes/bigbluebutton.properties | grep -v '#' | sed -n '/^bigbluebutton.web.serverURL/{s/.*\/\///;p}')
check_no_value server_name /etc/nginx/sites-available/bigbluebutton $BBB_WEB
COUNT=0
@@ -1263,9 +1251,9 @@ check_state() {
# Check that BigBlueButton can connect to port 1935
#
if [ -f /usr/share/red5/red5-server.jar ]; then
- if [[ ! -z $NGINX_IP && $DISTRIB_ID != "centos" ]]; then
- if ! nc -w 3 $NGINX_IP 1935 > /dev/null; then
- echo "# Error: Unable to connect to port 1935 (RTMP) on $NGINX_IP"
+ if [[ ! -z $RED5_IP && $DISTRIB_ID != "centos" ]]; then
+ if ! nc -w 3 $RED5_IP 1935 > /dev/null; then
+ echo "# Error: Unable to connect to port 1935 (RTMP) on $RED5_IP"
echo
fi
fi
@@ -1495,7 +1483,7 @@ check_state() {
CHECK=$(cat ${SERVLET_DIR}/WEB-INF/classes/bigbluebutton.properties | grep -v '#' | grep securitySalt | cut -d= -f2 | sha1sum | cut -d' ' -f1)
if [ "$CHECK" == "55b727b294158a877212570c3c0524c2b902a62c" ]; then
- echo
+ echo
echo "#"
echo "# Warning: Detected you have the default shared secret. You MUST change your shared"
echo "# secret NOW for BigBlueButton to finish starting up. Do either"
@@ -1513,7 +1501,7 @@ check_state() {
fi
if ! systemctl show-environment | grep LANG= | grep -q UTF-8; then
- echo
+ echo
echo "#"
echo "# Warning: Detected that systemctl does not define a UTF-8 language."
echo "#"
@@ -1526,7 +1514,7 @@ check_state() {
fi
if [ "$(stat -c "%U %G" /var/bigbluebutton)" != "bigbluebutton bigbluebutton" ]; then
- echo
+ echo
echo "#"
echo "# Warning: The directory"
echo "#"
@@ -1545,7 +1533,7 @@ check_state() {
if [ "$FREESWITCH_SIP" != "$KURENTO_SIP" ]; then
echo
echo "#"
- echo "# Kurento is will try to connect to $KURENTO_SIP but FreeSWITCH is listening on $FREESWITCH_SIP for port 5066"
+ echo "# Kurento will try to connect to $KURENTO_SIP but FreeSWITCH is listening on $FREESWITCH_SIP for port 5066"
echo "#"
echo "# To fix, run the commands"
echo "#"
@@ -1690,13 +1678,15 @@ if [ $CHECK ]; then
echo " enableListenOnly: $(yq r $HTML5_CONFIG public.kurento.enableListenOnly)"
fi
- if ! java -version 2>&1 | grep -q "1.8.0"; then
+ if [ "$DISTRIB_CODENAME" == "xenial" ]; then
+ if ! java -version 2>&1 | grep -q "1.8.0"; then
echo
echo "# Warning: Did not detect Java 8 as default version"
echo
echo " sudo apt-get install openjdk-8-jdk"
echo " update-alternatives --config java"
echo " bbb-conf --restart"
+ fi
fi
check_state
@@ -1864,7 +1854,7 @@ if [ -n "$HOST" ]; then
echo "Assigning $HOST for servername in /etc/nginx/sites-available/bigbluebutton"
$SUDO sed -i "s/server_name .*/server_name $HOST;/g" /etc/nginx/sites-available/bigbluebutton
-
+
#
# Update configuration for BigBlueButton client (and preserve hostname for chromeExtensionLink if exists)
#
@@ -1883,7 +1873,7 @@ if [ -n "$HOST" ]; then
echo "Assigning $HOST for publishURI in /var/www/bigbluebutton/client/conf/config.xml"
$SUDO sed -i "s/publishURI=\"[^\"]*\"/publishURI=\"$HOST\"/" /var/www/bigbluebutton/client/conf/config.xml
- fi
+ fi
#
# Update configuration for BigBlueButton web app
@@ -2005,6 +1995,18 @@ if [ -n "$HOST" ]; then
#fi
fi
+ ESL_PASSWORD=$(xmlstarlet sel -t -m 'configuration/settings/param[@name="password"]' -v @value /opt/freeswitch/etc/freeswitch/autoload_configs/event_socket.conf.xml)
+ if [ "$ESL_PASSWORD" == "ClueCon" ]; then
+ ESL_PASSWORD=$(openssl rand -hex 8)
+ echo "Changing default password for FreeSWITCH Event Socket Layer (see /opt/freeswitch/etc/freeswitch/autoload_configs/event_socket.conf.xml)"
+ fi
+ # Update all references to ESL password
+
+ sudo sed -i "s/ClueCon/$ESL_PASSWORD/g" /opt/freeswitch/etc/freeswitch/autoload_configs/event_socket.conf.xml
+ sudo sed -i "s/ClueCon/$ESL_PASSWORD/g" /usr/share/bbb-fsesl-akka/conf/application.conf
+ sudo yq w -i /usr/local/bigbluebutton/bbb-webrtc-sfu/config/default.yml freeswitch.esl_password "$ESL_PASSWORD"
+
+
echo "Restarting the BigBlueButton $BIGBLUEBUTTON_RELEASE ..."
stop_bigbluebutton
update_gstreamer
diff --git a/bigbluebutton-config/cron.hourly/bbb-restart-kms b/bigbluebutton-config/cron.hourly/bbb-restart-kms
new file mode 100644
index 0000000000000000000000000000000000000000..a4bec48bceceabef2f6519a4ca79f993b756937a
--- /dev/null
+++ b/bigbluebutton-config/cron.hourly/bbb-restart-kms
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+#
+# Restart Kurento every 24+ hours
+#
+
+if [ ! -f /var/tmp/bbb-kms-last-restart.txt ]; then
+ date +%Y-%m-%d\ %H:%M:%S > /var/tmp/bbb-kms-last-restart.txt
+ exit
+fi
+
+users=$(mongo --quiet mongodb://127.0.1.1:27017/meteor --eval "db.users.count({connectionStatus: 'online'})")
+
+if [ "$users" -eq 0 ]; then
+
+ # Make sure 24 hours have passed since last restart
+
+ # Seconds since epoch for last restart
+ dt1=$(cat /var/tmp/bbb-kms-last-restart.txt)
+ t1=`date --date="$dt1" +%s`
+
+ # Current seconds since epoch
+ dt2=`date +%Y-%m-%d\ %H:%M:%S`
+ t2=`date --date="$dt2" +%s`
+
+ # Hours since last restart
+ let "tDiff=$t2-$t1"
+ let "hDiff=$tDiff/3600"
+
+ if [ "$hDiff" -ge 24 ]; then
+ systemctl restart kurento-media-server bbb-webrtc-sfu
+ date +%Y-%m-%d\ %H:%M:%S > /var/tmp/bbb-kms-last-restart.txt
+ fi
+fi
+
diff --git a/bigbluebutton-config/cron.hourly/bbb-resync-freeswitch b/bigbluebutton-config/cron.hourly/bbb-resync-freeswitch
index 8c25c6654e5274f3f2c60999bc051e8f9b3f8fe0..fe3cdffa31d23581ee38ff3f7029d9f9f5f72bbb 100755
--- a/bigbluebutton-config/cron.hourly/bbb-resync-freeswitch
+++ b/bigbluebutton-config/cron.hourly/bbb-resync-freeswitch
@@ -1,3 +1,3 @@
#!/bin/bash
-/opt/freeswitch/bin/fs_cli -x 'fsctl sync_clock_when_idle' > /var/log/freeswitch_sync_clock.log 2>&1
+/opt/freeswitch/bin/fs_cli -x 'fsctl sync_clock_when_idle' -p $(xmlstarlet sel -t -m 'configuration/settings/param[@name="password"]' -v @value /opt/freeswitch/etc/freeswitch/autoload_configs/event_socket.conf.xml) > /var/log/freeswitch_sync_clock.log 2>&1
diff --git a/bigbluebutton-config/web/default.pdf b/bigbluebutton-config/web/default.pdf
index 32374bcd895297a8f8e00a3499736f1ae7300d44..5ad63361d5d78783ee82f72739fd6a98df1ecc8a 100644
Binary files a/bigbluebutton-config/web/default.pdf and b/bigbluebutton-config/web/default.pdf differ
diff --git a/bigbluebutton-config/web/default.pptx b/bigbluebutton-config/web/default.pptx
index 6ccc8d55822dd504512dd6b6edfe39e25e1a10f0..fd6a9634e6ecaa0aa507bfd8dd26cf6f4cad1e13 100644
Binary files a/bigbluebutton-config/web/default.pptx and b/bigbluebutton-config/web/default.pptx differ
diff --git a/bigbluebutton-html5/.meteor/packages b/bigbluebutton-html5/.meteor/packages
index 92645a8900c9b7ea3d8a77039561d9fb15f81852..8a586a60ab364985aabb2565c7c9e597a4f5a98f 100644
--- a/bigbluebutton-html5/.meteor/packages
+++ b/bigbluebutton-html5/.meteor/packages
@@ -4,15 +4,15 @@
# but you can also edit it by hand.
meteor-base@1.4.0
-mobile-experience@1.0.5
-mongo@1.8.0
+mobile-experience@1.1.0
+mongo@1.10.0
reactive-var@1.0.11
standard-minifier-css@1.6.0
standard-minifier-js@2.6.0
es5-shim@4.8.0
-ecmascript@0.14.0
-shell-server@0.4.0
+ecmascript@0.14.3
+shell-server@0.5.0
static-html
react-meteor-data
diff --git a/bigbluebutton-html5/.meteor/release b/bigbluebutton-html5/.meteor/release
index c6ae8ec13c5f0712c9900e0201143d94a6d1c0f3..3ea26528c0968de902f24a160a5a000fcd4b4cb7 100644
--- a/bigbluebutton-html5/.meteor/release
+++ b/bigbluebutton-html5/.meteor/release
@@ -1 +1 @@
-METEOR@1.9
+METEOR@1.10.2
diff --git a/bigbluebutton-html5/.meteor/versions b/bigbluebutton-html5/.meteor/versions
index 1990d472ff56f4cf641809868a518884a13e707e..e6958ac386ee4af174b3fe6c0cd6f280624e0a02 100644
--- a/bigbluebutton-html5/.meteor/versions
+++ b/bigbluebutton-html5/.meteor/versions
@@ -1,12 +1,12 @@
allow-deny@1.1.0
autoupdate@1.6.0
-babel-compiler@7.5.0
+babel-compiler@7.5.3
babel-runtime@1.5.0
base64@1.0.12
binary-heap@1.0.11
blaze-tools@1.0.10
-boilerplate-generator@1.6.0
-caching-compiler@1.2.1
+boilerplate-generator@1.7.0
+caching-compiler@1.2.2
caching-html-compiler@1.1.3
callback-hook@1.3.0
cfs:micro-queue@0.0.6
@@ -17,11 +17,11 @@ check@1.3.1
ddp@1.4.0
ddp-client@2.3.3
ddp-common@1.4.0
-ddp-server@2.3.0
+ddp-server@2.3.2
deps@1.0.12
diff-sequence@1.1.1
-dynamic-import@0.5.1
-ecmascript@0.14.0
+dynamic-import@0.5.2
+ecmascript@0.14.3
ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.10.0
ecmascript-runtime-server@0.9.0
@@ -34,39 +34,39 @@ html-tools@1.0.11
htmljs@1.0.11
http@1.4.2
id-map@1.1.0
-inter-process-messaging@0.1.0
-launch-screen@1.1.1
+inter-process-messaging@0.1.1
+launch-screen@1.2.0
livedata@1.0.18
logging@1.1.20
meteor@1.9.3
meteor-base@1.4.0
-minifier-css@1.5.0
+minifier-css@1.5.1
minifier-js@2.6.0
-minimongo@1.4.5
-mobile-experience@1.0.5
-mobile-status-bar@1.0.14
-modern-browsers@0.1.4
+minimongo@1.6.0
+mobile-experience@1.1.0
+mobile-status-bar@1.1.0
+modern-browsers@0.1.5
modules@0.15.0
modules-runtime@0.12.0
-mongo@1.8.0
+mongo@1.10.0
mongo-decimal@0.1.1
mongo-dev-server@1.1.0
mongo-id@1.0.7
nathantreid:css-modules@4.1.0
-npm-mongo@3.3.0
+npm-mongo@3.7.1
ordered-dict@1.1.0
promise@0.11.2
-random@1.1.0
+random@1.2.0
react-meteor-data@0.2.16
reactive-dict@1.3.0
reactive-var@1.0.11
reload@1.3.0
retry@1.1.0
-rocketchat:streamer@1.0.1
+rocketchat:streamer@1.1.0
routepolicy@1.1.0
session@1.2.0
-shell-server@0.4.0
-socket-stream-client@0.2.2
+shell-server@0.5.0
+socket-stream-client@0.3.0
spacebars-compiler@1.1.3
standard-minifier-css@1.6.0
standard-minifier-js@2.6.0
@@ -75,6 +75,6 @@ templating-tools@1.1.2
tmeasday:check-npm-versions@0.3.2
tracker@1.2.0
underscore@1.0.10
-url@1.2.0
-webapp@1.8.0
+url@1.3.1
+webapp@1.9.1
webapp-hashing@1.0.9
diff --git a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
index 12f8d734a7132adaf484d728faf46a606f7a50d0..edf50f7843810eaa6df601eab16ef17aed0c1507 100755
--- a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
+++ b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
@@ -95,6 +95,7 @@ class SIPSession {
extraInfo: {
errorCode: error.code,
errorMessage: error.message,
+ callerIdName: this.user.callerIdName,
},
}, 'Full audio bridge failed to fetch STUN/TURN info');
return getFallbackStun();
@@ -232,6 +233,7 @@ class SIPSession {
const {
callerIdName,
+ sessionToken,
} = this.user;
// WebView safari needs a transceiver to be added. Made it a SIP.js hack.
@@ -245,15 +247,15 @@ class SIPSession {
// translation
const isSafari = browser().name === 'safari';
- logger.debug({ logCode: 'sip_js_creating_user_agent' }, 'Creating the user agent');
+ logger.debug({ logCode: 'sip_js_creating_user_agent', extraInfo: { callerIdName } }, 'Creating the user agent');
if (this.userAgent && this.userAgent.isConnected()) {
if (this.userAgent.configuration.hostPortParams === this.hostname) {
- logger.debug({ logCode: 'sip_js_reusing_user_agent' }, 'Reusing the user agent');
+ logger.debug({ logCode: 'sip_js_reusing_user_agent', extraInfo: { callerIdName } }, 'Reusing the user agent');
resolve(this.userAgent);
return;
}
- logger.debug({ logCode: 'sip_js_different_host_name' }, 'Different host name. need to kill');
+ logger.debug({ logCode: 'sip_js_different_host_name', extraInfo: { callerIdName } }, 'Different host name. need to kill');
}
const localSdpCallback = (sdp) => {
@@ -271,10 +273,11 @@ class SIPSession {
};
let userAgentConnected = false;
+ const token = `sessionToken=${sessionToken}`;
this.userAgent = new window.SIP.UA({
uri: `sip:${encodeURIComponent(callerIdName)}@${hostname}`,
- wsServers: `${(protocol === 'https:' ? 'wss://' : 'ws://')}${hostname}/ws`,
+ wsServers: `${(protocol === 'https:' ? 'wss://' : 'ws://')}${hostname}/ws?${token}`,
displayName: callerIdName,
register: false,
traceSip: true,
@@ -407,7 +410,7 @@ class SIPSession {
let iceNegotiationTimeout;
const handleSessionAccepted = () => {
- logger.info({ logCode: 'sip_js_session_accepted' }, 'Audio call session accepted');
+ logger.info({ logCode: 'sip_js_session_accepted', extraInfo: { callerIdName: this.user.callerIdName } }, 'Audio call session accepted');
clearTimeout(callTimeout);
currentSession.off('accepted', handleSessionAccepted);
@@ -427,7 +430,7 @@ class SIPSession {
currentSession.on('accepted', handleSessionAccepted);
const handleSessionProgress = (update) => {
- logger.info({ logCode: 'sip_js_session_progress' }, 'Audio call session progress update');
+ logger.info({ logCode: 'sip_js_session_progress', extraInfo: { callerIdName: this.user.callerIdName } }, 'Audio call session progress update');
clearTimeout(callTimeout);
currentSession.off('progress', handleSessionProgress);
};
@@ -436,7 +439,10 @@ class SIPSession {
const handleConnectionCompleted = (peer) => {
logger.info({
logCode: 'sip_js_ice_connection_success',
- extraInfo: { currentState: peer.iceConnectionState },
+ extraInfo: {
+ currentState: peer.iceConnectionState,
+ callerIdName: this.user.callerIdName,
+ },
}, `ICE connection success. Current state - ${peer.iceConnectionState}`);
clearTimeout(callTimeout);
clearTimeout(iceNegotiationTimeout);
@@ -462,7 +468,7 @@ class SIPSession {
logger.error({
logCode: 'sip_js_call_terminated',
- extraInfo: { cause },
+ extraInfo: { cause, callerIdName: this.user.callerIdName },
}, `Audio call terminated. cause=${cause}`);
let mappedCause;
@@ -482,9 +488,9 @@ class SIPSession {
const handleIceNegotiationFailed = (peer) => {
if (iceCompleted) {
- logger.error({ logCode: 'sipjs_ice_failed_after' }, 'ICE connection failed after success');
+ logger.error({ logCode: 'sipjs_ice_failed_after', extraInfo: { callerIdName: this.user.callerIdName } }, 'ICE connection failed after success');
} else {
- logger.error({ logCode: 'sipjs_ice_failed_before' }, 'ICE connection failed before success');
+ logger.error({ logCode: 'sipjs_ice_failed_before', extraInfo: { callerIdName: this.user.callerIdName } }, 'ICE connection failed before success');
}
clearTimeout(callTimeout);
clearTimeout(iceNegotiationTimeout);
@@ -500,7 +506,7 @@ class SIPSession {
const handleIceConnectionTerminated = (peer) => {
['iceConnectionClosed'].forEach(e => mediaHandler.off(e, handleIceConnectionTerminated));
if (!this.userRequestedHangup) {
- logger.error({ logCode: 'sipjs_ice_closed' }, 'ICE connection closed');
+ logger.error({ logCode: 'sipjs_ice_closed', extraInfo: { callerIdName: this.user.callerIdName } }, 'ICE connection closed');
}
/*
this.callback({
@@ -588,7 +594,7 @@ export default class SIPBridge extends BaseAudioBridge {
shouldTryReconnect = true;
} else if (hasFallbackDomain === true && hostname !== IPV4_FALLBACK_DOMAIN) {
message.silenceNotifications = true;
- logger.info({ logCode: 'sip_js_attempt_ipv4_fallback' }, 'Attempting to fallback to IPv4 domain for audio');
+ logger.info({ logCode: 'sip_js_attempt_ipv4_fallback', extraInfo: { callerIdName: this.user.callerIdName } }, 'Attempting to fallback to IPv4 domain for audio');
hostname = IPV4_FALLBACK_DOMAIN;
shouldTryReconnect = true;
}
@@ -704,7 +710,7 @@ export default class SIPBridge extends BaseAudioBridge {
} catch (err) {
logger.error({
logCode: 'audio_sip_changeoutputdevice_error',
- extraInfo: { error: err },
+ extraInfo: { error: err, callerIdName: this.user.callerIdName },
}, 'Change Output Device error');
throw new Error(this.baseErrorCodes.MEDIA_ERROR);
}
diff --git a/bigbluebutton-html5/imports/api/breakouts/server/publishers.js b/bigbluebutton-html5/imports/api/breakouts/server/publishers.js
index 405414e284aaad2526bae26c2ef4ab49568c3740..a756c0e42680bf8672fdd58a90a3e6f145adf198 100755
--- a/bigbluebutton-html5/imports/api/breakouts/server/publishers.js
+++ b/bigbluebutton-html5/imports/api/breakouts/server/publishers.js
@@ -6,7 +6,7 @@ import { extractCredentials } from '/imports/api/common/server/helpers';
const ROLE_MODERATOR = Meteor.settings.public.user.role_moderator;
-function breakouts() {
+function breakouts(role) {
if (!this.userId) {
return Breakouts.find({ meetingId: '' });
}
diff --git a/bigbluebutton-html5/imports/api/connection-status/index.js b/bigbluebutton-html5/imports/api/connection-status/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..d68450f84e7a65c66e772806e44eed2e1d531f23
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/connection-status/index.js
@@ -0,0 +1,9 @@
+import { Meteor } from 'meteor/meteor';
+
+const ConnectionStatus = new Mongo.Collection('connection-status');
+
+if (Meteor.isServer) {
+ ConnectionStatus._ensureIndex({ meetingId: 1, userId: 1 });
+}
+
+export default ConnectionStatus;
diff --git a/bigbluebutton-html5/imports/api/connection-status/server/index.js b/bigbluebutton-html5/imports/api/connection-status/server/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..cb2e66644f3c19b6fa865fa348de96a9281aa51f
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/connection-status/server/index.js
@@ -0,0 +1,2 @@
+import './methods';
+import './publishers';
diff --git a/bigbluebutton-html5/imports/api/connection-status/server/methods.js b/bigbluebutton-html5/imports/api/connection-status/server/methods.js
new file mode 100644
index 0000000000000000000000000000000000000000..14b3131b80d88ee4f84acb8efc17c6c123fd6bfd
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/connection-status/server/methods.js
@@ -0,0 +1,6 @@
+import { Meteor } from 'meteor/meteor';
+import addConnectionStatus from './methods/addConnectionStatus';
+
+Meteor.methods({
+ addConnectionStatus,
+});
diff --git a/bigbluebutton-html5/imports/api/connection-status/server/methods/addConnectionStatus.js b/bigbluebutton-html5/imports/api/connection-status/server/methods/addConnectionStatus.js
new file mode 100644
index 0000000000000000000000000000000000000000..9d3408555d3f3b827473845385f70b7ab14c19ab
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/connection-status/server/methods/addConnectionStatus.js
@@ -0,0 +1,11 @@
+import { check } from 'meteor/check';
+import updateConnectionStatus from '/imports/api/connection-status/server/modifiers/updateConnectionStatus';
+import { extractCredentials } from '/imports/api/common/server/helpers';
+
+export default function addConnectionStatus(level) {
+ check(level, String);
+
+ const { meetingId, requesterUserId } = extractCredentials(this.userId);
+
+ updateConnectionStatus(meetingId, requesterUserId, level);
+}
diff --git a/bigbluebutton-html5/imports/api/connection-status/server/modifiers/clearConnectionStatus.js b/bigbluebutton-html5/imports/api/connection-status/server/modifiers/clearConnectionStatus.js
new file mode 100644
index 0000000000000000000000000000000000000000..f37d5a0a2ac4ff72ad274504d3c5cdbb3bff9cdb
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/connection-status/server/modifiers/clearConnectionStatus.js
@@ -0,0 +1,14 @@
+import ConnectionStatus from '/imports/api/connection-status';
+import Logger from '/imports/startup/server/logger';
+
+export default function clearConnectionStatus(meetingId) {
+ if (meetingId) {
+ return ConnectionStatus.remove({ meetingId }, () => {
+ Logger.info(`Cleared ConnectionStatus (${meetingId})`);
+ });
+ }
+
+ return ConnectionStatus.remove({}, () => {
+ Logger.info('Cleared ConnectionStatus (all)');
+ });
+}
diff --git a/bigbluebutton-html5/imports/api/connection-status/server/modifiers/updateConnectionStatus.js b/bigbluebutton-html5/imports/api/connection-status/server/modifiers/updateConnectionStatus.js
new file mode 100644
index 0000000000000000000000000000000000000000..bf25106caf6316a81b586cca26bbd3aac9dcd195
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/connection-status/server/modifiers/updateConnectionStatus.js
@@ -0,0 +1,37 @@
+import ConnectionStatus from '/imports/api/connection-status';
+import Logger from '/imports/startup/server/logger';
+import { check } from 'meteor/check';
+
+export default function updateConnectionStatus(meetingId, userId, level) {
+ check(meetingId, String);
+ check(userId, String);
+
+ const timestamp = new Date().getTime();
+
+ const selector = {
+ meetingId,
+ userId,
+ };
+
+ const modifier = {
+ meetingId,
+ userId,
+ level,
+ timestamp,
+ };
+
+ const cb = (err, numChanged) => {
+ if (err) {
+ return Logger.error(`Updating connection status: ${err}`);
+ }
+
+ const { insertedId } = numChanged;
+ if (insertedId) {
+ return Logger.info(`Added connection status userId=${userId} level=${level}`);
+ }
+
+ return Logger.verbose(`Update connection status userId=${userId} level=${level}`);
+ };
+
+ return ConnectionStatus.upsert(selector, modifier, cb);
+}
diff --git a/bigbluebutton-html5/imports/api/connection-status/server/publishers.js b/bigbluebutton-html5/imports/api/connection-status/server/publishers.js
new file mode 100644
index 0000000000000000000000000000000000000000..45c6e900fa33b1d5f2ab32c68a77d4add3f39643
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/connection-status/server/publishers.js
@@ -0,0 +1,27 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import Logger from '/imports/startup/server/logger';
+import ConnectionStatus from '/imports/api/connection-status';
+import { extractCredentials } from '/imports/api/common/server/helpers';
+
+function connectionStatus() {
+ if (!this.userId) {
+ return ConnectionStatus.find({ meetingId: '' });
+ }
+
+ const { meetingId, requesterUserId } = extractCredentials(this.userId);
+
+ check(meetingId, String);
+ check(requesterUserId, String);
+
+ Logger.info(`Publishing connection status for ${meetingId} ${requesterUserId}`);
+
+ return ConnectionStatus.find({ meetingId });
+}
+
+function publish(...args) {
+ const boundNote = connectionStatus.bind(this);
+ return boundNote(...args);
+}
+
+Meteor.publish('connection-status', publish);
diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
index a40608977743367a0547a049e72ba7bd61556844..6ffdb31ca1d46529e6bc8f4b88fe1fa9f803d251 100755
--- a/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
+++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
@@ -9,6 +9,7 @@ import createNote from '/imports/api/note/server/methods/createNote';
import createCaptions from '/imports/api/captions/server/methods/createCaptions';
import { addAnnotationsStreamer } from '/imports/api/annotations/server/streamer';
import { addCursorStreamer } from '/imports/api/cursor/server/streamer';
+import BannedUsers from '/imports/api/users/server/store/bannedUsers';
export default function addMeeting(meeting) {
const meetingId = meeting.meetingProp.intId;
@@ -145,6 +146,7 @@ export default function addMeeting(meeting) {
// better place we can run this post-creation routine?
createNote(meetingId);
createCaptions(meetingId);
+ BannedUsers.init(meetingId);
}
if (numChanged) {
diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
index 6b245da80711ee14f28dc679f2f2c86e1b27a00e..3b9efcbb1698899b0e0347f2f196d546067e882a 100755
--- a/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
+++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
@@ -15,11 +15,13 @@ import clearCaptions from '/imports/api/captions/server/modifiers/clearCaptions'
import clearPresentationPods from '/imports/api/presentation-pods/server/modifiers/clearPresentationPods';
import clearVoiceUsers from '/imports/api/voice-users/server/modifiers/clearVoiceUsers';
import clearUserInfo from '/imports/api/users-infos/server/modifiers/clearUserInfo';
+import clearConnectionStatus from '/imports/api/connection-status/server/modifiers/clearConnectionStatus';
import clearNote from '/imports/api/note/server/modifiers/clearNote';
import clearNetworkInformation from '/imports/api/network-information/server/modifiers/clearNetworkInformation';
import clearLocalSettings from '/imports/api/local-settings/server/modifiers/clearLocalSettings';
import clearRecordMeeting from './clearRecordMeeting';
import clearVoiceCallStates from '/imports/api/voice-call-states/server/modifiers/clearVoiceCallStates';
+import clearVideoStreams from '/imports/api/video-streams/server/modifiers/clearVideoStreams';
export default function meetingHasEnded(meetingId) {
removeAnnotationsStreamer(meetingId);
@@ -37,11 +39,13 @@ export default function meetingHasEnded(meetingId) {
clearUsersSettings(meetingId);
clearVoiceUsers(meetingId);
clearUserInfo(meetingId);
+ clearConnectionStatus(meetingId);
clearNote(meetingId);
clearNetworkInformation(meetingId);
clearLocalSettings(meetingId);
clearRecordMeeting(meetingId);
clearVoiceCallStates(meetingId);
+ clearVideoStreams(meetingId);
return Logger.info(`Cleared Meetings with id ${meetingId}`);
});
diff --git a/bigbluebutton-html5/imports/api/meetings/server/publishers.js b/bigbluebutton-html5/imports/api/meetings/server/publishers.js
index dfbfb74a3b4e006c7afe492f55424eccb37b5eaa..29a34e840af5c3f5f4e9a4662f188b22c78a6af1 100755
--- a/bigbluebutton-html5/imports/api/meetings/server/publishers.js
+++ b/bigbluebutton-html5/imports/api/meetings/server/publishers.js
@@ -6,7 +6,7 @@ import { extractCredentials } from '/imports/api/common/server/helpers';
const ROLE_MODERATOR = Meteor.settings.public.user.role_moderator;
-function meetings() {
+function meetings(role) {
if (!this.userId) {
return Meetings.find({ meetingId: '' });
}
diff --git a/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js b/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
index 9dba1bf08c5e999ddd051badfa3017d9063d2af1..c28ed339694dfd9ee9529992d0a8f44365a59e16 100644
--- a/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
+++ b/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
@@ -46,6 +46,9 @@ const currentParameters = [
'bbb_enable_screen_sharing',
'bbb_enable_video',
'bbb_skip_video_preview',
+ 'bbb_mirror_own_webcam',
+ // PRESENTATION
+ 'bbb_force_restore_presentation_on_new_events',
// WHITEBOARD
'bbb_multi_user_pen_only',
'bbb_presenter_tools',
@@ -57,6 +60,7 @@ const currentParameters = [
'bbb_auto_swap_layout',
'bbb_hide_presentation',
'bbb_show_participants_on_login',
+ 'bbb_show_public_chat_on_login',
// OUTSIDE COMMANDS
'bbb_outside_toggle_self_voice',
'bbb_outside_toggle_recording',
diff --git a/bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js b/bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
index ff37339c6ec037b413700f4f79634841530e4bca..010874c9af1ad9b196390daf6ba9592a5a61a592 100644
--- a/bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
+++ b/bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
@@ -16,7 +16,10 @@ const clearOtherSessions = (sessionUserId, current = false) => {
export default function handleValidateAuthToken({ body }, meetingId) {
const {
- userId, valid, authToken, waitForApproval,
+ userId,
+ valid,
+ authToken,
+ waitForApproval,
} = body;
check(userId, String);
diff --git a/bigbluebutton-html5/imports/api/users/server/methods/removeUser.js b/bigbluebutton-html5/imports/api/users/server/methods/removeUser.js
index 6649b481ea15d6f55897e0470dbeea7ebfb1facb..4219cfad2494c742dabf9485922be1574fbabee2 100644
--- a/bigbluebutton-html5/imports/api/users/server/methods/removeUser.js
+++ b/bigbluebutton-html5/imports/api/users/server/methods/removeUser.js
@@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import RedisPubSub from '/imports/startup/server/redis';
import { extractCredentials } from '/imports/api/common/server/helpers';
+import Users from '/imports/api/users';
+import BannedUsers from '/imports/api/users/server/store/bannedUsers';
export default function removeUser(userId, banUser) {
const REDIS_CONFIG = Meteor.settings.private.redis;
@@ -18,5 +20,9 @@ export default function removeUser(userId, banUser) {
banUser,
};
+ const removedUser = Users.findOne({ meetingId, userId }, { extId: 1 });
+
+ if (banUser && removedUser) BannedUsers.add(meetingId, removedUser.extId);
+
return RedisPubSub.publishUserMessage(CHANNEL, EVENT_NAME, meetingId, ejectedBy, payload);
}
diff --git a/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js b/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
index 0f01fb0c2d95378063180efdedafbc1de0290284..7303caa2bad173253705189bb1899a5fcaaff35d 100644
--- a/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
+++ b/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
@@ -2,12 +2,21 @@ import { Meteor } from 'meteor/meteor';
import RedisPubSub from '/imports/startup/server/redis';
import Logger from '/imports/startup/server/logger';
import pendingAuthenticationsStore from '../store/pendingAuthentications';
+import BannedUsers from '../store/bannedUsers';
-export default function validateAuthToken(meetingId, requesterUserId, requesterToken) {
+export default function validateAuthToken(meetingId, requesterUserId, requesterToken, externalId) {
const REDIS_CONFIG = Meteor.settings.private.redis;
const CHANNEL = REDIS_CONFIG.channels.toAkkaApps;
const EVENT_NAME = 'ValidateAuthTokenReqMsg';
+ // Check if externalId is banned from the meeting
+ if (externalId) {
+ if (BannedUsers.has(meetingId, externalId)) {
+ Logger.warn(`A banned user with extId ${externalId} tried to enter in meeting ${meetingId}`);
+ return;
+ }
+ }
+
// Store reference of methodInvocationObject ( to postpone the connection userId definition )
pendingAuthenticationsStore.add(meetingId, requesterUserId, requesterToken, this);
diff --git a/bigbluebutton-html5/imports/api/users/server/publishers.js b/bigbluebutton-html5/imports/api/users/server/publishers.js
index d7c029716013c023591fa8272995421a250dfc15..f41ac189823cb9650f90d459d1efb9c12d613f4f 100644
--- a/bigbluebutton-html5/imports/api/users/server/publishers.js
+++ b/bigbluebutton-html5/imports/api/users/server/publishers.js
@@ -51,7 +51,7 @@ function publishCurrentUser(...args) {
Meteor.publish('current-user', publishCurrentUser);
-function users() {
+function users(role) {
if (!this.userId) {
return Users.find({ meetingId: '' });
}
diff --git a/bigbluebutton-html5/imports/api/users/server/store/bannedUsers.js b/bigbluebutton-html5/imports/api/users/server/store/bannedUsers.js
new file mode 100644
index 0000000000000000000000000000000000000000..5355e3d1dcec3bf441259010f1d0ac484201cef3
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/users/server/store/bannedUsers.js
@@ -0,0 +1,35 @@
+import Logger from '/imports/startup/server/logger';
+
+class BannedUsers {
+ constructor() {
+ Logger.debug('BannedUsers :: Initializing');
+ this.store = {};
+ }
+
+ init(meetingId) {
+ Logger.debug('BannedUsers :: init', meetingId);
+
+ if (!this.store[meetingId]) this.store[meetingId] = new Set();
+ }
+
+ add(meetingId, externalId) {
+ Logger.debug('BannedUsers :: add', { meetingId, externalId });
+ if (!this.store[meetingId]) this.store[meetingId] = new Set();
+
+ this.store[meetingId].add(externalId);
+ }
+
+ delete(meetingId) {
+ Logger.debug('BannedUsers :: delete', meetingId);
+ delete this.store[meetingId];
+ }
+
+ has(meetingId, externalId) {
+ Logger.debug('BannedUsers :: has', { meetingId, externalId });
+ if (!this.store[meetingId]) this.store[meetingId] = new Set();
+
+ return this.store[meetingId].has(externalId);
+ }
+}
+
+export default new BannedUsers();
diff --git a/bigbluebutton-html5/imports/api/video-streams/server/modifiers/clearVideoStreams.js b/bigbluebutton-html5/imports/api/video-streams/server/modifiers/clearVideoStreams.js
new file mode 100644
index 0000000000000000000000000000000000000000..9017d745dc1f5a308fe9380391012355dc22e0d1
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/video-streams/server/modifiers/clearVideoStreams.js
@@ -0,0 +1,14 @@
+import Logger from '/imports/startup/server/logger';
+import VideoStreams from '/imports/api/video-streams';
+
+export default function clearVideoStreams(meetingId) {
+ if (meetingId) {
+ return VideoStreams.remove({ meetingId }, () => {
+ Logger.info(`Cleared VideoStreams in (${meetingId})`);
+ });
+ }
+
+ return VideoStreams.remove({}, () => {
+ Logger.info('Cleared VideoStreams in all meetings');
+ });
+}
diff --git a/bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js b/bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js
index fdc3c23f4d4a6df62b6e16e7ce6327bf3a23ddba..a91c5cc78e11cc43ad663431091f6d39a461d0ea 100644
--- a/bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js
+++ b/bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js
@@ -3,6 +3,8 @@ import { extractCredentials } from '/imports/api/common/server/helpers';
import RedisPubSub from '/imports/startup/server/redis';
import Users from '/imports/api/users';
import VoiceUsers from '/imports/api/voice-users';
+import Meetings from '/imports/api/meetings';
+import Logger from '/imports/startup/server/logger';
export default function muteToggle(uId) {
const REDIS_CONFIG = Meteor.settings.private.redis;
@@ -27,6 +29,16 @@ export default function muteToggle(uId) {
const { listenOnly, muted } = voiceUser;
if (listenOnly) return;
+ // if allowModsToUnmuteUsers is false, users will be kicked out for attempting to unmute others
+ if (requesterUserId !== userToMute && muted) {
+ const meeting = Meetings.findOne({ meetingId },
+ { fields: { 'usersProp.allowModsToUnmuteUsers': 1 } });
+ if (meeting.usersProp && !meeting.usersProp.allowModsToUnmuteUsers) {
+ Logger.warn(`Attempted unmuting by another user meetingId:${meetingId} requester: ${requesterUserId} userId: ${userToMute}`);
+ return;
+ }
+ }
+
const payload = {
userId: userToMute,
mutedBy: requesterUserId,
diff --git a/bigbluebutton-html5/imports/api/voice-users/server/publishers.js b/bigbluebutton-html5/imports/api/voice-users/server/publishers.js
index cca405660072e15fbf437842103ed36b1534b3e0..6bf69035fa16ed25fc5da814980e8e073e746ee5 100644
--- a/bigbluebutton-html5/imports/api/voice-users/server/publishers.js
+++ b/bigbluebutton-html5/imports/api/voice-users/server/publishers.js
@@ -2,6 +2,7 @@ import VoiceUsers from '/imports/api/voice-users';
import { Meteor } from 'meteor/meteor';
import Logger from '/imports/startup/server/logger';
import { extractCredentials } from '/imports/api/common/server/helpers';
+import ejectUserFromVoice from './methods/ejectUserFromVoice';
function voiceUser() {
if (!this.userId) {
@@ -9,8 +10,23 @@ function voiceUser() {
}
const { meetingId, requesterUserId } = extractCredentials(this.userId);
+ check(meetingId, String);
+ check(requesterUserId, String);
+ const onCloseConnection = Meteor.bindEnvironment(() => {
+ try {
+ // I used user because voiceUser is the function's name
+ const User = VoiceUsers.findOne({ meetingId, requesterUserId });
+ if (User) {
+ ejectUserFromVoice(requesterUserId);
+ }
+ } catch (e) {
+ Logger.error(`Exception while executing ejectUserFromVoice for ${requesterUserId}: ${e}`);
+ }
+ });
+
Logger.debug(`Publishing Voice User for ${meetingId} ${requesterUserId}`);
+ this._session.socket.on('close', _.debounce(onCloseConnection, 100));
return VoiceUsers.find({ meetingId });
}
diff --git a/bigbluebutton-html5/imports/startup/client/base.jsx b/bigbluebutton-html5/imports/startup/client/base.jsx
index 91b49fa1d504c2b5dd2774be6513b960ae52fa6b..5ee1d8e6e4c93356a5993eb30de52107f5ddfde7 100755
--- a/bigbluebutton-html5/imports/startup/client/base.jsx
+++ b/bigbluebutton-html5/imports/startup/client/base.jsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
import { withTracker } from 'meteor/react-meteor-data';
import PropTypes from 'prop-types';
import Auth from '/imports/ui/services/auth';
@@ -7,7 +7,6 @@ import ErrorScreen from '/imports/ui/components/error-screen/component';
import MeetingEnded from '/imports/ui/components/meeting-ended/component';
import LoadingScreen from '/imports/ui/components/loading-screen/component';
import Settings from '/imports/ui/services/settings';
-import AudioManager from '/imports/ui/services/audio-manager';
import logger from '/imports/startup/client/logger';
import Users from '/imports/api/users';
import { Session } from 'meteor/session';
@@ -19,6 +18,9 @@ import AudioService from '/imports/ui/components/audio/service';
import { notify } from '/imports/ui/services/notification';
import deviceInfo from '/imports/utils/deviceInfo';
import getFromUserSettings from '/imports/ui/services/users-settings';
+import LayoutManager from '/imports/ui/components/layout/layout-manager';
+import { withLayoutContext } from '/imports/ui/components/layout/context';
+import VideoService from '/imports/ui/components/video-provider/service';
const CHAT_CONFIG = Meteor.settings.public.chat;
const CHAT_ENABLED = CHAT_CONFIG.enabled;
@@ -102,12 +104,23 @@ class Base extends Component {
ejected,
isMeteorConnected,
subscriptionsReady,
+ layoutContextDispatch,
+ usersVideo,
} = this.props;
const {
loading,
meetingExisted,
} = this.state;
+ if (usersVideo !== prevProps.usersVideo) {
+ layoutContextDispatch(
+ {
+ type: 'setUsersVideo',
+ value: usersVideo.length,
+ },
+ );
+ }
+
if (!prevProps.subscriptionsReady && subscriptionsReady) {
logger.info({ logCode: 'startup_client_subscriptions_ready' }, 'Subscriptions are ready');
}
@@ -168,9 +181,10 @@ class Base extends Component {
const { updateLoadingState } = this;
const stateControls = { updateLoadingState };
const { loading } = this.state;
- const codeError = Session.get('codeError');
const {
+ codeError,
ejected,
+ ejectedReason,
meetingExist,
meetingHasEnded,
meetingIsBreakout,
@@ -183,36 +197,44 @@ class Base extends Component {
}
if (ejected) {
- AudioManager.exitAudio();
- return (<MeetingEnded code="403" />);
+ return (<MeetingEnded code="403" reason={ejectedReason} />);
}
- if (meetingHasEnded && meetingIsBreakout) window.close();
+ if ((meetingHasEnded || User?.loggedOut) && meetingIsBreakout) {
+ window.close();
+ return null;
+ }
- if (((meetingHasEnded && !meetingIsBreakout)) || (codeError && (User && User.loggedOut))) {
- AudioManager.exitAudio();
+ if (((meetingHasEnded && !meetingIsBreakout)) || (codeError && User?.loggedOut)) {
return (<MeetingEnded code={codeError} />);
}
if (codeError && !meetingHasEnded) {
// 680 is set for the codeError when the user requests a logout
if (codeError !== '680') {
- logger.error({ logCode: 'startup_client_usercouldnotlogin_error' }, `User could not log in HTML5, hit ${codeError}`);
+ return (<ErrorScreen code={codeError} />);
}
- return (<ErrorScreen code={codeError} />);
+ return (<MeetingEnded code={codeError} />);
}
- // this.props.annotationsHandler.stop();
+
return (<AppContainer {...this.props} baseControls={stateControls} />);
}
render() {
- const { meetingExist } = this.props;
+ const {
+ meetingExist,
+ } = this.props;
const { meetingExisted } = this.state;
return (
- (!meetingExisted && !meetingExist && Auth.loggedIn)
- ? <LoadingScreen />
- : this.renderByState()
+ <Fragment>
+ <LayoutManager />
+ {
+ (!meetingExisted && !meetingExist && Auth.loggedIn)
+ ? <LoadingScreen />
+ : this.renderByState()
+ }
+ </Fragment>
);
}
}
@@ -241,6 +263,7 @@ const BaseContainer = withTracker(() => {
approved: 1,
authed: 1,
ejected: 1,
+ ejectedReason: 1,
color: 1,
effectiveConnectionType: 1,
extId: 1,
@@ -250,6 +273,8 @@ const BaseContainer = withTracker(() => {
loggedOut: 1,
meetingId: 1,
userId: 1,
+ inactivityCheck: 1,
+ responseDelay: 1,
};
const User = Users.findOne({ intId: credentials.requesterUserId }, { fields });
const meeting = Meetings.findOne({ meetingId }, {
@@ -263,8 +288,10 @@ const BaseContainer = withTracker(() => {
Session.set('codeError', '410');
}
- const approved = User && User.approved && User.guest;
- const ejected = User && User.ejected;
+ const approved = User?.approved && User?.guest;
+ const ejected = User?.ejected;
+ const ejectedReason = User?.ejectedReason;
+
let userSubscriptionHandler;
Breakouts.find({}, { fields: { _id: 1 } }).observeChanges({
@@ -354,9 +381,23 @@ const BaseContainer = withTracker(() => {
});
}
+ if (getFromUserSettings('bbb_show_participants_on_login', true) && !deviceInfo.type().isPhone) {
+ Session.set('openPanel', 'userlist');
+ if (CHAT_ENABLED && getFromUserSettings('bbb_show_public_chat_on_login', !Meteor.settings.public.chat.startClosed)) {
+ Session.set('openPanel', 'chat');
+ Session.set('idChatOpen', PUBLIC_CHAT_ID);
+ }
+ } else {
+ Session.set('openPanel', '');
+ }
+
+ const codeError = Session.get('codeError');
+ const usersVideo = VideoService.getVideoStreams();
+
return {
approved,
ejected,
+ ejectedReason,
userSubscriptionHandler,
breakoutRoomSubscriptionHandler,
meetingModeratorSubscriptionHandler,
@@ -368,7 +409,9 @@ const BaseContainer = withTracker(() => {
meetingIsBreakout: AppService.meetingIsBreakout(),
subscriptionsReady: Session.get('subscriptionsReady'),
loggedIn,
+ codeError,
+ usersVideo,
};
-})(Base);
+})(withLayoutContext(Base));
export default BaseContainer;
diff --git a/bigbluebutton-html5/imports/startup/client/logger.js b/bigbluebutton-html5/imports/startup/client/logger.js
index 4e97737cab1d17003e0342ac083b29d163982697..08497f3e169dbe37f9c2b90073eef2c6966fd27f 100755
--- a/bigbluebutton-html5/imports/startup/client/logger.js
+++ b/bigbluebutton-html5/imports/startup/client/logger.js
@@ -48,23 +48,36 @@ class ServerLoggerStream extends ServerStream {
class MeteorStream {
write(rec) {
const { fullInfo } = Auth;
+ const clientURL = window.location.href;
this.rec = rec;
if (fullInfo.meetingId != null) {
+ if (!this.rec.extraInfo) {
+ this.rec.extraInfo = {};
+ }
+
+ this.rec.extraInfo.clientURL = clientURL;
+
Meteor.call(
'logClient',
nameFromLevel[this.rec.level],
this.rec.msg,
this.rec.logCode,
- this.rec.extraInfo || {},
+ this.rec.extraInfo,
fullInfo,
);
} else {
- Meteor.call('logClient', nameFromLevel[this.rec.level], this.rec.msg);
+ Meteor.call(
+ 'logClient',
+ nameFromLevel[this.rec.level],
+ this.rec.msg,
+ { clientURL },
+ );
}
}
}
+
function createStreamForTarget(target, options) {
const TARGET_EXTERNAL = 'external';
const TARGET_CONSOLE = 'console';
diff --git a/bigbluebutton-html5/imports/startup/server/index.js b/bigbluebutton-html5/imports/startup/server/index.js
index 425bb0af1933617f9428caac199661f0d7ad0f7c..63c4d9008b4649b1c45f468ace07e4fff9650bc2 100755
--- a/bigbluebutton-html5/imports/startup/server/index.js
+++ b/bigbluebutton-html5/imports/startup/server/index.js
@@ -12,6 +12,7 @@ import setMinBrowserVersions from './minBrowserVersion';
import userLeaving from '/imports/api/users/server/methods/userLeaving';
const AVAILABLE_LOCALES = fs.readdirSync('assets/app/locales');
+let avaibleLocalesNames = [];
Meteor.startup(() => {
const APP_CONFIG = Meteor.settings.public.app;
@@ -150,22 +151,23 @@ WebApp.connectHandlers.use('/locale', (req, res) => {
});
WebApp.connectHandlers.use('/locales', (req, res) => {
- let locales = [];
- try {
- locales = AVAILABLE_LOCALES
- .map(file => file.replace('.json', ''))
- .map(file => file.replace('_', '-'))
- .map(locale => ({
- locale,
- name: Langmap[locale].nativeName,
- }));
- } catch (e) {
- Logger.warn(`'Could not process locales error: ${e}`);
+ if (!avaibleLocalesNames.length) {
+ try {
+ avaibleLocalesNames = AVAILABLE_LOCALES
+ .map(file => file.replace('.json', ''))
+ .map(file => file.replace('_', '-'))
+ .map(locale => ({
+ locale,
+ name: Langmap[locale].nativeName,
+ }));
+ } catch (e) {
+ Logger.warn(`'Could not process locales error: ${e}`);
+ }
}
res.setHeader('Content-Type', 'application/json');
res.writeHead(200);
- res.end(JSON.stringify(locales));
+ res.end(JSON.stringify(avaibleLocalesNames));
});
WebApp.connectHandlers.use('/feedback', (req, res) => {
diff --git a/bigbluebutton-html5/imports/startup/server/settings.js b/bigbluebutton-html5/imports/startup/server/settings.js
index 6748c73e207c1e058f903700f6af9beac3f87619..526092b7699d2b53c803404855183893a46e4cef 100644
--- a/bigbluebutton-html5/imports/startup/server/settings.js
+++ b/bigbluebutton-html5/imports/startup/server/settings.js
@@ -1,8 +1,9 @@
+/* global __meteor_runtime_config__ */
import { Meteor } from 'meteor/meteor';
import fs from 'fs';
import YAML from 'yaml';
-const YAML_FILE_PATH = 'assets/app/config/settings.yml';
+const YAML_FILE_PATH = process.env.BBB_HTML5_SETTINGS || 'assets/app/config/settings.yml';
try {
if (fs.existsSync(YAML_FILE_PATH)) {
@@ -14,5 +15,6 @@ try {
throw new Error('File doesn\'t exists');
}
} catch (error) {
+ // eslint-disable-next-line no-console
console.error('Error on load configuration file.', error);
}
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index c89a30a828c511e4b3cbe7dd71302c731300d6e2..1fe1f16c0d4d10878f130e275aa76626184c3f78 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -8,7 +8,6 @@ import DropdownTrigger from '/imports/ui/components/dropdown/trigger/component';
import DropdownContent from '/imports/ui/components/dropdown/content/component';
import DropdownList from '/imports/ui/components/dropdown/list/component';
import DropdownListItem from '/imports/ui/components/dropdown/list/item/component';
-import PresentationUploaderContainer from '/imports/ui/components/presentation/presentation-uploader/container';
import { withModalMounter } from '/imports/ui/components/modal/service';
import withShortcutHelper from '/imports/ui/components/shortcut-help/service';
import DropdownListSeparator from '/imports/ui/components/dropdown/list/separator/component';
@@ -78,6 +77,8 @@ const intlMessages = defineMessages({
},
});
+const handlePresentationClick = () => Session.set('showUploadPresentationView', true);
+
class ActionsDropdown extends PureComponent {
constructor(props) {
super(props);
@@ -86,7 +87,6 @@ class ActionsDropdown extends PureComponent {
this.pollId = _.uniqueId('action-item-');
this.takePresenterId = _.uniqueId('action-item-');
- this.handlePresentationClick = this.handlePresentationClick.bind(this);
this.handleExternalVideoClick = this.handleExternalVideoClick.bind(this);
this.makePresentationItems = this.makePresentationItems.bind(this);
}
@@ -161,7 +161,7 @@ class ActionsDropdown extends PureComponent {
label={formatMessage(presentationLabel)}
description={formatMessage(presentationDesc)}
key={this.presentationItemId}
- onClick={this.handlePresentationClick}
+ onClick={handlePresentationClick}
/>
)
: null),
@@ -196,13 +196,13 @@ class ActionsDropdown extends PureComponent {
const presentationItemElements = presentations.map((p) => {
const itemStyles = {};
itemStyles[styles.presentationItem] = true;
- itemStyles[styles.isCurrent] = p.isCurrent;
+ itemStyles[styles.isCurrent] = p.current;
return (<DropdownListItem
className={cx(itemStyles)}
icon="file"
- iconRight={p.isCurrent ? 'check' : null}
- label={p.filename}
+ iconRight={p.current ? 'check' : null}
+ label={p.name}
description="uploaded presentation file"
key={`uploaded-presentation-${p.id}`}
onClick={() => {
@@ -221,11 +221,6 @@ class ActionsDropdown extends PureComponent {
mountModal(<ExternalVideoModal />);
}
- handlePresentationClick() {
- const { mountModal } = this.props;
- mountModal(<PresentationUploaderContainer />);
- }
-
render() {
const {
intl,
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/container.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..996a644d6a01cc8bbbefee036e78d98031faaba4
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/container.jsx
@@ -0,0 +1,14 @@
+import { withTracker } from 'meteor/react-meteor-data';
+import Presentations from '/imports/api/presentations';
+import PresentationUploaderService from '/imports/ui/components/presentation/presentation-uploader/service';
+import PresentationPodService from '/imports/ui/components/presentation-pod/service';
+import ActionsDropdown from './component';
+
+export default withTracker(() => {
+ const presentations = Presentations.find({ 'conversion.done': true }).fetch();
+ return ({
+ presentations,
+ setPresentation: PresentationUploaderService.setPresentation,
+ podIds: PresentationPodService.getPresentationPodIds(),
+ });
+})(ActionsDropdown);
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
index cbb2f601bf9e0956fce298540ad1e1a447e0f429..bae5e91009607f303f4f804be0cc59c2dd7d9c82 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -2,13 +2,43 @@ import React, { PureComponent } from 'react';
import cx from 'classnames';
import { styles } from './styles.scss';
import DesktopShare from './desktop-share/component';
-import ActionsDropdown from './actions-dropdown/component';
+import ActionsDropdown from './actions-dropdown/container';
import AudioControlsContainer from '../audio/audio-controls/container';
import JoinVideoOptionsContainer from '../video-provider/video-button/container';
import CaptionsButtonContainer from '/imports/ui/components/actions-bar/captions/container';
import PresentationOptionsContainer from './presentation-options/component';
+import Button from '/imports/ui/components/button/component';
+import Storage from '/imports/ui/services/storage/session';
+import { ACTIONSBAR_HEIGHT } from '/imports/ui/components/layout/layout-manager';
+import { withLayoutConsumer } from '/imports/ui/components/layout/context';
class ActionsBar extends PureComponent {
+ constructor(props) {
+ super(props);
+
+ this.autoArrangeToggle = this.autoArrangeToggle.bind(this);
+ }
+
+ componentDidUpdate(prevProps) {
+ const { layoutContextState } = this.props;
+ const { layoutContextState: prevLayoutContextState } = prevProps;
+ const { autoArrangeLayout } = layoutContextState;
+ const { autoArrangeLayout: prevAutoArrangeLayout } = prevLayoutContextState;
+ if (autoArrangeLayout !== prevAutoArrangeLayout) this.forceUpdate();
+ }
+
+ autoArrangeToggle() {
+ const { layoutContextDispatch } = this.props;
+ const autoArrangeLayout = Storage.getItem('autoArrangeLayout');
+ layoutContextDispatch(
+ {
+ type: 'setAutoArrangeLayout',
+ value: !autoArrangeLayout,
+ },
+ );
+ window.dispatchEvent(new Event('autoArrangeChanged'));
+ }
+
render() {
const {
amIPresenter,
@@ -33,19 +63,22 @@ class ActionsBar extends PureComponent {
isPollingEnabled,
isThereCurrentPresentation,
allowExternalVideo,
- presentations,
- setPresentation,
- podIds,
} = this.props;
const actionBarClasses = {};
+ const autoArrangeLayout = Storage.getItem('autoArrangeLayout');
actionBarClasses[styles.centerWithActions] = amIPresenter;
actionBarClasses[styles.center] = true;
actionBarClasses[styles.mobileLayoutSwapped] = isLayoutSwapped && amIPresenter;
return (
- <div className={styles.actionsbar}>
+ <div
+ className={styles.actionsbar}
+ style={{
+ height: ACTIONSBAR_HEIGHT,
+ }}
+ >
<div className={styles.left}>
<ActionsDropdown {...{
amIPresenter,
@@ -57,9 +90,6 @@ class ActionsBar extends PureComponent {
isSharingVideo,
stopExternalVideoShare,
isMeteorConnected,
- presentations,
- setPresentation,
- podIds,
}}
/>
{isCaptionsAvailable
@@ -87,6 +117,18 @@ class ActionsBar extends PureComponent {
screenshareDataSavingSetting,
}}
/>
+ <Button
+ className={cx(styles.button, autoArrangeLayout || styles.btn)}
+ icon={autoArrangeLayout ? 'lock' : 'unlock'}
+ color={autoArrangeLayout ? 'primary' : 'default'}
+ ghost={!autoArrangeLayout}
+ onClick={this.autoArrangeToggle}
+ label={autoArrangeLayout ? 'Disable Auto Arrange' : 'Enable Auto Arrange'}
+ aria-label="Auto Arrange test"
+ hideLabel
+ circle
+ size="lg"
+ />
</div>
<div className={styles.right}>
{isLayoutSwapped
@@ -104,4 +146,4 @@ class ActionsBar extends PureComponent {
}
}
-export default ActionsBar;
+export default withLayoutConsumer(ActionsBar);
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
index 5a9f704fa1c8839e7193593f18c7f48a8c1b55c5..f75cf3d683bbec1cff4d92ddc7d4fc99f8ed7c89 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
@@ -9,8 +9,6 @@ import Presentations from '/imports/api/presentations';
import ActionsBar from './component';
import Service from './service';
import ExternalVideoService from '/imports/ui/components/external-video-player/service';
-import PresentationUploaderService from '/imports/ui/components/presentation/presentation-uploader/service';
-import PresentationPodService from '/imports/ui/components/presentation-pod/service';
import CaptionsService from '/imports/ui/components/captions/service';
import {
shareScreen,
@@ -51,7 +49,4 @@ export default withTracker(() => ({
isThereCurrentPresentation: Presentations.findOne({ meetingId: Auth.meetingID, current: true },
{ fields: {} }),
allowExternalVideo: Meteor.settings.public.externalVideoPlayer.enabled,
- presentations: PresentationUploaderService.getPresentations(),
- setPresentation: PresentationUploaderService.setPresentation,
- podIds: PresentationPodService.getPresentationPodIds(),
}))(injectIntl(ActionsBarContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/activity-check/component.jsx b/bigbluebutton-html5/imports/ui/components/activity-check/component.jsx
index 628a2e717a6b35050ce5bbddefac51d1ebd94748..8238296020f5ae2794ae95162a17b6709dd69f88 100644
--- a/bigbluebutton-html5/imports/ui/components/activity-check/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/activity-check/component.jsx
@@ -64,6 +64,7 @@ class ActivityCheck extends Component {
return setInterval(() => {
const remainingTime = responseDelay - 1;
+
this.setState({
responseDelay: remainingTime,
});
@@ -96,6 +97,7 @@ class ActivityCheck extends Component {
<p>{intl.formatMessage(intlMessages.activityCheckLabel, { 0: responseDelay })}</p>
<Button
color="primary"
+ disabled={responseDelay <= 0}
label={intl.formatMessage(intlMessages.activityCheckButton)}
onClick={handleInactivityDismiss}
role="button"
diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
index b6775edcc5a13ef3347eecd42cb263ede6951d55..54367a38c5fa09e74a1b1ea64d57d08cf84c5fbd 100755
--- a/bigbluebutton-html5/imports/ui/components/app/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -18,11 +18,14 @@ import ChatAlertContainer from '../chat/alert/container';
import BannerBarContainer from '/imports/ui/components/banner-bar/container';
import WaitingNotifierContainer from '/imports/ui/components/waiting-users/alert/container';
import LockNotifier from '/imports/ui/components/lock-viewers/notify/container';
+import StatusNotifier from '/imports/ui/components/status-notifier/container';
import PingPongContainer from '/imports/ui/components/ping-pong/container';
import MediaService from '/imports/ui/components/media/service';
import ManyWebcamsNotifier from '/imports/ui/components/video-provider/many-users-notify/container';
+import UploaderContainer from '/imports/ui/components/presentation/presentation-uploader/container';
import { withDraggableContext } from '../media/webcam-draggable-overlay/context';
import { styles } from './styles';
+import { NAVBAR_HEIGHT } from '/imports/ui/components/layout/layout-manager';
const MOBILE_MEDIA = 'only screen and (max-width: 40em)';
const APP_CONFIG = Meteor.settings.public.app;
@@ -135,6 +138,8 @@ class App extends Component {
this.handleWindowResize();
window.addEventListener('resize', this.handleWindowResize, false);
+ window.ondragover = function (e) { e.preventDefault(); };
+ window.ondrop = function (e) { e.preventDefault(); };
if (ENABLE_NETWORK_MONITORING) {
if (navigator.connection) {
@@ -227,7 +232,12 @@ class App extends Component {
if (!navbar) return null;
return (
- <header className={styles.navbar}>
+ <header
+ className={styles.navbar}
+ style={{
+ height: NAVBAR_HEIGHT,
+ }}
+ >
{navbar}
</header>
);
@@ -338,6 +348,7 @@ class App extends Component {
{this.renderPanel()}
{this.renderSidebar()}
</section>
+ <UploaderContainer />
<BreakoutRoomInvitation />
<PollingContainer />
<ModalContainer />
@@ -346,6 +357,7 @@ class App extends Component {
<ChatAlertContainer />
<WaitingNotifierContainer />
<LockNotifier />
+ <StatusNotifier status="raiseHand" />
<PingPongContainer />
<ManyWebcamsNotifier />
{customStyleUrl ? <link rel="stylesheet" type="text/css" href={customStyleUrl} /> : null}
diff --git a/bigbluebutton-html5/imports/ui/components/app/styles.scss b/bigbluebutton-html5/imports/ui/components/app/styles.scss
index 0d03f0eba183c776db7a25b3910ff4078da5d792..4e09d202f3bbf93ec53c4500946563b57940c284 100755
--- a/bigbluebutton-html5/imports/ui/components/app/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/app/styles.scss
@@ -155,12 +155,12 @@
}
@include mq($medium-up) {
- flex: 0 25vw;
+ // flex: 0 25vw;
order: 1;
}
@include mq($xlarge-up) {
- flex-basis: 20vw;
+ // flex-basis: 20vw;
}
}
@@ -172,10 +172,10 @@
.breakoutRoom {
height: 100%;
- width: 20vw;
+ // width: 20vw;
background-color: var(--color-white);
@include mq($small-only) {
- width: auto;
+ // width: auto;
height: auto;
}
}
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx
index abf8323c274fdc549393a2c6cc7f39069abe916a..69a613c1fddf4f72ea84d058eef5236c71ef2ec7 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx
@@ -5,6 +5,7 @@ import { defineMessages, intlShape, injectIntl } from 'react-intl';
import Button from '/imports/ui/components/button/component';
import getFromUserSettings from '/imports/ui/services/users-settings';
import withShortcutHelper from '/imports/ui/components/shortcut-help/service';
+import MutedAlert from '/imports/ui/components/muted-alert/component';
import { styles } from './styles';
const intlMessages = defineMessages({
@@ -63,6 +64,9 @@ class AudioControls extends PureComponent {
intl,
shortcuts,
isVoiceUser,
+ inputStream,
+ isViewer,
+ isPresenter,
} = this.props;
let joinIcon = 'audio_off';
@@ -74,29 +78,32 @@ class AudioControls extends PureComponent {
}
}
+ const label = muted ? intl.formatMessage(intlMessages.unmuteAudio)
+ : intl.formatMessage(intlMessages.muteAudio);
+
+ const toggleMuteBtn = (
+ <Button
+ className={cx(styles.muteToggle, !talking || styles.glow, !muted || styles.btn)}
+ onClick={handleToggleMuteMicrophone}
+ disabled={disable}
+ hideLabel
+ label={label}
+ aria-label={label}
+ color={!muted ? 'primary' : 'default'}
+ ghost={muted}
+ icon={muted ? 'mute' : 'unmute'}
+ size="lg"
+ circle
+ accessKey={shortcuts.togglemute}
+ />
+ );
+
return (
<span className={styles.container}>
- {showMute && isVoiceUser
- ? (
- <Button
- className={cx(styles.button, !talking || styles.glow, !muted || styles.btn)}
- onClick={handleToggleMuteMicrophone}
- disabled={disable}
- hideLabel
- label={muted ? intl.formatMessage(intlMessages.unmuteAudio)
- : intl.formatMessage(intlMessages.muteAudio)}
- aria-label={muted ? intl.formatMessage(intlMessages.unmuteAudio)
- : intl.formatMessage(intlMessages.muteAudio)}
- color={!muted ? 'primary' : 'default'}
- ghost={muted}
- icon={muted ? 'mute' : 'unmute'}
- size="lg"
- circle
- accessKey={shortcuts.togglemute}
- />
- ) : null}
+ {muted ? <MutedAlert {...{ inputStream, isViewer, isPresenter }} /> : null}
+ {showMute && isVoiceUser ? toggleMuteBtn : null}
<Button
- className={cx(styles.button, inAudio || styles.btn)}
+ className={cx(inAudio || styles.btn)}
onClick={inAudio ? handleLeaveAudio : handleJoinAudio}
disabled={disable}
hideLabel
@@ -111,7 +118,8 @@ class AudioControls extends PureComponent {
circle
accessKey={inAudio ? shortcuts.leaveaudio : shortcuts.joinaudio}
/>
- </span>);
+ </span>
+ );
}
}
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx
index 04161e8635cfaaa187dee9d1e6651fd7f21c69c1..d55c0d4e8e29d15319ca72fb3e7f34a1d8f34ff7 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx
@@ -5,10 +5,14 @@ import AudioManager from '/imports/ui/services/audio-manager';
import { makeCall } from '/imports/ui/services/api';
import lockContextContainer from '/imports/ui/components/lock-viewers/context/container';
import logger from '/imports/startup/client/logger';
+import Auth from '/imports/ui/services/auth';
+import Users from '/imports/api/users';
import AudioControls from './component';
import AudioModalContainer from '../audio-modal/container';
import Service from '../service';
+const ROLE_VIEWER = Meteor.settings.public.user.role_viewer;
+
const AudioControlsContainer = props => <AudioControls {...props} />;
const processToggleMuteFromOutside = (e) => {
@@ -54,16 +58,30 @@ const {
joinListenOnly,
} = Service;
-export default lockContextContainer(withModalMounter(withTracker(({ mountModal, userLocks }) => ({
- processToggleMuteFromOutside: arg => processToggleMuteFromOutside(arg),
- showMute: isConnected() && !isListenOnly() && !isEchoTest() && !userLocks.userMic,
- muted: isConnected() && !isListenOnly() && isMuted(),
- inAudio: isConnected() && !isEchoTest(),
- listenOnly: isConnected() && isListenOnly(),
- disable: isConnecting() || isHangingUp() || !Meteor.status().connected,
- talking: isTalking() && !isMuted(),
- isVoiceUser: isVoiceUser(),
- handleToggleMuteMicrophone: () => toggleMuteMicrophone(),
- handleJoinAudio: () => (isConnected() ? joinListenOnly() : mountModal(<AudioModalContainer />)),
- handleLeaveAudio,
-}))(AudioControlsContainer)));
+export default lockContextContainer(withModalMounter(withTracker(({ mountModal, userLocks }) => {
+ const currentUser = Users.findOne({ meetingId: Auth.meetingID, userId: Auth.userID }, {
+ fields: {
+ role: 1,
+ presenter: 1,
+ },
+ });
+ const isViewer = currentUser.role === ROLE_VIEWER;
+ const isPresenter = currentUser.presenter;
+
+ return ({
+ processToggleMuteFromOutside: arg => processToggleMuteFromOutside(arg),
+ showMute: isConnected() && !isListenOnly() && !isEchoTest() && !userLocks.userMic,
+ muted: isConnected() && !isListenOnly() && isMuted(),
+ inAudio: isConnected() && !isEchoTest(),
+ listenOnly: isConnected() && isListenOnly(),
+ disable: isConnecting() || isHangingUp() || !Meteor.status().connected,
+ talking: isTalking() && !isMuted(),
+ isVoiceUser: isVoiceUser(),
+ handleToggleMuteMicrophone: () => toggleMuteMicrophone(),
+ handleJoinAudio: () => (isConnected() ? joinListenOnly() : mountModal(<AudioModalContainer />)),
+ handleLeaveAudio,
+ inputStream: AudioManager.inputStream,
+ isViewer,
+ isPresenter,
+ });
+})(AudioControlsContainer)));
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/styles.scss b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/styles.scss
index 702f765146bfd25adb75f2b88c60bb9a0c21877a..49b567556555d5461bf17d3d95c93df3ffbe82db 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/styles.scss
@@ -5,31 +5,39 @@
display: flex;
flex-flow: row;
- > * {
- margin: 0 var(--sm-padding-x);
+ .muteToggle {
+ margin-right: var(--sm-padding-x);
+ margin-left: 0;
@include mq($small-only) {
- margin: 0 var(--sm-padding-y);
+ margin-right: var(--sm-padding-y);
}
- }
-
- > :first-child {
- margin-left: 0;
- margin-right: inherit;
[dir="rtl"] & {
- margin-left: inherit;
+ margin-left: var(--sm-padding-x);
margin-right: 0;
+
+ @include mq($small-only) {
+ margin-left: var(--sm-padding-y);
+ }
}
}
-
+
> :last-child {
- margin-left: inherit;
- margin-right: 0;
+ margin-left: var(--sm-padding-x);
+ margin-right: 0;
+
+ @include mq($small-only) {
+ margin-left: var(--sm-padding-y);
+ }
[dir="rtl"] & {
margin-left: 0;
- margin-right: inherit;
+ margin-right: var(--sm-padding-x);
+
+ @include mq($small-only) {
+ margin-right: var(--sm-padding-y);
+ }
}
}
}
diff --git a/bigbluebutton-html5/imports/ui/components/authenticated-handler/component.jsx b/bigbluebutton-html5/imports/ui/components/authenticated-handler/component.jsx
index d61e337e7c7c3f2b6aff526ce5cef995cc487741..4bd72a2034d17b72f983dde8a816f038761c3687 100644
--- a/bigbluebutton-html5/imports/ui/components/authenticated-handler/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/authenticated-handler/component.jsx
@@ -7,9 +7,9 @@ import LoadingScreen from '/imports/ui/components/loading-screen/component';
const STATUS_CONNECTING = 'connecting';
class AuthenticatedHandler extends Component {
- static setError(codeError) {
- Session.set('hasError', true);
- if (codeError) Session.set('codeError', codeError);
+ static setError({ description, error }) {
+ if (error) Session.set('codeError', error);
+ Session.set('errorMessageDescription', description);
}
static shouldAuthenticate(status, lastStatus) {
@@ -46,7 +46,7 @@ class AuthenticatedHandler extends Component {
extraInfo: { reason },
}, 'Encountered error while trying to authenticate');
- AuthenticatedHandler.setError(reason.error);
+ AuthenticatedHandler.setError(reason);
callback();
};
diff --git a/bigbluebutton-html5/imports/ui/components/breakout-room/breakout-remaining-time/container.jsx b/bigbluebutton-html5/imports/ui/components/breakout-room/breakout-remaining-time/container.jsx
index d128ddd01db0f7c76cc266bdf0314ac8843cd025..c92378afc4b018fcc0c4817936f119d2ddef3021 100644
--- a/bigbluebutton-html5/imports/ui/components/breakout-room/breakout-remaining-time/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/breakout-room/breakout-remaining-time/container.jsx
@@ -83,7 +83,8 @@ export default injectNotify(injectIntl(withTracker(({
notify,
messageDuration,
timeEndedMessage,
- alertMessageUnderOneMinute,
+ alertMessage,
+ alertUnderMinutes,
}) => {
const data = {};
if (breakoutRoom) {
@@ -104,7 +105,9 @@ export default injectNotify(injectIntl(withTracker(({
if (timeRemaining >= 0 && timeRemainingInterval) {
if (timeRemaining > 0) {
const time = getTimeRemaining();
- if (time === (1 * 60) && alertMessageUnderOneMinute) notify(alertMessageUnderOneMinute, 'info', 'rooms');
+ if (time === (alertUnderMinutes * 60) && alertMessage) {
+ notify(alertMessage, 'info', 'rooms');
+ }
data.message = intl.formatMessage(messageDuration, { 0: humanizeSeconds(time) });
} else {
clearInterval(timeRemainingInterval);
diff --git a/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx
index 7730b996f8febf263278b7fc6429119ee47885d0..7ecdbff97de981830629d342e1c4a9ba3b4c5c69 100644
--- a/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx
@@ -6,6 +6,7 @@ import { Session } from 'meteor/session';
import logger from '/imports/startup/client/logger';
import { styles } from './styles';
import BreakoutRoomContainer from './breakout-remaining-time/container';
+import VideoService from '/imports/ui/components/video-provider/service';
const intlMessages = defineMessages({
breakoutTitle: {
@@ -208,6 +209,7 @@ class BreakoutRoom extends PureComponent {
logCode: 'breakoutroom_join',
extraInfo: { logType: 'user_action' },
}, 'joining breakout room closed audio in the main room');
+ VideoService.exitVideo();
}
}
disabled={disable}
diff --git a/bigbluebutton-html5/imports/ui/components/breakout-room/service.js b/bigbluebutton-html5/imports/ui/components/breakout-room/service.js
index 28d549d134b134eb3dd261ec8bf1c0b26746dfa1..9fe60517c9b3cb73a8d9d9d132aa8e11b1b3ecfb 100644
--- a/bigbluebutton-html5/imports/ui/components/breakout-room/service.js
+++ b/bigbluebutton-html5/imports/ui/components/breakout-room/service.js
@@ -27,7 +27,10 @@ const breakoutRoomUser = (breakoutId) => {
return breakoutUser;
};
-const closeBreakoutPanel = () => Session.set('openPanel', 'userlist');
+const closeBreakoutPanel = () => {
+ Session.set('openPanel', 'userlist');
+ window.dispatchEvent(new Event('panelChanged'));
+};
const endAllBreakouts = () => {
makeCall('endAllBreakouts');
diff --git a/bigbluebutton-html5/imports/ui/components/button/component.jsx b/bigbluebutton-html5/imports/ui/components/button/component.jsx
index 29c16d5dae41c0bf96b79fbe1772b0278782007d..d087bb1719d02bfe98004d87969edc54771d66a0 100755
--- a/bigbluebutton-html5/imports/ui/components/button/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/button/component.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';
-import Tooltip from '/imports/ui/components/tooltip/component';
+import TooltipContainer from '/imports/ui/components/tooltip/container';
import { styles } from './styles';
import Icon from '../icon/component';
import BaseButton from './base/component';
@@ -109,6 +109,21 @@ export default class Button extends BaseButton {
return propClassNames;
}
+ _cleanProps(otherProps) {
+ const remainingProps = Object.assign({}, otherProps);
+ delete remainingProps.icon;
+ delete remainingProps.customIcon;
+ delete remainingProps.size;
+ delete remainingProps.color;
+ delete remainingProps.ghost;
+ delete remainingProps.circle;
+ delete remainingProps.block;
+ delete remainingProps.hideLabel;
+ delete remainingProps.tooltipLabel;
+
+ return remainingProps;
+ }
+
render() {
const {
circle,
@@ -124,11 +139,11 @@ export default class Button extends BaseButton {
if ((hideLabel && !ariaExpanded) || tooltipLabel) {
const buttonLabel = label || ariaLabel;
return (
- <Tooltip
+ <TooltipContainer
title={tooltipLabel || buttonLabel}
>
{this[renderFuncName]()}
- </Tooltip>
+ </TooltipContainer>
);
}
@@ -142,16 +157,7 @@ export default class Button extends BaseButton {
...otherProps
} = this.props;
- const remainingProps = Object.assign({}, otherProps);
- delete remainingProps.icon;
- delete remainingProps.customIcon;
- delete remainingProps.size;
- delete remainingProps.color;
- delete remainingProps.ghost;
- delete remainingProps.circle;
- delete remainingProps.block;
- delete remainingProps.hideLabel;
- delete remainingProps.tooltipLabel;
+ const remainingProps = this._cleanProps(otherProps);
/* TODO: We can change this and make the button with flexbox to avoid html
changes */
@@ -177,14 +183,7 @@ export default class Button extends BaseButton {
...otherProps
} = this.props;
- const remainingProps = Object.assign({}, otherProps);
- delete remainingProps.icon;
- delete remainingProps.color;
- delete remainingProps.ghost;
- delete remainingProps.circle;
- delete remainingProps.block;
- delete remainingProps.hideLabel;
- delete remainingProps.tooltipLabel;
+ const remainingProps = this._cleanProps(otherProps);
return (
<BaseButton
diff --git a/bigbluebutton-html5/imports/ui/components/captions/component.jsx b/bigbluebutton-html5/imports/ui/components/captions/component.jsx
index 4335ac8165c829671ff5e9f876706e2f23de31fd..86687ac3b3a7446d00ef5c1e36528cc56c3d9e9c 100644
--- a/bigbluebutton-html5/imports/ui/components/captions/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/captions/component.jsx
@@ -28,7 +28,6 @@ class Captions extends React.Component {
} = this.props;
if (padId === nextProps.padId) {
- if (this.text !== '') this.ariaText = this.text;
if (revs === nextProps.revs && !nextState.clear) return false;
}
return true;
@@ -56,7 +55,9 @@ class Captions extends React.Component {
const { clear } = this.state;
if (clear) {
this.text = '';
+ this.ariaText = '';
} else {
+ this.ariaText = CaptionsService.formatCaptionsText(data);
const text = this.text + data;
this.text = CaptionsService.formatCaptionsText(text);
}
@@ -105,15 +106,13 @@ class Captions extends React.Component {
return (
<div>
- <div
- aria-hidden
- style={captionStyles}
- >
+ <div style={captionStyles}>
{this.text}
</div>
<div
style={visuallyHidden}
- aria-live={this.text === '' && this.ariaText !== '' ? 'polite' : 'off'}
+ aria-atomic
+ aria-live="polite"
>
{this.ariaText}
</div>
diff --git a/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx
index 31a3a02ed888311402c7373cb6d01f6d11c960a4..db51df75ae5971c6d95a30f5664f06c16123dd21 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx
@@ -1,6 +1,5 @@
import React, { PureComponent } from 'react';
import PropTypes from 'prop-types';
-import _ from 'lodash';
import injectNotify from '/imports/ui/components/toast/inject-notify/component';
import { Session } from 'meteor/session';
@@ -31,6 +30,7 @@ class ChatPushAlert extends PureComponent {
onClick={() => {
Session.set('openPanel', 'chat');
Session.set('idChatOpen', chat);
+ window.dispatchEvent(new Event('panelChanged'));
}}
onKeyPress={() => null}
>
diff --git a/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/component.jsx
index 73d65f226dac6720242a7032ad7696ef294fd4e5..c3188b8776082ce0be5581717835d84917455b82 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/component.jsx
@@ -71,7 +71,9 @@ class ChatDropdown extends PureComponent {
}
getAvailableActions() {
- const { intl, isMeteorConnected, amIModerator } = this.props;
+ const {
+ intl, isMeteorConnected, amIModerator, meetingName,
+ } = this.props;
const clearIcon = 'delete';
const saveIcon = 'download';
@@ -86,8 +88,11 @@ class ChatDropdown extends PureComponent {
onClick={() => {
const link = document.createElement('a');
const mimeType = 'text/plain';
+ const date = new Date();
+ const time = `${date.getHours()}-${date.getMinutes()}`;
+ const dateString = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}_${time}`;
- link.setAttribute('download', `public-chat-${Date.now()}.txt`);
+ link.setAttribute('download', `bbb-${meetingName}[public-chat]_${dateString}.txt`);
link.setAttribute(
'href',
`data: ${mimeType} ;charset=utf-8,
diff --git a/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/container.jsx b/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/container.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..f00a5d6cc173a9276a4a19c549c70381b6af874c
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/container.jsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { withTracker } from 'meteor/react-meteor-data';
+import Auth from '/imports/ui/services/auth';
+import Meetings from '/imports/api/meetings';
+import ChatDropdown from './component';
+
+const ChatDropdownContainer = ({ ...props }) => <ChatDropdown {...props} />;
+
+export default withTracker(() => {
+ const getMeetingName = () => {
+ const m = Meetings.findOne({ meetingId: Auth.meetingID },
+ { fields: { 'meetingProp.name': 1 } });
+ return m.meetingProp.name;
+ };
+
+ return {
+ meetingName: getMeetingName(),
+ };
+})(ChatDropdownContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/chat/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/component.jsx
index e19380a741ebb8d2065d2ac6f9fa7ae76652a8f7..05654954fbaf54b4c144640963d67ce7f91d5968 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/component.jsx
@@ -8,7 +8,7 @@ import withShortcutHelper from '/imports/ui/components/shortcut-help/service';
import { styles } from './styles.scss';
import MessageForm from './message-form/container';
import MessageList from './message-list/container';
-import ChatDropdown from './chat-dropdown/component';
+import ChatDropdownContainer from './chat-dropdown/container';
const ELEMENT_ID = 'chat-messages';
@@ -60,6 +60,7 @@ const Chat = (props) => {
onClick={() => {
Session.set('idChatOpen', '');
Session.set('openPanel', 'userlist');
+ window.dispatchEvent(new Event('panelChanged'));
}}
aria-label={intl.formatMessage(intlMessages.hideChatLabel, { 0: title })}
accessKey={HIDE_CHAT_AK}
@@ -81,13 +82,19 @@ const Chat = (props) => {
actions.handleClosePrivateChat(chatID);
Session.set('idChatOpen', '');
Session.set('openPanel', 'userlist');
+ window.dispatchEvent(new Event('panelChanged'));
}}
aria-label={intl.formatMessage(intlMessages.closeChatLabel, { 0: title })}
label={intl.formatMessage(intlMessages.closeChatLabel, { 0: title })}
accessKey={CLOSE_CHAT_AK}
/>
)
- : <ChatDropdown isMeteorConnected={isMeteorConnected} amIModerator={amIModerator} />
+ : (
+ <ChatDropdownContainer
+ isMeteorConnected={isMeteorConnected}
+ amIModerator={amIModerator}
+ />
+ )
}
</header>
<MessageList
diff --git a/bigbluebutton-html5/imports/ui/components/chat/container.jsx b/bigbluebutton-html5/imports/ui/components/chat/container.jsx
index 070a21e4a34210c1bed19abde0d376d32161d0c1..5ba32ed22a049695388087aa476130ba3e2b20d5 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/container.jsx
@@ -157,11 +157,11 @@ export default injectIntl(withTracker(({ intl }) => {
return {
...message,
- content: message.content.map(content => ({
+ content: message.content ? message.content.map(content => ({
...content,
text: content.text in intlMessages
? `<b><i>${intl.formatMessage(intlMessages[content.text], systemMessageIntl)}</i></b>` : content.text,
- })),
+ })) : [],
};
});
diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx
index f164d0d769ff7424b6bd9f0c86e3a167857d1334..cade8f4c4b28b537fc7b03550fd4b47888ab8734 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx
@@ -4,6 +4,7 @@ import { FormattedTime, defineMessages, injectIntl } from 'react-intl';
import _ from 'lodash';
import Icon from '/imports/ui/components/icon/component';
import UserAvatar from '/imports/ui/components/user-avatar/component';
+import cx from 'classnames';
import Message from './message/component';
import { styles } from './styles';
@@ -16,7 +17,7 @@ const propTypes = {
name: PropTypes.string,
}),
messages: PropTypes.arrayOf(Object).isRequired,
- time: PropTypes.number.isRequired,
+ time: PropTypes.number,
intl: PropTypes.shape({
formatMessage: PropTypes.func.isRequired,
}).isRequired,
@@ -30,6 +31,7 @@ const defaultProps = {
user: null,
scrollArea: null,
lastReadMessageTime: 0,
+ time: 0,
};
const intlMessages = defineMessages({
@@ -41,10 +43,6 @@ const intlMessages = defineMessages({
id: 'app.chat.pollResult',
description: 'used in place of user name who published poll to chat',
},
- legendTitle: {
- id: 'app.polling.pollingTitle',
- description: 'heading for chat poll legend',
- },
});
class MessageListItem extends Component {
@@ -110,13 +108,14 @@ class MessageListItem extends Component {
handleReadMessage,
scrollArea,
intl,
- chats,
+ messages,
} = this.props;
- if (chats.length < 1) return null;
+ if (messages && messages[0].text.includes('bbb-published-poll-<br/>')) {
+ return this.renderPollItem();
+ }
const dateTime = new Date(time);
-
const regEx = /<a[^>]+>/i;
return (
@@ -148,7 +147,7 @@ class MessageListItem extends Component {
</time>
</div>
<div className={styles.messages} data-test="chatUserMessage">
- {chats.map(message => (
+ {messages.map(message => (
<Message
className={(regEx.test(message.text) ? styles.hyperlink : styles.message)}
key={message.id}
@@ -172,53 +171,17 @@ class MessageListItem extends Component {
user,
time,
intl,
- polls,
isDefaultPoll,
+ messages,
+ scrollArea,
+ chatAreaId,
+ lastReadMessageTime,
+ handleReadMessage,
} = this.props;
- if (polls.length < 1) return null;
-
const dateTime = new Date(time);
- let pollText = [];
- const pollElement = [];
- const legendElements = [
- (<div
- className={styles.optionsTitle}
- key={_.uniqueId('chat-poll-options-')}
- >
- {intl.formatMessage(intlMessages.legendTitle)}
- </div>),
- ];
-
- let isDefault = true;
- polls.forEach((poll) => {
- isDefault = isDefaultPoll(poll.text);
- pollText = poll.text.split('<br/>');
- pollElement.push(pollText.map((p, index) => {
- if (!isDefault) {
- legendElements.push(
- <div key={_.uniqueId('chat-poll-legend-')} className={styles.pollLegend}>
- <span>{`${index + 1}: `}</span>
- <span className={styles.pollOption}>{p.split(':')[0]}</span>
- </div>,
- );
- }
-
- return (
- <div key={_.uniqueId('chat-poll-result-')} className={styles.pollLine}>
- {!isDefault ? p.replace(p.split(':')[0], index + 1) : p}
- </div>
- );
- }));
- });
-
- if (!isDefault) {
- pollElement.push(<div key={_.uniqueId('chat-poll-separator-')} className={styles.divider} />);
- pollElement.push(legendElements);
- }
-
- return polls ? (
+ return messages ? (
<div className={styles.item} key={_.uniqueId('message-poll-item-')}>
<div className={styles.wrapper} ref={(ref) => { this.item = ref; }}>
<div className={styles.avatarWrapper}>
@@ -239,15 +202,19 @@ class MessageListItem extends Component {
<FormattedTime value={dateTime} />
</time>
</div>
- <div className={styles.messages}>
- {polls[0] ? (
- <div className={styles.pollWrapper} style={{ borderLeft: `3px ${user.color} solid` }}>
- {
- pollElement
- }
- </div>
- ) : null}
- </div>
+ <Message
+ type="poll"
+ className={cx(styles.message, styles.pollWrapper)}
+ key={messages[0].id}
+ text={messages[0].text}
+ time={messages[0].time}
+ chatAreaId={chatAreaId}
+ lastReadMessageTime={lastReadMessageTime}
+ handleReadMessage={handleReadMessage}
+ scrollArea={scrollArea}
+ color={user.color}
+ isDefaultPoll={isDefaultPoll(messages[0].text.replace('bbb-published-poll-<br/>', ''))}
+ />
</div>
</div>
</div>
@@ -265,10 +232,7 @@ class MessageListItem extends Component {
return (
<div className={styles.item}>
- {[
- this.renderPollItem(),
- this.renderMessageItem(),
- ]}
+ {this.renderMessageItem()}
</div>
);
}
diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/container.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/container.jsx
index 5c7d7e0a476776ecaa42ebaea97dfd9c5f25a3f7..31b407d453f56cb6fe98a48f4cbd0c49b4f97bcb 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/container.jsx
@@ -15,26 +15,10 @@ export default withTracker(({ message }) => {
const mappedMessage = ChatService.mapGroupMessage(message);
const messages = mappedMessage.content;
- const chats = [];
- const polls = [];
-
- if (messages.length > 0) {
- messages.forEach((m) => {
- if (m.text.includes('bbb-published-poll-<br/>')) {
- m.text = m.text.replace(/^bbb-published-poll-<br\/>/g, '');
- polls.push(m);
- } else {
- chats.push(m);
- }
- });
- }
-
return {
messages,
user: mappedMessage.sender,
time: mappedMessage.time,
- chats,
- polls,
isDefaultPoll: (pollText) => {
const pollValue = pollText.replace(/<br\/>|[ :|%\n\d+]/g, '');
switch (pollValue) {
diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx
index e015975f84c037b8d95cc03d942a3f12865d1292..d7d7ade04ff122e76cacc0b88d9ab8b76ceb043c 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx
@@ -2,6 +2,7 @@ import React, { PureComponent } from 'react';
import PropTypes from 'prop-types';
import _ from 'lodash';
import fastdom from 'fastdom';
+import { defineMessages, injectIntl } from 'react-intl';
const propTypes = {
text: PropTypes.string.isRequired,
@@ -34,13 +35,22 @@ const isElementInViewport = (el) => {
);
};
-export default class MessageListItem extends PureComponent {
+const intlMessages = defineMessages({
+ legendTitle: {
+ id: 'app.polling.pollingTitle',
+ description: 'heading for chat poll legend',
+ },
+});
+
+class MessageListItem extends PureComponent {
constructor(props) {
super(props);
this.ticking = false;
this.handleMessageInViewport = _.debounce(this.handleMessageInViewport.bind(this), 50);
+
+ this.renderPollListItem = this.renderPollListItem.bind(this);
}
componentDidMount() {
@@ -145,17 +155,56 @@ export default class MessageListItem extends PureComponent {
});
}
+ renderPollListItem() {
+ const {
+ intl,
+ text,
+ className,
+ color,
+ isDefaultPoll,
+ } = this.props;
+
+ const formatBoldBlack = s => s.bold().fontcolor('black');
+
+ let _text = text.replace('bbb-published-poll-<br/>', '');
+
+ if (!isDefaultPoll) {
+ const entries = _text.split('<br/>');
+ const options = [];
+ entries.map((e) => { options.push([e.slice(0, e.indexOf(':'))]); return e; });
+ options.map((o, idx) => {
+ _text = formatBoldBlack(_text.replace(o, idx + 1));
+ return _text;
+ });
+ _text += formatBoldBlack(`<br/><br/>${intl.formatMessage(intlMessages.legendTitle)}`);
+ options.map((o, idx) => { _text += `<br/>${idx + 1}: ${o}`; return _text; });
+ }
+
+ return (
+ <p
+ className={className}
+ style={{ borderLeft: `3px ${color} solid` }}
+ ref={(ref) => { this.text = ref; }}
+ dangerouslySetInnerHTML={{ __html: isDefaultPoll ? formatBoldBlack(_text) : _text }}
+ data-test="chatMessageText"
+ />
+ );
+ }
+
render() {
const {
text,
+ type,
className,
} = this.props;
+ if (type === 'poll') return this.renderPollListItem();
+
return (
<p
+ className={className}
ref={(ref) => { this.text = ref; }}
dangerouslySetInnerHTML={{ __html: text }}
- className={className}
data-test="chatMessageText"
/>
);
@@ -164,3 +213,5 @@ export default class MessageListItem extends PureComponent {
MessageListItem.propTypes = propTypes;
MessageListItem.defaultProps = defaultProps;
+
+export default injectIntl(MessageListItem);
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
index 5b8817b1c6822a1662591941eb2c25846fa98abb..b4447341f5ec5b6b9c12b54d3898dc324ca5b3ee 100755
--- 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
@@ -4,7 +4,7 @@
--systemMessage-background-color: #F9FBFC;
--systemMessage-border-color: #C5CDD4;
--systemMessage-font-color: var(--color-dark-grey);
- --chat-poll-margin-sm: .25rem;
+ --chat-poll-margin-sm: .5rem;
}
.item {
@@ -159,42 +159,11 @@
bottom: var(--border-size-large);
}
-.pollLine {
- overflow-wrap: break-word;
- font-size: var(--font-size-large);
- font-weight: 600;
-}
-
.pollWrapper {
+ background: var(--systemMessage-background-color);
border: solid 1px var(--color-gray-lighter);
border-radius: var(--border-radius);
padding: var(--chat-poll-margin-sm);
padding-left: 1rem;
- margin-top: .5rem;
- background: var(--systemMessage-background-color);
-}
-
-.pollLegend {
- display: flex;
- flex-direction: row;
- margin-top: var(--chat-poll-margin-sm);
-}
-
-.pollOption {
- word-break: break-word;
- margin-left: var(--md-padding-y);
-}
-
-.optionsTitle {
- font-weight: bold;
- margin-top: var(--md-padding-y);
-}
-
-.divider {
- position: relative;
- height: 1px;
- width: 95%;
- margin-right: auto;
- margin-top: var(--md-padding-y);
- border-bottom: solid 1px var(--color-gray-lightest);
+ margin-top: var(--chat-poll-margin-sm) !important;
}
diff --git a/bigbluebutton-html5/imports/ui/components/chat/service.js b/bigbluebutton-html5/imports/ui/components/chat/service.js
index 5579ad7ce4ab1d7612b3dda360ea71d668efcf58..ce745e1966ab64e1568ab98340cf2add88433d25 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/service.js
+++ b/bigbluebutton-html5/imports/ui/components/chat/service.js
@@ -31,6 +31,8 @@ const UnsentMessagesCollection = new Mongo.Collection(null);
// session for closed chat list
const CLOSED_CHAT_LIST_KEY = 'closedChatList';
+const POLL_MESSAGE_PREFIX = 'bbb-published-poll-<br/>';
+
const getUser = userId => Users.findOne({ userId });
const getWelcomeProp = () => Meetings.findOne({ meetingId: Auth.meetingID },
@@ -83,11 +85,15 @@ const reduceGroupMessages = (previous, current) => {
return previous.concat(currentMessage);
}
// Check if the last message is from the same user and time discrepancy
- // between the two messages exceeds window and then group current message
- // with the last one
+ // between the two messages exceeds window and then group current
+ // message with the last one
const timeOfLastMessage = lastMessage.content[lastMessage.content.length - 1].time;
+ const isOrWasPoll = currentMessage.message.includes(POLL_MESSAGE_PREFIX)
+ || lastMessage.message.includes(POLL_MESSAGE_PREFIX);
+ const groupingWindow = isOrWasPoll ? 0 : GROUPING_MESSAGES_WINDOW;
+
if (lastMessage.sender === currentMessage.sender
- && (currentMessage.timestamp - timeOfLastMessage) <= GROUPING_MESSAGES_WINDOW) {
+ && (currentMessage.timestamp - timeOfLastMessage) <= groupingWindow) {
lastMessage.content.push(currentMessage.content.pop());
return previous;
}
diff --git a/bigbluebutton-html5/imports/ui/components/chat/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/styles.scss
index ac3d000d5cb6f1326f78f8fe567e655aae42be69..edeb118334113078677c7da59799f485b0a660c9 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/chat/styles.scss
@@ -31,7 +31,14 @@
justify-content: space-around;
overflow: hidden;
height: 100vh;
- transform: translateZ(0);
+
+ :global(.browser-chrome) & {
+ transform: translateZ(0);
+ }
+
+ @include mq($small-only) {
+ transform: none !important;
+ }
}
.header {
diff --git a/bigbluebutton-html5/imports/ui/components/connection-status/modal/component.jsx b/bigbluebutton-html5/imports/ui/components/connection-status/modal/component.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..a1c93cd31aa0fc8f6f7b1ed2e32fd16cc1d1edf7
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/connection-status/modal/component.jsx
@@ -0,0 +1,157 @@
+import React, { PureComponent } from 'react';
+import { FormattedTime, defineMessages, injectIntl } from 'react-intl';
+import PropTypes from 'prop-types';
+import cx from 'classnames';
+import UserAvatar from '/imports/ui/components/user-avatar/component';
+import SlowConnection from '/imports/ui/components/slow-connection/component';
+import Modal from '/imports/ui/components/modal/simple/component';
+import { styles } from './styles';
+
+const STATS = Meteor.settings.public.stats;
+
+const intlMessages = defineMessages({
+ ariaTitle: {
+ id: 'app.connection-status.ariaTitle',
+ description: 'Connection status aria title',
+ },
+ title: {
+ id: 'app.connection-status.title',
+ description: 'Connection status title',
+ },
+ description: {
+ id: 'app.connection-status.description',
+ description: 'Connection status description',
+ },
+ empty: {
+ id: 'app.connection-status.empty',
+ description: 'Connection status empty',
+ },
+ more: {
+ id: 'app.connection-status.more',
+ description: 'More about conectivity issues',
+ },
+ offline: {
+ id: 'app.connection-status.offline',
+ description: 'Offline user',
+ },
+});
+
+const propTypes = {
+ closeModal: PropTypes.func.isRequired,
+ intl: PropTypes.shape({
+ formatMessage: PropTypes.func.isRequired,
+ }).isRequired,
+};
+
+class ConnectionStatusComponent extends PureComponent {
+ renderEmpty() {
+ const { intl } = this.props;
+
+ return (
+ <div className={styles.item}>
+ <div className={styles.left}>
+ <div className={styles.name}>
+ <div className={styles.text}>
+ {intl.formatMessage(intlMessages.empty)}
+ </div>
+ </div>
+ </div>
+ </div>
+ );
+ }
+
+ renderConnections() {
+ const {
+ connectionStatus,
+ intl,
+ } = this.props;
+
+ if (connectionStatus.length === 0) return this.renderEmpty();
+
+ return connectionStatus.map((conn, index) => {
+ const dateTime = new Date(conn.timestamp);
+ const itemStyle = {};
+ itemStyle[styles.even] = index % 2 === 0;
+
+ const textStyle = {};
+ textStyle[styles.offline] = conn.offline;
+
+ return (
+ <div
+ key={index}
+ className={cx(styles.item, itemStyle)}
+ >
+ <div className={styles.left}>
+ <div className={styles.avatar}>
+ <UserAvatar
+ className={styles.icon}
+ you={conn.you}
+ moderator={conn.moderator}
+ color={conn.color}
+ >
+ {conn.name.toLowerCase().slice(0, 2)}
+ </UserAvatar>
+ </div>
+
+ <div className={styles.name}>
+ <div className={cx(styles.text, textStyle)}>
+ {conn.name}
+ {conn.offline ? ` (${intl.formatMessage(intlMessages.offline)})` : null}
+ </div>
+ </div>
+ <div className={styles.status}>
+ <SlowConnection effectiveConnectionType={conn.level} />
+ </div>
+ </div>
+ <div className={styles.right}>
+ <div className={styles.time}>
+ <time dateTime={dateTime}>
+ <FormattedTime value={dateTime} />
+ </time>
+ </div>
+ </div>
+ </div>
+ );
+ });
+ }
+
+ render() {
+ const {
+ closeModal,
+ intl,
+ } = this.props;
+
+ return (
+ <Modal
+ overlayClassName={styles.overlay}
+ className={styles.modal}
+ onRequestClose={closeModal}
+ hideBorder
+ contentLabel={intl.formatMessage(intlMessages.ariaTitle)}
+ >
+ <div className={styles.container}>
+ <div className={styles.header}>
+ <h2 className={styles.title}>
+ {intl.formatMessage(intlMessages.title)}
+ </h2>
+ </div>
+ <div className={styles.description}>
+ {intl.formatMessage(intlMessages.description)}{' '}
+ <a href={STATS.help} target="_blank" rel="noopener noreferrer">
+ {`(${intl.formatMessage(intlMessages.more)})`}
+ </a>
+ </div>
+ <div className={styles.content}>
+ <div className={styles.wrapper}>
+ {this.renderConnections()}
+ </div>
+ </div>
+ </div>
+ </Modal>
+ );
+ }
+}
+
+ConnectionStatusComponent.propTypes = propTypes;
+
+export default injectIntl(ConnectionStatusComponent);
diff --git a/bigbluebutton-html5/imports/ui/components/connection-status/modal/container.jsx b/bigbluebutton-html5/imports/ui/components/connection-status/modal/container.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..c6b1aeb54f737fc510e8a19ac93e69ca4c9d7f61
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/connection-status/modal/container.jsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { withTracker } from 'meteor/react-meteor-data';
+import { withModalMounter } from '/imports/ui/components/modal/service';
+import ConnectionStatusService from '../service';
+import ConnectionStatusComponent from './component';
+
+const connectionStatusContainer = props => <ConnectionStatusComponent {...props} />;
+
+export default withModalMounter(withTracker(({ mountModal }) => ({
+ closeModal: () => mountModal(null),
+ connectionStatus: ConnectionStatusService.getConnectionStatus(),
+}))(connectionStatusContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/connection-status/modal/styles.scss b/bigbluebutton-html5/imports/ui/components/connection-status/modal/styles.scss
new file mode 100644
index 0000000000000000000000000000000000000000..5bbd7634eecc413578a34941a730e19cf7cdf6d0
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/connection-status/modal/styles.scss
@@ -0,0 +1,137 @@
+@import '/imports/ui/stylesheets/mixins/focus';
+@import '/imports/ui/stylesheets/variables/_all';
+@import "/imports/ui/components/modal/simple/styles";
+
+:root {
+ --modal-margin: 3rem;
+ --title-position-left: 2.2rem;
+ --closeBtn-position-left: 2.5rem;
+}
+
+.title {
+ left: var(--title-position-left);
+ right: auto;
+ color: var(--color-gray-dark);
+ font-weight: bold;
+ font-size: var(--font-size-large);
+ text-align: center;
+
+ [dir="rtl"] & {
+ left: auto;
+ right: var(--title-position-left);
+ }
+}
+
+.container {
+ margin: 0 var(--modal-margin) var(--lg-padding-x);
+}
+
+.modal {
+ @extend .modal;
+ padding: var(--jumbo-padding-y);
+}
+
+.overlay {
+ @extend .overlay;
+}
+
+.description {
+ text-align: center;
+ color: var(--color-gray);
+ margin-bottom: var(--jumbo-padding-y)
+}
+
+.label {
+ color: var(--color-gray-label);
+ font-size: var(--font-size-small);
+ margin-bottom: var(--lg-padding-y);
+}
+
+.header {
+ margin: 0;
+ padding: 0;
+ border: none;
+ line-height: var(--title-position-left);
+ margin-bottom: var(--lg-padding-y);
+}
+
+.content {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ padding: 0;
+}
+
+.wrapper {
+ display: block;
+ width: 100%;
+ max-height: 24rem;
+}
+
+.item {
+ display: flex;
+ width: 100%;
+ height: 4rem;
+}
+
+.even {
+ background-color: var(--color-off-white);
+}
+
+.left {
+ display: flex;
+ width: 100%;
+ height: 100%;
+
+ .avatar {
+ display: flex;
+ width: 4rem;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+
+ .icon {
+ min-width: 2.25rem;
+ height: 2.25rem;
+ }
+ }
+
+ .name {
+ display: grid;
+ width: 100%;
+ height: 100%;
+ align-items: center;
+
+ .text {
+ padding-left: .5rem;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ .offline {
+ font-style: italic;
+ }
+ }
+
+ .status {
+ display: flex;
+ width: 6rem;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+ }
+}
+
+.right {
+ display: flex;
+ width: 5rem;
+ height: 100%;
+
+ .time {
+ display: flex;
+ align-items: center;
+ width: 100%;
+ height: 100%;
+ }
+}
diff --git a/bigbluebutton-html5/imports/ui/components/connection-status/service.js b/bigbluebutton-html5/imports/ui/components/connection-status/service.js
new file mode 100644
index 0000000000000000000000000000000000000000..fd6445e05c5ec10c0f248caaef526d2da149619b
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/connection-status/service.js
@@ -0,0 +1,134 @@
+import ConnectionStatus from '/imports/api/connection-status';
+import Users from '/imports/api/users';
+import Auth from '/imports/ui/services/auth';
+import { makeCall } from '/imports/ui/services/api';
+
+const STATS = Meteor.settings.public.stats;
+const ROLE_MODERATOR = Meteor.settings.public.user.role_moderator;
+
+let audioStats = '';
+const audioStatsDep = new Tracker.Dependency();
+
+let statsTimeout = null;
+
+const getHelp = () => STATS.help;
+
+const getLevel = () => STATS.level;
+
+const getAudioStats = () => {
+ audioStatsDep.depend();
+ return audioStats;
+};
+
+const setAudioStats = (level = '') => {
+ if (audioStats !== level) {
+ audioStats = level;
+ audioStatsDep.changed();
+ addConnectionStatus(level);
+ }
+};
+
+const handleAudioStatsEvent = (event) => {
+ const { detail } = event;
+ if (detail) {
+ const { loss, jitter } = detail;
+ let active = false;
+ // From higher to lower
+ for (let i = STATS.level.length - 1; i >= 0; i--) {
+ if (loss > STATS.loss[i] || jitter > STATS.jitter[i]) {
+ active = true;
+ setAudioStats(STATS.level[i]);
+ break;
+ }
+ }
+ if (active) {
+ if (statsTimeout !== null) clearTimeout(statsTimeout);
+ statsTimeout = setTimeout(() => {
+ setAudioStats();
+ }, STATS.length * STATS.interval);
+ }
+ }
+};
+
+const addConnectionStatus = (level) => {
+ if (level !== '') makeCall('addConnectionStatus', level);
+};
+
+const sortLevel = (a, b) => {
+ const indexOfA = STATS.level.indexOf(a.level);
+ const indexOfB = STATS.level.indexOf(b.level);
+
+ if (indexOfA < indexOfB) return 1;
+ if (indexOfA === indexOfB) return 0;
+ if (indexOfA > indexOfB) return -1;
+};
+
+const getConnectionStatus = () => {
+ const connectionStatus = ConnectionStatus.find(
+ { meetingId: Auth.meetingID },
+ ).fetch().map(status => {
+ const {
+ userId,
+ level,
+ timestamp,
+ } = status;
+
+ return {
+ userId,
+ level,
+ timestamp,
+ };
+ });
+
+ return Users.find(
+ { meetingId: Auth.meetingID },
+ { fields:
+ {
+ userId: 1,
+ name: 1,
+ role: 1,
+ color: 1,
+ connectionStatus: 1,
+ },
+ },
+ ).fetch().reduce((result, user) => {
+ const {
+ userId,
+ name,
+ role,
+ color,
+ connectionStatus: userStatus,
+ } = user;
+
+ const status = connectionStatus.find(status => status.userId === userId);
+
+ if (status) {
+ result.push({
+ name,
+ offline: userStatus === 'offline',
+ you: Auth.userID === userId,
+ moderator: role === ROLE_MODERATOR,
+ color,
+ level: status.level,
+ timestamp: status.timestamp,
+ });
+ }
+
+ return result;
+ }, []).sort(sortLevel);
+};
+
+const isEnabled = () => STATS.enabled;
+
+if (STATS.enabled) {
+ window.addEventListener('audiostats', handleAudioStatsEvent);
+}
+
+export default {
+ addConnectionStatus,
+ getConnectionStatus,
+ getAudioStats,
+ getHelp,
+ getLevel,
+ isEnabled,
+};
diff --git a/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx b/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx
index bf8ddcee4bf63c5febcfb0732e011dd94c97ce73..df1383d4d005d7b194f8c5f9079d34b868bcad28 100644
--- a/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx
@@ -1,10 +1,10 @@
-import React from 'react';
+import React, { PureComponent } from 'react';
import PropTypes from 'prop-types';
import { defineMessages, injectIntl } from 'react-intl';
import { Meteor } from 'meteor/meteor';
-import Button from '/imports/ui/components/button/component';
-import logoutRouteHandler from '/imports/utils/logoutRouteHandler';
import { Session } from 'meteor/session';
+import AudioManager from '/imports/ui/services/audio-manager';
+import logger from '/imports/startup/client/logger';
import { styles } from './styles';
const intlMessages = defineMessages({
@@ -28,10 +28,6 @@ const intlMessages = defineMessages({
400: {
id: 'app.error.400',
},
- leave: {
- id: 'app.error.leaveLabel',
- description: 'aria-label for leaving',
- },
});
const propTypes = {
@@ -45,9 +41,12 @@ const defaultProps = {
code: 500,
};
-class ErrorScreen extends React.PureComponent {
+class ErrorScreen extends PureComponent {
componentDidMount() {
+ const { code } = this.props;
+ AudioManager.exitAudio();
Meteor.disconnect();
+ logger.error({ logCode: 'startup_client_usercouldnotlogin_error' }, `User could not log in HTML5, hit ${code}`);
}
render() {
@@ -65,30 +64,21 @@ class ErrorScreen extends React.PureComponent {
return (
<div className={styles.background}>
- <h1 className={styles.codeError}>
- {code}
- </h1>
<h1 className={styles.message}>
{formatedMessage}
</h1>
- <div className={styles.separator} />
- <div>
- {children}
- </div>
{
!Session.get('errorMessageDescription') || (
- <div className={styles.sessionMessage}>
- {Session.get('errorMessageDescription')}
- </div>)
+ <div className={styles.sessionMessage}>
+ {Session.get('errorMessageDescription')}
+ </div>)
}
+ <div className={styles.separator} />
+ <h1 className={styles.codeError}>
+ {code}
+ </h1>
<div>
- <Button
- size="sm"
- color="primary"
- className={styles.button}
- onClick={logoutRouteHandler}
- label={intl.formatMessage(intlMessages.leave)}
- />
+ {children}
</div>
</div>
);
diff --git a/bigbluebutton-html5/imports/ui/components/error-screen/styles.scss b/bigbluebutton-html5/imports/ui/components/error-screen/styles.scss
index 3e7f7da0d4d6527496ac68ad1fba651e930d4930..4aef80e9433f860025ecdebd101697350d898c47 100644
--- a/bigbluebutton-html5/imports/ui/components/error-screen/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/error-screen/styles.scss
@@ -20,20 +20,21 @@
.message {
margin: 0;
- color: var(--color-gray-light);
- font-size: 1.25rem;
+ color: var(--color-white);
+ font-size: 1.75rem;
font-weight: 400;
+ margin-bottom: 1rem;
}
.sessionMessage {
@extend .message;
- font-size: var(--font-size-small);
- margin-bottom: 1.5rem;
+ font-size: 1.25rem;
+ color: var(--color-white);
}
.codeError {
margin: 0;
- font-size: 5rem;
+ font-size: 1.5rem;
color: var(--color-white);
}
@@ -50,4 +51,3 @@
min-width: 9rem;
height: 2rem;
}
-
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
index 015bdfae46d6b09fae1f8af9996c8e91bad72dd5..306024993c8fec1acf759a2f75da2ce47932c994 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
@@ -47,6 +47,12 @@ class VideoPlayer extends Component {
};
this.opts = {
+ // default option for all players, can be overwritten
+ playerOptions: {
+ autoplay: true,
+ playsinline: true,
+ controls: true,
+ },
file: {
attributes: {
controls: true,
@@ -67,6 +73,12 @@ class VideoPlayer extends Component {
controls: isPresenter ? 1 : 2,
},
},
+ twitch: {
+ options: {
+ controls: true,
+ },
+ playerId: 'externalVideoPlayerTwitch',
+ },
preload: true,
};
@@ -212,6 +224,11 @@ class VideoPlayer extends Component {
setPlaybackRate(rate) {
const intPlayer = this.player && this.player.getInternalPlayer();
+ const currentRate = this.getCurrentPlaybackRate();
+
+ if (currentRate === rate) {
+ return;
+ }
this.setState({ playbackRate: rate });
if (intPlayer && intPlayer.setPlaybackRate) {
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/custom-players/arc-player.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/custom-players/arc-player.jsx
index 763f6871d5e62ed64a43b9242e105dad96c6d370..fa1a1920214a8fc004985596ebf74a958a71c6fd 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/custom-players/arc-player.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/custom-players/arc-player.jsx
@@ -1,7 +1,7 @@
import loadScript from 'load-script';
import React, { Component } from 'react'
-const MATCH_URL = new RegExp("https?:\/\/(\\w+)\.(instructuremedia.com)(\/embed)?\/([-abcdef0-9]+)");
+const MATCH_URL = new RegExp("https?:\/\/(\\w+)[.](instructuremedia.com)(\/embed)?\/([-abcdef0-9]+)");
const SDK_URL = 'https://files.instructuremedia.com/instructure-media-script/instructure-media-1.1.0.js';
@@ -62,6 +62,10 @@ export class ArcPlayer extends Component {
this.onStateChange = this.onStateChange.bind(this);
}
+ componentDidMount () {
+ this.props.onMount && this.props.onMount(this)
+ }
+
load() {
new Promise((resolve, reject) => {
this.render();
diff --git a/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx b/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
index b5de6d3bc85a47774b2f10db03d11ec89f13c5e9..3bb0d608fb7e7a86fcdb86002a9ac6b935a2c1d3 100755
--- a/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
@@ -14,7 +14,6 @@ const propTypes = {
class JoinHandler extends Component {
static setError(codeError) {
- Session.set('hasError', true);
if (codeError) Session.set('codeError', codeError);
}
@@ -180,7 +179,7 @@ class JoinHandler extends Component {
logUserInfo();
Tracker.autorun(async (cd) => {
- const user = Users.findOne({ userId: Auth.userID, authed: true }, { fields: { _id: 1 } });
+ const user = Users.findOne({ userId: Auth.userID, approved: true }, { fields: { _id: 1 } });
if (user) {
await setCustomData(response);
diff --git a/bigbluebutton-html5/imports/ui/components/layout/context.jsx b/bigbluebutton-html5/imports/ui/components/layout/context.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..4a83c894f3d5725452d866a9a88020af95dd621d
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/layout/context.jsx
@@ -0,0 +1,290 @@
+import React, { createContext, useReducer, useEffect } from 'react';
+import Storage from '/imports/ui/services/storage/session';
+
+const { webcamsDefaultPlacement } = Meteor.settings.public.layout;
+
+export const LayoutContext = createContext();
+
+const initialState = {
+ autoArrangeLayout: true,
+ webcamsAreaResizing: false,
+ numUsersVideo: null,
+ windowSize: {
+ width: 0,
+ height: 0,
+ },
+ mediaBounds: {
+ width: 0,
+ height: 0,
+ top: 0,
+ left: 0,
+ },
+ userListSize: {
+ width: 0,
+ },
+ chatSize: {
+ width: 0,
+ },
+ noteSize: {
+ width: 0,
+ },
+ captionsSize: {
+ width: 0,
+ },
+ pollSize: {
+ width: 0,
+ },
+ waitingSize: {
+ width: 0,
+ },
+ breakoutRoomSize: {
+ width: 0,
+ },
+ webcamsAreaSize: {
+ width: 0,
+ height: 0,
+ },
+ tempWebcamsAreaSize: {
+ width: 0,
+ height: 0,
+ },
+ webcamsAreaUserSetsHeight: 0,
+ webcamsAreaUserSetsWidth: 0,
+ webcamsPlacement: webcamsDefaultPlacement || 'top',
+ presentationAreaSize: {
+ width: 0,
+ height: 0,
+ },
+ presentationSlideSize: {
+ width: 0,
+ height: 0,
+ },
+ presentationIsFullscreen: null,
+ presentationOrientation: null,
+};
+
+const reducer = (state, action) => {
+ switch (action.type) {
+ case 'setAutoArrangeLayout': {
+ return {
+ ...state,
+ autoArrangeLayout: action.value,
+ };
+ }
+ case 'setWebcamsAreaResizing': {
+ return {
+ ...state,
+ webcamsAreaResizing: action.value,
+ };
+ }
+ case 'setUsersVideo': {
+ return {
+ ...state,
+ numUsersVideo: action.value,
+ };
+ }
+ case 'setWindowSize': {
+ return {
+ ...state,
+ windowSize: {
+ width: action.value.width,
+ height: action.value.height,
+ },
+ };
+ }
+ case 'setMediaBounds': {
+ return {
+ ...state,
+ mediaBounds: {
+ width: action.value.width,
+ height: action.value.height,
+ top: action.value.top,
+ left: action.value.left,
+ },
+ };
+ }
+ case 'setUserListSize': {
+ return {
+ ...state,
+ userListSize: {
+ width: action.value.width,
+ },
+ };
+ }
+ case 'setChatSize': {
+ return {
+ ...state,
+ chatSize: {
+ width: action.value.width,
+ },
+ };
+ }
+ case 'setNoteSize': {
+ return {
+ ...state,
+ noteSize: {
+ width: action.value.width,
+ },
+ };
+ }
+ case 'setCaptionsSize': {
+ return {
+ ...state,
+ captionsSize: {
+ width: action.value.width,
+ },
+ };
+ }
+ case 'setPollSize': {
+ return {
+ ...state,
+ pollSize: {
+ width: action.value.width,
+ },
+ };
+ }
+ case 'setWaitingUsersPanelSize': {
+ return {
+ ...state,
+ waitingSize: {
+ width: action.value.width,
+ },
+ };
+ }
+ case 'setBreakoutRoomSize': {
+ return {
+ ...state,
+ breakoutRoomSize: {
+ width: action.value.width,
+ },
+ };
+ }
+ case 'setWebcamsPlacement': {
+ // webcamsPlacement: ('top' | 'right' | 'bottom' | 'left') string
+ return {
+ ...state,
+ webcamsPlacement: action.value,
+ };
+ }
+ case 'setWebcamsAreaSize': {
+ return {
+ ...state,
+ webcamsAreaSize: {
+ width: action.value.width,
+ height: action.value.height,
+ },
+ };
+ }
+ case 'setTempWebcamsAreaSize': {
+ return {
+ ...state,
+ tempWebcamsAreaSize: {
+ width: action.value.width,
+ height: action.value.height,
+ },
+ };
+ }
+ case 'setWebcamsAreaUserSetsHeight': {
+ return {
+ ...state,
+ webcamsAreaUserSetsHeight: action.value,
+ };
+ }
+ case 'setWebcamsAreaUserSetsWidth': {
+ return {
+ ...state,
+ webcamsAreaUserSetsWidth: action.value,
+ };
+ }
+ case 'setPresentationAreaSize': {
+ return {
+ ...state,
+ presentationAreaSize: {
+ width: action.value.width,
+ height: action.value.height,
+ },
+ };
+ }
+ case 'setPresentationSlideSize': {
+ return {
+ ...state,
+ presentationSlideSize: {
+ width: action.value.width,
+ height: action.value.height,
+ },
+ };
+ }
+ case 'setPresentationFullscreen': {
+ // presentationIsFullscreen: (true | false) boolean
+ return {
+ ...state,
+ presentationIsFullscreen: action.value,
+ };
+ }
+ case 'setPresentationOrientation': {
+ // presentationOrientation: ('portrait' | 'landscape') string
+ return {
+ ...state,
+ presentationOrientation: action.value,
+ };
+ }
+ default: {
+ throw new Error('Unexpected action');
+ }
+ }
+};
+
+const ContextProvider = (props) => {
+ const [layoutContextState, layoutContextDispatch] = useReducer(reducer, initialState);
+ const {
+ webcamsPlacement,
+ webcamsAreaUserSetsHeight,
+ webcamsAreaUserSetsWidth,
+ autoArrangeLayout,
+ } = layoutContextState;
+ const { children } = props;
+
+ useEffect(() => {
+ Storage.setItem('webcamsPlacement', webcamsPlacement);
+ Storage.setItem('webcamsAreaUserSetsHeight', webcamsAreaUserSetsHeight);
+ Storage.setItem('webcamsAreaUserSetsWidth', webcamsAreaUserSetsWidth);
+ Storage.setItem('autoArrangeLayout', autoArrangeLayout);
+ }, [
+ webcamsPlacement,
+ webcamsAreaUserSetsHeight,
+ webcamsAreaUserSetsWidth,
+ autoArrangeLayout,
+ ]);
+
+ return (
+ <LayoutContext.Provider value={{
+ layoutContextState,
+ layoutContextDispatch,
+ ...props,
+ }}
+ >
+ {children}
+ </LayoutContext.Provider>
+ );
+};
+
+const withProvider = Component => props => (
+ <ContextProvider {...props}>
+ <Component />
+ </ContextProvider>
+);
+
+const ContextConsumer = Component => props => (
+ <LayoutContext.Consumer>
+ {contexts => <Component {...props} {...contexts} />}
+ </LayoutContext.Consumer>
+);
+
+const withLayoutConsumer = Component => ContextConsumer(Component);
+const withLayoutContext = Component => withProvider(withLayoutConsumer(Component));
+
+export {
+ withProvider,
+ withLayoutConsumer,
+ withLayoutContext,
+};
diff --git a/bigbluebutton-html5/imports/ui/components/layout/layout-manager.jsx b/bigbluebutton-html5/imports/ui/components/layout/layout-manager.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..5a27d6fe807e793b63b75851d021e3f325c78b20
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/layout/layout-manager.jsx
@@ -0,0 +1,547 @@
+import React, { Component, Fragment } from 'react';
+import Storage from '/imports/ui/services/storage/session';
+import { Session } from 'meteor/session';
+import { withLayoutConsumer } from '/imports/ui/components/layout/context';
+import { isVideoBroadcasting } from '/imports/ui/components/screenshare/service';
+import _ from 'lodash';
+
+const windowWidth = () => window.innerWidth;
+const windowHeight = () => window.innerHeight;
+const min = (value1, value2) => (value1 <= value2 ? value1 : value2);
+const max = (value1, value2) => (value1 >= value2 ? value1 : value2);
+
+// values based on sass file
+const USERLIST_MIN_WIDTH = 150;
+const USERLIST_MAX_WIDTH = 240;
+const CHAT_MIN_WIDTH = 150;
+const CHAT_MAX_WIDTH = 335;
+const NAVBAR_HEIGHT = 85;
+const ACTIONSBAR_HEIGHT = 42;
+
+const WEBCAMSAREA_MIN_PERCENT = 0.2;
+const WEBCAMSAREA_MAX_PERCENT = 0.8;
+// const PRESENTATIONAREA_MIN_PERCENT = 0.2;
+const PRESENTATIONAREA_MIN_WIDTH = 385; // Value based on presentation toolbar
+// const PRESENTATIONAREA_MAX_PERCENT = 0.8;
+
+const storageLayoutData = () => Storage.getItem('layoutData');
+
+class LayoutManager extends Component {
+ static calculatesPresentationSize(
+ mediaAreaWidth, mediaAreaHeight, presentationSlideWidth, presentationSlideHeight,
+ ) {
+ let presentationWidth;
+ let presentationHeight;
+ if (presentationSlideWidth > presentationSlideHeight
+ || presentationSlideWidth === presentationSlideHeight) {
+ presentationWidth = mediaAreaWidth;
+ presentationHeight = (mediaAreaWidth * presentationSlideHeight)
+ / presentationSlideWidth;
+ // if overflow
+ if (presentationHeight > mediaAreaHeight) {
+ presentationWidth = (mediaAreaHeight * presentationWidth) / presentationHeight;
+ presentationHeight = mediaAreaHeight;
+ }
+ }
+ if (presentationSlideHeight > presentationSlideWidth) {
+ presentationWidth = (mediaAreaHeight * presentationSlideWidth)
+ / presentationSlideHeight;
+ presentationHeight = mediaAreaHeight;
+ // if overflow
+ if (presentationWidth > mediaAreaWidth) {
+ presentationHeight = (mediaAreaWidth * presentationWidth) / presentationHeight;
+ presentationWidth = mediaAreaWidth;
+ }
+ }
+
+ return {
+ presentationWidth,
+ presentationHeight,
+ };
+ }
+
+ constructor(props) {
+ super(props);
+
+ this.setLayoutSizes = this.setLayoutSizes.bind(this);
+ this.calculatesLayout = this.calculatesLayout.bind(this);
+ }
+
+ componentDidMount() {
+ this.setLayoutSizes();
+ window.addEventListener('resize', _.throttle(() => this.setLayoutSizes(), 200));
+
+ window.addEventListener('panelChanged', () => {
+ this.setLayoutSizes(true);
+ });
+
+ window.addEventListener('autoArrangeChanged', () => {
+ setTimeout(() => this.setLayoutSizes(false, true), 200);
+ });
+
+ window.addEventListener('slideChanged', () => {
+ setTimeout(() => this.setLayoutSizes(), 200);
+ });
+
+ window.addEventListener('togglePresentationHide', () => {
+ setTimeout(() => this.setLayoutSizes(), 200);
+ });
+
+ window.addEventListener('webcamAreaResize', () => {
+ this.setLayoutSizes();
+ });
+
+ window.addEventListener('webcamPlacementChange', () => {
+ this.setLayoutSizes(false, false, true);
+ });
+ }
+
+ componentDidUpdate(prevProps) {
+ const { layoutContextState } = this.props;
+ const { layoutContextState: prevLayoutContextState } = prevProps;
+ const {
+ numUsersVideo,
+ } = layoutContextState;
+ const {
+ numUsersVideo: prevNumUsersVideo,
+ } = prevLayoutContextState;
+
+ if (numUsersVideo !== prevNumUsersVideo) {
+ setTimeout(() => this.setLayoutSizes(), 500);
+ }
+ }
+
+ setLayoutSizes(panelChanged = false, autoarrangeChanged = false, placementChanged = false) {
+ const { layoutContextDispatch, layoutContextState } = this.props;
+ const { autoArrangeLayout } = layoutContextState;
+
+ if (autoarrangeChanged && !autoArrangeLayout && !placementChanged) return;
+
+ const layoutSizes = this.calculatesLayout(panelChanged);
+
+ layoutContextDispatch(
+ {
+ type: 'setWindowSize',
+ value: {
+ width: windowWidth(),
+ height: windowHeight(),
+ },
+ },
+ );
+ layoutContextDispatch(
+ {
+ type: 'setMediaBounds',
+ value: {
+ width: layoutSizes.mediaBounds.width,
+ height: layoutSizes.mediaBounds.height,
+ top: layoutSizes.mediaBounds.top,
+ left: layoutSizes.mediaBounds.left,
+ },
+ },
+ );
+ layoutContextDispatch(
+ {
+ type: 'setUserListSize',
+ value: {
+ width: layoutSizes.userListSize.width,
+ },
+ },
+ );
+ layoutContextDispatch(
+ {
+ type: 'setChatSize',
+ value: {
+ width: layoutSizes.chatSize.width,
+ },
+ },
+ );
+ layoutContextDispatch(
+ {
+ type: 'setBreakoutRoomSize',
+ value: {
+ width: layoutSizes.breakoutRoomSize.width,
+ },
+ },
+ );
+ layoutContextDispatch(
+ {
+ type: 'setWebcamsAreaSize',
+ value: {
+ width: layoutSizes.webcamsAreaSize.width,
+ height: layoutSizes.webcamsAreaSize.height,
+ },
+ },
+ );
+ layoutContextDispatch(
+ {
+ type: 'setPresentationAreaSize',
+ value: {
+ width: layoutSizes.presentationAreaSize.width,
+ height: layoutSizes.presentationAreaSize.height,
+ },
+ },
+ );
+
+ const newLayoutData = {
+ windowSize: {
+ width: windowWidth(),
+ height: windowHeight(),
+ },
+ mediaBounds: {
+ width: layoutSizes.mediaBounds.width,
+ height: layoutSizes.mediaBounds.height,
+ top: layoutSizes.mediaBounds.top,
+ left: layoutSizes.mediaBounds.left,
+ },
+ userListSize: {
+ width: layoutSizes.userListSize.width,
+ },
+ chatSize: {
+ width: layoutSizes.chatSize.width,
+ },
+ breakoutRoomSize: {
+ width: layoutSizes.breakoutRoomSize.width,
+ },
+ webcamsAreaSize: {
+ width: layoutSizes.webcamsAreaSize.width,
+ height: layoutSizes.webcamsAreaSize.height,
+ },
+ presentationAreaSize: {
+ width: layoutSizes.presentationAreaSize.width,
+ height: layoutSizes.presentationAreaSize.height,
+ },
+ };
+
+ Storage.setItem('layoutData', newLayoutData);
+ window.dispatchEvent(new Event('layoutSizesSets'));
+ }
+
+ defineWebcamPlacement(mediaAreaWidth, mediaAreaHeight, presentationWidth, presentationHeight) {
+ const { layoutContextDispatch, layoutContextState } = this.props;
+ const { autoArrangeLayout } = layoutContextState;
+ const isScreenShare = isVideoBroadcasting();
+
+ if (!autoArrangeLayout) return;
+
+ if (isScreenShare) {
+ layoutContextDispatch(
+ {
+ type: 'setWebcamsPlacement',
+ value: 'top',
+ },
+ );
+ Storage.setItem('webcamsPlacement', 'top');
+ return;
+ }
+
+ if ((mediaAreaWidth - presentationWidth) > (mediaAreaHeight - presentationHeight)) {
+ layoutContextDispatch(
+ {
+ type: 'setWebcamsPlacement',
+ value: 'left',
+ },
+ );
+ Storage.setItem('webcamsPlacement', 'left');
+ } else {
+ layoutContextDispatch(
+ {
+ type: 'setWebcamsPlacement',
+ value: 'top',
+ },
+ );
+ Storage.setItem('webcamsPlacement', 'top');
+ }
+ }
+
+ calculatesPanelsSize(panelChanged) {
+ const { layoutContextState } = this.props;
+ const {
+ userListSize: userListSizeContext,
+ chatSize: chatSizeContext,
+ breakoutRoomSize: breakoutRoomSizeContext,
+ } = layoutContextState;
+ const openPanel = Session.get('openPanel');
+ const storageLData = storageLayoutData();
+
+ let storageUserListWidth;
+ let storageChatWidth;
+ let storageBreakoutRoomWidth;
+ if (storageLData) {
+ storageUserListWidth = storageLData.userListSize.width;
+ storageChatWidth = storageLData.chatSize.width;
+ storageBreakoutRoomWidth = storageLData.breakoutRoomSize.width;
+ }
+
+ let newUserListSize;
+ let newChatSize;
+ let newBreakoutRoomSize;
+
+ if (panelChanged && userListSizeContext.width !== 0) {
+ newUserListSize = userListSizeContext;
+ } else if (!storageUserListWidth) {
+ newUserListSize = {
+ width: min(max((windowWidth() * 0.1), USERLIST_MIN_WIDTH), USERLIST_MAX_WIDTH),
+ };
+ } else {
+ newUserListSize = {
+ width: storageUserListWidth,
+ };
+ }
+
+ if (panelChanged && chatSizeContext.width !== 0) {
+ newChatSize = chatSizeContext;
+ } else if (!storageChatWidth) {
+ newChatSize = {
+ width: min(max((windowWidth() * 0.2), CHAT_MIN_WIDTH), CHAT_MAX_WIDTH),
+ };
+ } else {
+ newChatSize = {
+ width: storageChatWidth,
+ };
+ }
+
+ if (panelChanged && breakoutRoomSizeContext.width !== 0) {
+ newBreakoutRoomSize = breakoutRoomSizeContext;
+ } else if (!storageBreakoutRoomWidth) {
+ newBreakoutRoomSize = {
+ width: min(max((windowWidth() * 0.2), CHAT_MIN_WIDTH), CHAT_MAX_WIDTH),
+ };
+ } else {
+ newBreakoutRoomSize = {
+ width: storageBreakoutRoomWidth,
+ };
+ }
+
+ if (openPanel === 'userlist') {
+ newChatSize = {
+ width: 0,
+ };
+ newBreakoutRoomSize = {
+ width: 0,
+ };
+ }
+
+ if (openPanel === '') {
+ newUserListSize = {
+ width: 0,
+ };
+ newChatSize = {
+ width: 0,
+ };
+ newBreakoutRoomSize = {
+ width: 0,
+ };
+ }
+
+ return {
+ newUserListSize,
+ newChatSize,
+ newBreakoutRoomSize,
+ };
+ }
+
+ calculatesWebcamsAreaSize(
+ mediaAreaWidth, mediaAreaHeight, presentationWidth, presentationHeight,
+ ) {
+ const {
+ layoutContextState,
+ } = this.props;
+ const { webcamsPlacement, numUsersVideo } = layoutContextState;
+
+ const autoArrangeLayout = Storage.getItem('autoArrangeLayout');
+ const webcamsAreaUserSetsHeight = Storage.getItem('webcamsAreaUserSetsHeight');
+ const webcamsAreaUserSetsWidth = Storage.getItem('webcamsAreaUserSetsWidth');
+
+ let webcamsAreaWidth;
+ let webcamsAreaHeight;
+
+ if (numUsersVideo < 1) {
+ return {
+ webcamsAreaWidth: 0,
+ webcamsAreaHeight: 0,
+ };
+ }
+
+ if (autoArrangeLayout) {
+ if (webcamsPlacement === 'left' || webcamsPlacement === 'right') {
+ webcamsAreaWidth = (mediaAreaWidth - presentationWidth)
+ < (mediaAreaWidth * WEBCAMSAREA_MIN_PERCENT)
+ ? mediaAreaWidth * WEBCAMSAREA_MIN_PERCENT
+ : mediaAreaWidth - presentationWidth;
+ webcamsAreaHeight = mediaAreaHeight;
+ } else {
+ webcamsAreaWidth = mediaAreaWidth;
+ webcamsAreaHeight = (mediaAreaHeight - presentationHeight)
+ < (mediaAreaHeight * WEBCAMSAREA_MIN_PERCENT)
+ ? mediaAreaHeight * WEBCAMSAREA_MIN_PERCENT
+ : mediaAreaHeight - presentationHeight;
+ }
+ } else if (webcamsPlacement === 'left' || webcamsPlacement === 'right') {
+ webcamsAreaWidth = min(
+ max(
+ webcamsAreaUserSetsWidth
+ || mediaAreaWidth * WEBCAMSAREA_MIN_PERCENT,
+ mediaAreaWidth * WEBCAMSAREA_MIN_PERCENT,
+ ),
+ mediaAreaWidth * WEBCAMSAREA_MAX_PERCENT,
+ );
+ webcamsAreaHeight = mediaAreaHeight;
+ } else {
+ webcamsAreaWidth = mediaAreaWidth;
+ webcamsAreaHeight = min(
+ max(
+ webcamsAreaUserSetsHeight
+ || mediaAreaHeight * WEBCAMSAREA_MIN_PERCENT,
+ mediaAreaHeight * WEBCAMSAREA_MIN_PERCENT,
+ ),
+ mediaAreaHeight * WEBCAMSAREA_MAX_PERCENT,
+ );
+ }
+
+ if ((webcamsPlacement === 'left' || webcamsPlacement === 'right') && (mediaAreaWidth - webcamsAreaWidth) < PRESENTATIONAREA_MIN_WIDTH) {
+ webcamsAreaWidth = mediaAreaWidth - PRESENTATIONAREA_MIN_WIDTH;
+ }
+
+ return {
+ webcamsAreaWidth,
+ webcamsAreaHeight,
+ };
+ }
+
+ calculatesPresentationAreaSize(
+ mediaAreaWidth, mediaAreaHeight, webcamAreaWidth, webcamAreaHeight,
+ ) {
+ const {
+ layoutContextState,
+ } = this.props;
+ const {
+ webcamsPlacement,
+ numUsersVideo,
+ } = layoutContextState;
+
+ if (numUsersVideo < 1) {
+ return {
+ presentationAreaWidth: mediaAreaWidth,
+ presentationAreaHeight: mediaAreaHeight - 20,
+ };
+ }
+
+ let presentationAreaWidth;
+ let presentationAreaHeight;
+
+ if (webcamsPlacement === 'left' || webcamsPlacement === 'right') {
+ presentationAreaWidth = mediaAreaWidth - webcamAreaWidth - 20;
+ presentationAreaHeight = mediaAreaHeight - 20;
+ } else {
+ presentationAreaWidth = mediaAreaWidth;
+ presentationAreaHeight = mediaAreaHeight - webcamAreaHeight - 30;
+ }
+
+ return {
+ presentationAreaWidth,
+ presentationAreaHeight,
+ };
+ }
+
+ calculatesLayout(panelChanged = false) {
+ const {
+ layoutContextState,
+ } = this.props;
+ const {
+ presentationIsFullscreen,
+ presentationSlideSize,
+ } = layoutContextState;
+
+ const {
+ width: presentationSlideWidth,
+ height: presentationSlideHeight,
+ } = presentationSlideSize;
+
+ const panelsSize = this.calculatesPanelsSize(panelChanged);
+
+ const {
+ newUserListSize,
+ newChatSize,
+ newBreakoutRoomSize,
+ } = panelsSize;
+
+ const firstPanel = newUserListSize;
+ let secondPanel = {
+ width: 0,
+ };
+ if (newChatSize.width > 0) {
+ secondPanel = newChatSize;
+ } else if (newBreakoutRoomSize.width > 0) {
+ secondPanel = newBreakoutRoomSize;
+ }
+
+ const mediaAreaHeight = windowHeight() - (NAVBAR_HEIGHT + ACTIONSBAR_HEIGHT) - 10;
+ const mediaAreaWidth = windowWidth() - (firstPanel.width + secondPanel.width);
+ const newMediaBounds = {
+ width: mediaAreaWidth,
+ height: mediaAreaHeight,
+ top: NAVBAR_HEIGHT,
+ left: firstPanel.width + secondPanel.width,
+ };
+
+ const { presentationWidth, presentationHeight } = LayoutManager.calculatesPresentationSize(
+ mediaAreaWidth, mediaAreaHeight, presentationSlideWidth, presentationSlideHeight,
+ );
+
+ this.defineWebcamPlacement(
+ mediaAreaWidth, mediaAreaHeight, presentationWidth, presentationHeight,
+ );
+
+ const { webcamsAreaWidth, webcamsAreaHeight } = this.calculatesWebcamsAreaSize(
+ mediaAreaWidth, mediaAreaHeight, presentationWidth, presentationHeight,
+ );
+
+ const newWebcamsAreaSize = {
+ width: webcamsAreaWidth,
+ height: webcamsAreaHeight,
+ };
+ let newPresentationAreaSize;
+ let newScreenShareAreaSize;
+ const { presentationAreaWidth, presentationAreaHeight } = this.calculatesPresentationAreaSize(
+ mediaAreaWidth, mediaAreaHeight, webcamsAreaWidth, webcamsAreaHeight,
+ );
+ if (!presentationIsFullscreen) {
+ newPresentationAreaSize = {
+ width: presentationAreaWidth || 0,
+ height: presentationAreaHeight || 0,
+ };
+ } else {
+ newPresentationAreaSize = {
+ width: windowWidth(),
+ height: windowHeight(),
+ };
+ }
+
+ return {
+ mediaBounds: newMediaBounds,
+ userListSize: newUserListSize,
+ chatSize: newChatSize,
+ breakoutRoomSize: newBreakoutRoomSize,
+ webcamsAreaSize: newWebcamsAreaSize,
+ presentationAreaSize: newPresentationAreaSize,
+ screenShareAreaSize: newScreenShareAreaSize,
+ };
+ }
+
+ render() {
+ return <Fragment />;
+ }
+}
+
+export default withLayoutConsumer(LayoutManager);
+export {
+ USERLIST_MIN_WIDTH,
+ USERLIST_MAX_WIDTH,
+ CHAT_MIN_WIDTH,
+ CHAT_MAX_WIDTH,
+ NAVBAR_HEIGHT,
+ ACTIONSBAR_HEIGHT,
+ WEBCAMSAREA_MIN_PERCENT,
+ WEBCAMSAREA_MAX_PERCENT,
+ PRESENTATIONAREA_MIN_WIDTH,
+};
diff --git a/bigbluebutton-html5/imports/ui/components/media/component.jsx b/bigbluebutton-html5/imports/ui/components/media/component.jsx
index 36c17f52feb71b662ac0f8d1cdd798e8a00d1694..9f7c18c054cb076a97eb2bd1b29468b05e865182 100644
--- a/bigbluebutton-html5/imports/ui/components/media/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/media/component.jsx
@@ -16,7 +16,7 @@ const propTypes = {
swapLayout: PropTypes.bool,
disableVideo: PropTypes.bool,
audioModalIsOpen: PropTypes.bool,
- webcamDraggableState: PropTypes.instanceOf(Object).isRequired,
+ layoutContextState: PropTypes.instanceOf(Object).isRequired,
};
const defaultProps = {
@@ -43,12 +43,12 @@ export default class Media extends Component {
children,
audioModalIsOpen,
usersVideo,
- webcamDraggableState,
+ layoutContextState,
} = this.props;
- const { placement } = webcamDraggableState;
- const placementStorage = Storage.getItem('webcamPlacement');
- const webcamPlacement = placement || placementStorage;
+ const { webcamsPlacement: placement } = layoutContextState;
+ const placementStorage = Storage.getItem('webcamsPlacement');
+ const webcamsPlacement = placement || placementStorage;
const contentClassName = cx({
[styles.content]: true,
@@ -57,13 +57,13 @@ export default class Media extends Component {
const overlayClassName = cx({
[styles.overlay]: true,
[styles.hideOverlay]: hideOverlay,
- [styles.floatingOverlay]: (webcamPlacement === 'floating'),
+ [styles.floatingOverlay]: (webcamsPlacement === 'floating'),
});
const containerClassName = cx({
[styles.container]: true,
- [styles.containerV]: webcamPlacement === 'top' || webcamPlacement === 'bottom' || webcamPlacement === 'floating',
- [styles.containerH]: webcamPlacement === 'left' || webcamPlacement === 'right',
+ [styles.containerV]: webcamsPlacement === 'top' || webcamsPlacement === 'bottom' || webcamsPlacement === 'floating',
+ [styles.containerH]: webcamsPlacement === 'left' || webcamsPlacement === 'right',
});
return (
@@ -77,24 +77,24 @@ export default class Media extends Component {
style={{
maxHeight: usersVideo.length > 0
&& (
- webcamPlacement !== 'left'
- || webcamPlacement !== 'right'
+ webcamsPlacement !== 'left'
+ || webcamsPlacement !== 'right'
)
&& (
- webcamPlacement === 'top'
- || webcamPlacement === 'bottom'
+ webcamsPlacement === 'top'
+ || webcamsPlacement === 'bottom'
)
? '80%'
: '100%',
minHeight: BROWSER_ISMOBILE && window.innerWidth > window.innerHeight ? '50%' : '20%',
maxWidth: usersVideo.length > 0
&& (
- webcamPlacement !== 'top'
- || webcamPlacement !== 'bottom'
+ webcamsPlacement !== 'top'
+ || webcamsPlacement !== 'bottom'
)
&& (
- webcamPlacement === 'left'
- || webcamPlacement === 'right'
+ webcamsPlacement === 'left'
+ || webcamsPlacement === 'right'
)
? '80%'
: '100%',
diff --git a/bigbluebutton-html5/imports/ui/components/media/container.jsx b/bigbluebutton-html5/imports/ui/components/media/container.jsx
index 9ee199e75ff9988f01d4af63ae78a1e113210cf8..126be95b43198dad2b25eed24384fbc9c318fdf6 100755
--- a/bigbluebutton-html5/imports/ui/components/media/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/media/container.jsx
@@ -9,13 +9,13 @@ import VideoService from '/imports/ui/components/video-provider/service';
import getFromUserSettings from '/imports/ui/services/users-settings';
import { withModalMounter } from '/imports/ui/components/modal/service';
import Media from './component';
-import MediaService, { getSwapLayout, shouldEnableSwapLayout } from './service';
+import MediaService, { getSwapLayout, shouldEnableSwapLayout } from '/imports/ui/components/media/service';
import PresentationPodsContainer from '../presentation-pod/container';
import ScreenshareContainer from '../screenshare/container';
import DefaultContent from '../presentation/default-content/component';
import ExternalVideoContainer from '../external-video-player/container';
import Storage from '../../services/storage/session';
-import { withDraggableConsumer } from './webcam-draggable-overlay/context';
+import { withLayoutConsumer } from '/imports/ui/components/layout/context';
const LAYOUT_CONFIG = Meteor.settings.public.layout;
const KURENTO_CONFIG = Meteor.settings.public.kurento;
@@ -103,13 +103,14 @@ class MediaContainer extends Component {
}
}
-export default withDraggableConsumer(withModalMounter(withTracker(() => {
+export default withLayoutConsumer(withModalMounter(withTracker(() => {
const { dataSaving } = Settings;
const { viewParticipantsWebcams, viewScreenshare } = dataSaving;
const hidePresentation = getFromUserSettings('bbb_hide_presentation', LAYOUT_CONFIG.hidePresentation);
+ const autoSwapLayout = getFromUserSettings('userdata-bbb_auto_swap_layout', LAYOUT_CONFIG.autoSwapLayout);
const { current_presentation: hasPresentation } = MediaService.getPresentationInfo();
const data = {
- children: <DefaultContent />,
+ children: <DefaultContent {...{ autoSwapLayout, hidePresentation }} />,
audioModalIsOpen: Session.get('audioModalIsOpen'),
};
@@ -149,7 +150,7 @@ export default withDraggableConsumer(withModalMounter(withTracker(() => {
);
}
- data.webcamPlacement = Storage.getItem('webcamPlacement');
+ data.webcamsPlacement = Storage.getItem('webcamsPlacement');
MediaContainer.propTypes = propTypes;
return data;
diff --git a/bigbluebutton-html5/imports/ui/components/media/service.js b/bigbluebutton-html5/imports/ui/components/media/service.js
index 9811280c05f5fa8669a9789b462962daa23a7818..4a0670f0443b7daa0ad09d926ca4887fcf0714ed 100755
--- a/bigbluebutton-html5/imports/ui/components/media/service.js
+++ b/bigbluebutton-html5/imports/ui/components/media/service.js
@@ -4,7 +4,6 @@ import { getVideoUrl } from '/imports/ui/components/external-video-player/servic
import Auth from '/imports/ui/services/auth';
import Users from '/imports/api/users';
import Settings from '/imports/ui/services/settings';
-import PollingService from '/imports/ui/components/polling/service';
import getFromUserSettings from '/imports/ui/services/users-settings';
const LAYOUT_CONFIG = Meteor.settings.public.layout;
@@ -53,6 +52,7 @@ const setSwapLayout = () => {
};
const toggleSwapLayout = () => {
+ window.dispatchEvent(new Event('togglePresentationHide'));
swapLayout.value = !swapLayout.value;
swapLayout.tracker.changed();
};
diff --git a/bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/component.jsx b/bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/component.jsx
index 40f82c4ee666aae39e75a241924f05665530a9e4..a47575fcd678a49504151ef6deb05c5d0257c27b 100644
--- a/bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/component.jsx
@@ -1,7 +1,6 @@
import React, { PureComponent, Fragment } from 'react';
import Draggable from 'react-draggable';
import cx from 'classnames';
-import _ from 'lodash';
import PropTypes from 'prop-types';
import Resizable from 're-resizable';
import { isMobile, isIPad13 } from 'react-device-detect';
@@ -9,6 +8,8 @@ import { withDraggableConsumer } from './context';
import VideoProviderContainer from '/imports/ui/components/video-provider/container';
import { styles } from '../styles.scss';
import Storage from '../../../services/storage/session';
+import { withLayoutConsumer } from '/imports/ui/components/layout/context';
+import { WEBCAMSAREA_MIN_PERCENT, PRESENTATIONAREA_MIN_WIDTH } from '/imports/ui/components/layout/layout-manager';
const BROWSER_ISMOBILE = isMobile || isIPad13;
@@ -20,7 +21,8 @@ const propTypes = {
webcamDraggableState: PropTypes.objectOf(Object).isRequired,
webcamDraggableDispatch: PropTypes.func.isRequired,
refMediaContainer: PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
- usersVideoLenght: PropTypes.number.isRequired,
+ layoutContextState: PropTypes.objectOf(Object).isRequired,
+ layoutContextDispatch: PropTypes.func.isRequired,
};
const defaultProps = {
@@ -30,78 +32,38 @@ const defaultProps = {
audioModalIsOpen: false,
refMediaContainer: null,
};
-const dispatchResizeEvent = () => window.dispatchEvent(new Event('resize'));
class WebcamDraggable extends PureComponent {
constructor(props) {
super(props);
+ const { layoutContextState } = props;
+ const { webcamsPlacement, mediaBounds } = layoutContextState;
+ this.state = {
+ webcamsAreaResizable: {
+ width: webcamsPlacement === 'top' || webcamsPlacement === 'bottom' ? mediaBounds.width : mediaBounds.width * WEBCAMSAREA_MIN_PERCENT,
+ height: webcamsPlacement === 'left' || webcamsPlacement === 'right' ? mediaBounds.height : mediaBounds.height * WEBCAMSAREA_MIN_PERCENT,
+ },
+ resizing: false,
+ hideWebcams: false,
+ };
+
this.handleWebcamDragStart = this.handleWebcamDragStart.bind(this);
this.handleWebcamDragStop = this.handleWebcamDragStop.bind(this);
this.onFullscreenChange = this.onFullscreenChange.bind(this);
- this.debouncedOnResize = _.debounce(this.onWindowResize.bind(this), 500);
this.onResizeStop = this.onResizeStop.bind(this);
this.onResizeStart = this.onResizeStart.bind(this);
- this.setPlacementPercent = this.setPlacementPercent.bind(this);
- this.recalculateAreaSize = this.recalculateAreaSize.bind(this);
-
- this.state = {
- resizing: false,
- placementPercent: 0,
- };
+ this.handleLayoutSizesSets = this.handleLayoutSizesSets.bind(this);
}
componentDidMount() {
- dispatchResizeEvent();
- window.addEventListener('resize', this.debouncedOnResize);
document.addEventListener('fullscreenchange', this.onFullscreenChange);
- window.addEventListener('orientationchange', () => setTimeout(this.recalculateAreaSize, 500));
- }
-
- componentDidUpdate(prevProps) {
- const {
- swapLayout,
- webcamDraggableState,
- webcamDraggableDispatch,
- usersVideoLenght,
- } = this.props;
- const {
- placement: statePlacement,
- orientation,
- lastPlacementLandscape,
- lastPlacementPortrait,
- } = webcamDraggableState;
- const { webcamDraggableState: prevWebcamDraggableState } = prevProps;
- const { placement: prevPlacement, orientation: prevOrientation } = prevWebcamDraggableState;
- if (prevProps.swapLayout !== swapLayout) {
- setTimeout(() => this.forceUpdate(), 500);
- }
- if (prevPlacement !== statePlacement) {
- setTimeout(() => this.forceUpdate(), 200);
- setTimeout(() => window.dispatchEvent(new Event('resize')), 500);
- }
-
- if (prevProps.usersVideoLenght !== usersVideoLenght) {
- dispatchResizeEvent();
- }
-
- if (prevOrientation !== orientation) {
- const storagePlacement = Storage.getItem('webcamPlacement');
- if ((prevOrientation == null || prevOrientation === 'portrait') && orientation === 'landscape') {
- if (storagePlacement !== lastPlacementLandscape && lastPlacementLandscape === 'top') webcamDraggableDispatch({ type: 'setplacementToTop' });
- if (storagePlacement !== lastPlacementLandscape && lastPlacementLandscape === 'bottom') webcamDraggableDispatch({ type: 'setplacementToBottom' });
- }
- if ((prevOrientation == null || prevOrientation === 'landscape') && orientation === 'portrait') {
- if (storagePlacement !== lastPlacementPortrait && lastPlacementPortrait === 'left') webcamDraggableDispatch({ type: 'setplacementToLeft' });
- if (storagePlacement !== lastPlacementPortrait && lastPlacementPortrait === 'right') webcamDraggableDispatch({ type: 'setplacementToRight' });
- }
- }
+ window.addEventListener('layoutSizesSets', this.handleLayoutSizesSets);
}
componentWillUnmount() {
- window.removeEventListener('resize', this.debouncedOnResize);
document.removeEventListener('fullscreenchange', this.onFullscreenChange);
- dispatchResizeEvent();
+ window.removeEventListener('layoutSizesSets', this.handleLayoutSizesSets);
}
onFullscreenChange() {
@@ -109,97 +71,115 @@ class WebcamDraggable extends PureComponent {
}
onResizeStart() {
+ const { layoutContextDispatch } = this.props;
+
this.setState({ resizing: true });
+ layoutContextDispatch(
+ {
+ type: 'setWebcamsAreaResizing',
+ value: true,
+ },
+ );
}
- onWindowResize() {
- const { webcamDraggableState, webcamDraggableDispatch } = this.props;
- const { mediaSize } = webcamDraggableState;
- const { width: stateWidth, height: stateHeight } = mediaSize;
- const { width, height } = this.getMediaBounds();
+ onResizeHandle(resizableWidth, resizableHeight) {
+ const { webcamsAreaResizable } = this.state;
+ const { layoutContextState, layoutContextDispatch } = this.props;
+ const { webcamsPlacement, webcamsAreaSize } = layoutContextState;
+
+ layoutContextDispatch(
+ {
+ type: 'setAutoArrangeLayout',
+ value: false,
+ },
+ );
+
+ const newWebcamsAreaResizable = {
+ width: Math.trunc(webcamsAreaResizable.width) + resizableWidth,
+ height: Math.trunc(webcamsAreaResizable.height) + resizableHeight,
+ };
+
+ const newWidth = webcamsPlacement === 'top' || webcamsPlacement === 'bottom' ? webcamsAreaSize.width : newWebcamsAreaResizable.width;
+ const newHeight = webcamsPlacement === 'left' || webcamsPlacement === 'right' ? webcamsAreaSize.height : newWebcamsAreaResizable.height;
- if (stateWidth !== width || stateHeight !== height) {
- webcamDraggableDispatch(
+ layoutContextDispatch(
+ {
+ type: 'setTempWebcamsAreaSize',
+ value: {
+ width: newWidth,
+ height: newHeight,
+ },
+ },
+ );
+
+ window.dispatchEvent(new Event('webcamAreaResize'));
+ }
+
+ onResizeStop(resizableWidth, resizableHeight) {
+ const { webcamsAreaResizable } = this.state;
+ const { layoutContextState, layoutContextDispatch } = this.props;
+ const { webcamsPlacement, webcamsAreaSize } = layoutContextState;
+
+ layoutContextDispatch(
+ {
+ type: 'setWebcamsAreaResizing',
+ value: false,
+ },
+ );
+
+ const newWebcamsAreaResizable = {
+ width: Math.trunc(webcamsAreaResizable.width) + resizableWidth,
+ height: Math.trunc(webcamsAreaResizable.height) + resizableHeight,
+ };
+
+ if (webcamsPlacement === 'top' || webcamsPlacement === 'bottom') {
+ layoutContextDispatch(
{
- type: 'setMediaSize',
- value: {
- width,
- height,
- },
+ type: 'setWebcamsAreaUserSetsHeight',
+ value: newWebcamsAreaResizable.height,
},
);
- setTimeout(() => window.dispatchEvent(new Event('resize')), 300);
}
- }
-
- onResize() {
- this.setPlacementPercent();
- }
- onResizeStop() {
- const { webcamDraggableState, webcamDraggableDispatch } = this.props;
- const { optimalGrid } = webcamDraggableState;
- if (optimalGrid) {
- webcamDraggableDispatch(
+ if (webcamsPlacement === 'right' || webcamsPlacement === 'left') {
+ layoutContextDispatch(
{
- type: 'setVideoListSize',
- value: {
- width: optimalGrid.width,
- height: optimalGrid.height,
- },
+ type: 'setWebcamsAreaUserSetsWidth',
+ value: newWebcamsAreaResizable.width,
},
);
}
- this.setPlacementPercent();
- window.dispatchEvent(new Event('resize'));
+
+ const newWidth = webcamsPlacement === 'top' || webcamsPlacement === 'bottom'
+ ? webcamsAreaSize.width
+ : newWebcamsAreaResizable.width;
+ const newHeight = webcamsPlacement === 'left' || webcamsPlacement === 'right'
+ ? webcamsAreaSize.height
+ : newWebcamsAreaResizable.height;
+
+ layoutContextDispatch(
+ {
+ type: 'setWebcamsAreaSize',
+ value: {
+ width: newWidth,
+ height: newHeight,
+ },
+ },
+ );
+
+ this.setWebcamsAreaResizable(newWidth, newHeight);
+
setTimeout(() => this.setState({ resizing: false }), 500);
+ window.dispatchEvent(new Event('webcamAreaResize'));
}
- setPlacementPercent() {
- const { webcamDraggableState } = this.props;
- const { optimalGrid, placement } = webcamDraggableState;
- if (placement === 'top' || placement === 'bottom') {
- const mediaSelection = document.querySelector('section[class^=media]');
- const mediaHeight = mediaSelection ? mediaSelection.offsetHeight : 0;
- this.setState({ placementPercent: (optimalGrid.height * 100) / mediaHeight });
- }
- if (placement === 'left' || placement === 'right') {
- const mediaSelection = document.querySelector('section[class^=media]');
- const mediaWidth = mediaSelection ? mediaSelection.offsetWidth : 0;
- this.setState({ placementPercent: (optimalGrid.width * 100) / mediaWidth });
- }
+ setWebcamsAreaResizable(width, height) {
+ this.setState({
+ webcamsAreaResizable: { width, height },
+ });
}
- getMediaBounds() {
- const { refMediaContainer, webcamDraggableState, webcamDraggableDispatch } = this.props;
- const { mediaSize: mediaState } = webcamDraggableState;
- const { current: mediaContainer } = refMediaContainer;
- if (mediaContainer) {
- const mediaContainerRect = mediaContainer.getBoundingClientRect();
- const {
- top, left, width: newWidth, height: newHeight,
- } = mediaContainerRect;
- if ((mediaState.width === 0 || mediaState.height === 0) && (newWidth > 0 && newHeight > 0)) {
- webcamDraggableDispatch(
- {
- type: 'setMediaSize',
- value: {
- newWidth,
- newHeight,
- },
- },
- );
- }
-
- return {
- top,
- left,
- width: newWidth,
- height: newHeight,
- };
- }
- return false;
- }
+ setHideWebcams(hideWebcams) { this.setState({ hideWebcams }); }
getWebcamsListBounds() {
const { webcamDraggableState } = this.props;
@@ -210,22 +190,20 @@ class WebcamDraggable extends PureComponent {
top, left, width, height,
} = videoListRefRect;
return {
- top, // 10 = margin
- left, // 10 = margin
- width, // 20 = margin
- height, // 20 = margin
+ top,
+ left,
+ width,
+ height,
};
}
return false;
}
- recalculateAreaSize() {
- this.onResizeStart();
- this.onResizeStop();
- }
-
calculatePosition() {
- const { top: mediaTop, left: mediaLeft } = this.getMediaBounds();
+ const { layoutContextState } = this.props;
+ const { mediaBounds } = layoutContextState;
+
+ const { top: mediaTop, left: mediaLeft } = mediaBounds;
const { top: webcamsListTop, left: webcamsListLeft } = this.getWebcamsListBounds();
const x = webcamsListLeft - mediaLeft;
const y = webcamsListTop - mediaTop;
@@ -235,6 +213,14 @@ class WebcamDraggable extends PureComponent {
};
}
+ handleLayoutSizesSets() {
+ const { layoutContextState } = this.props;
+ const { webcamsAreaSize } = layoutContextState;
+
+ this.setWebcamsAreaResizable(webcamsAreaSize.width, webcamsAreaSize.height);
+ this.setHideWebcams(false);
+ }
+
handleWebcamDragStart() {
const { webcamDraggableDispatch } = this.props;
const { x, y } = this.calculatePosition();
@@ -251,52 +237,69 @@ class WebcamDraggable extends PureComponent {
}
handleWebcamDragStop(e) {
- const { webcamDraggableDispatch } = this.props;
+ const { webcamDraggableDispatch, layoutContextDispatch } = this.props;
const targetClassname = JSON.stringify(e.target.className);
+ this.setHideWebcams(true);
+
+ layoutContextDispatch(
+ {
+ type: 'setAutoArrangeLayout',
+ value: false,
+ },
+ );
+
if (targetClassname) {
if (targetClassname.includes('Top')) {
- webcamDraggableDispatch({ type: 'setplacementToTop' });
- webcamDraggableDispatch({ type: 'setLastPlacementLandscapeToTop' });
+ layoutContextDispatch({
+ type: 'setWebcamsPlacement',
+ value: 'top',
+ });
} else if (targetClassname.includes('Right')) {
- webcamDraggableDispatch({ type: 'setplacementToRight' });
- webcamDraggableDispatch({ type: 'setLastPlacementPortraitToRight' });
+ layoutContextDispatch({
+ type: 'setWebcamsPlacement',
+ value: 'right',
+ });
} else if (targetClassname.includes('Bottom')) {
- webcamDraggableDispatch({ type: 'setplacementToBottom' });
- webcamDraggableDispatch({ type: 'setLastPlacementLandscapeToBottom' });
+ layoutContextDispatch({
+ type: 'setWebcamsPlacement',
+ value: 'bottom',
+ });
} else if (targetClassname.includes('Left')) {
- webcamDraggableDispatch({ type: 'setplacementToLeft' });
- webcamDraggableDispatch({ type: 'setLastPlacementPortraitToLeft' });
+ layoutContextDispatch({
+ type: 'setWebcamsPlacement',
+ value: 'left',
+ });
}
}
webcamDraggableDispatch({ type: 'dragEnd' });
- window.dispatchEvent(new Event('resize'));
- setTimeout(this.recalculateAreaSize, 500);
+ window.dispatchEvent(new Event('webcamPlacementChange'));
}
render() {
const {
+ layoutContextState,
webcamDraggableState,
swapLayout,
hideOverlay,
disableVideo,
audioModalIsOpen,
- refMediaContainer,
} = this.props;
+ const { resizing, webcamsAreaResizable, hideWebcams } = this.state;
+
const {
- resizing,
- placementPercent,
- } = this.state;
+ mediaBounds,
+ webcamsAreaSize,
+ } = layoutContextState;
const {
dragging,
isCameraFullscreen,
- videoListSize,
optimalGrid,
} = webcamDraggableState;
- const placement = Storage.getItem('webcamPlacement');
+ const webcamsPlacement = Storage.getItem('webcamsPlacement');
const lastPosition = Storage.getItem('webcamLastPosition') || { x: 0, y: 0 };
@@ -323,7 +326,7 @@ class WebcamDraggable extends PureComponent {
const {
width: mediaWidth,
height: mediaHeight,
- } = this.getMediaBounds();
+ } = mediaBounds;
const {
width: webcamsWidth,
@@ -346,57 +349,16 @@ class WebcamDraggable extends PureComponent {
[styles.fullHeight]: swapLayout,
});
- const { current: mediaContainer } = refMediaContainer;
- let layout = 'vertical';
- if (mediaContainer) {
- const classNameMediaContainer = mediaContainer.className;
- if (classNameMediaContainer.includes('containerH')) {
- layout = 'horizontal';
- } else {
- layout = 'vertical';
- }
- }
-
const overlayClassName = cx({
[styles.overlay]: true,
[styles.hideOverlay]: hideOverlay,
[styles.floatingOverlay]: dragging,
[styles.autoWidth]: dragging,
- [styles.fullWidth]: (
- (
- placement === 'top'
- || placement === 'bottom'
- )
- || swapLayout
- )
- && !dragging,
- [styles.fullHeight]: (
- (
- placement === 'left'
- && placement === 'right'
- )
- || swapLayout
- )
- && !dragging,
- [styles.overlayToTop]: placement === 'top' && !dragging,
- [styles.overlayToRight]: placement === 'right' && !dragging,
- [styles.overlayToBottom]: placement === 'bottom' && !dragging,
- [styles.overlayToLeft]: placement === 'left' && !dragging,
+ [styles.overlayToTop]: webcamsPlacement === 'top' && !dragging,
+ [styles.overlayToRight]: webcamsPlacement === 'right' && !dragging,
+ [styles.overlayToBottom]: webcamsPlacement === 'bottom' && !dragging,
+ [styles.overlayToLeft]: webcamsPlacement === 'left' && !dragging,
[styles.dragging]: dragging,
- [styles.hide]: (
- (
- placement === 'left'
- || placement === 'right'
- )
- && layout === 'vertical'
- )
- || (
- (
- placement === 'top'
- || placement === 'bottom'
- )
- && layout === 'horizontal'
- ),
});
const dropZoneTopClassName = cx({
@@ -443,33 +405,17 @@ class WebcamDraggable extends PureComponent {
[styles.dropZoneBgRight]: true,
});
- const mediaSelection = document.querySelector('section[class^=media]');
- const mHeight = mediaSelection ? mediaSelection.offsetHeight : 0;
- const mWidth = mediaSelection ? mediaSelection.offsetWidth : 0;
-
- let resizeWidth;
- let resizeHeight;
- if (resizing && (placement === 'top' || placement === 'bottom') && !dragging) {
- resizeWidth = '100%';
- resizeHeight = videoListSize.height;
- }
- if (!resizing && (placement === 'top' || placement === 'bottom') && !dragging) {
- resizeWidth = '100%';
- resizeHeight = mHeight * (placementPercent / 100);
- }
-
- if (resizing && (placement === 'left' || placement === 'right') && !dragging) {
- resizeWidth = videoListSize.width;
- resizeHeight = '100%';
- }
- if (!resizing && (placement === 'left' || placement === 'right') && !dragging) {
- resizeWidth = mWidth * (placementPercent / 100);
- resizeHeight = '100%';
- }
-
+ let sizeHeight;
+ let sizeWidth;
if (dragging) {
- resizeHeight = optimalGrid.height;
- resizeWidth = optimalGrid.width;
+ sizeWidth = optimalGrid.width;
+ sizeHeight = optimalGrid.height;
+ } else if (resizing) {
+ sizeWidth = webcamsAreaResizable.width;
+ sizeHeight = webcamsAreaResizable.height;
+ } else {
+ sizeWidth = webcamsAreaSize.width;
+ sizeHeight = webcamsAreaSize.height;
}
return (
@@ -499,26 +445,37 @@ class WebcamDraggable extends PureComponent {
onStart={this.handleWebcamDragStart}
onStop={this.handleWebcamDragStop}
onMouseDown={e => e.preventDefault()}
- disabled={swapLayout || isCameraFullscreen || BROWSER_ISMOBILE}
+ disabled={swapLayout || isCameraFullscreen || BROWSER_ISMOBILE || resizing}
position={position}
>
<Resizable
+ minWidth={mediaWidth * WEBCAMSAREA_MIN_PERCENT}
+ minHeight={mediaHeight * WEBCAMSAREA_MIN_PERCENT}
+ maxWidth={
+ webcamsPlacement === 'left' || webcamsPlacement === 'right'
+ ? mediaWidth - PRESENTATIONAREA_MIN_WIDTH
+ : undefined
+ }
size={
{
- height: resizeHeight,
- width: resizeWidth,
+ width: sizeWidth,
+ height: sizeHeight,
}
}
- lockAspectRatio
+ // lockAspectRatio
handleWrapperClass="resizeWrapper"
onResizeStart={this.onResizeStart}
- onResize={dispatchResizeEvent}
- onResizeStop={this.onResizeStop}
+ onResize={(e, direction, ref, d) => {
+ this.onResizeHandle(d.width, d.height);
+ }}
+ onResizeStop={(e, direction, ref, d) => {
+ this.onResizeStop(d.width, d.height);
+ }}
enable={{
- top: (placement === 'bottom') && !swapLayout,
- bottom: (placement === 'top') && !swapLayout,
- left: (placement === 'right') && !swapLayout,
- right: (placement === 'left') && !swapLayout,
+ top: (webcamsPlacement === 'bottom') && !swapLayout,
+ bottom: (webcamsPlacement === 'top') && !swapLayout,
+ left: (webcamsPlacement === 'right') && !swapLayout,
+ right: (webcamsPlacement === 'left') && !swapLayout,
topLeft: false,
topRight: false,
bottomLeft: false,
@@ -527,10 +484,12 @@ class WebcamDraggable extends PureComponent {
className={
!swapLayout
? overlayClassName
- : contentClassName}
+ : contentClassName
+ }
style={{
marginLeft: 0,
marginRight: 0,
+ display: hideWebcams ? 'none' : undefined,
}}
>
{
@@ -572,4 +531,4 @@ class WebcamDraggable extends PureComponent {
WebcamDraggable.propTypes = propTypes;
WebcamDraggable.defaultProps = defaultProps;
-export default withDraggableConsumer(WebcamDraggable);
+export default withDraggableConsumer(withLayoutConsumer(WebcamDraggable));
diff --git a/bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/context.jsx b/bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/context.jsx
index a0981de896110c2c1fc8fc6a6ac613bf2a7c6a73..f86b406f7701f5250ebf8f463fb482c1bbdda712 100644
--- a/bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/context.jsx
+++ b/bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/context.jsx
@@ -1,19 +1,9 @@
import React, { createContext, useReducer, useEffect } from 'react';
-import Storage from '../../../services/storage/session';
-
-const { webcamsDefaultPlacement } = Meteor.settings.public.layout;
+import Storage from '/imports/ui/services/storage/session';
export const WebcamDraggableContext = createContext();
const initialState = {
- placement: webcamsDefaultPlacement || 'top',
- lastPlacementLandscape: 'top',
- lastPlacementPortrait: 'left',
- orientation: null,
- mediaSize: {
- width: 0,
- height: 0,
- },
videoListSize: {
width: 0,
height: 0,
@@ -39,81 +29,6 @@ const initialState = {
const reducer = (state, action) => {
switch (action.type) {
- case 'setplacementToTop': {
- return {
- ...state,
- placement: 'top',
- };
- }
- case 'setplacementToRight': {
- return {
- ...state,
- placement: 'right',
- };
- }
- case 'setplacementToBottom': {
- return {
- ...state,
- placement: 'bottom',
- };
- }
- case 'setplacementToLeft': {
- return {
- ...state,
- placement: 'left',
- };
- }
- case 'setLastPlacementPortraitToLeft': {
- return {
- ...state,
- lastPlacementPortrait: 'left',
- };
- }
- case 'setLastPlacementPortraitToRight': {
- return {
- ...state,
- lastPlacementPortrait: 'right',
- };
- }
- case 'setLastPlacementLandscapeToTop': {
- return {
- ...state,
- lastPlacementLandscape: 'top',
- };
- }
- case 'setLastPlacementLandscapeToBottom': {
- return {
- ...state,
- lastPlacementLandscape: 'bottom',
- };
- }
- case 'setplacementToFloating': {
- return {
- ...state,
- placement: 'floating',
- };
- }
- case 'setOrientationToLandscape': {
- return {
- ...state,
- orientation: 'landscape',
- };
- }
- case 'setOrientationToPortrait': {
- return {
- ...state,
- orientation: 'portrait',
- };
- }
- case 'setMediaSize': {
- return {
- ...state,
- mediaSize: {
- width: action.value.width,
- height: action.value.height,
- },
- };
- }
case 'setVideoListSize': {
return {
...state,
@@ -147,15 +62,6 @@ const reducer = (state, action) => {
},
};
}
- case 'setLastPosition': {
- return {
- ...state,
- lastPosition: {
- x: action.value.x,
- y: action.value.y,
- },
- };
- }
case 'setVideoRef': {
return {
...state,
@@ -214,7 +120,6 @@ const ContextProvider = (props) => {
} = webcamDraggableState;
const { children } = props;
useEffect(() => {
- Storage.setItem('webcamPlacement', placement);
Storage.setItem('webcamLastPlacementLandscape', lastPlacementLandscape);
Storage.setItem('webcamlastPlacementPortrait', lastPlacementPortrait);
Storage.setItem('webcamLastPosition', lastPosition);
diff --git a/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx b/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
index 19682614b0cbf67467ebf4830d589354453a83e2..4f31a9557e9e891520eac50bca28621cc86c721a 100755
--- a/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { PureComponent } from 'react';
import PropTypes from 'prop-types';
import { defineMessages, injectIntl } from 'react-intl';
import { Meteor } from 'meteor/meteor';
@@ -10,6 +10,7 @@ import Rating from './rating/component';
import { styles } from './styles';
import logger from '/imports/startup/client/logger';
import Users from '/imports/api/users';
+import AudioManager from '/imports/ui/services/audio-manager';
const intlMessage = defineMessages({
410: {
@@ -87,9 +88,10 @@ const propTypes = {
formatMessage: PropTypes.func.isRequired,
}).isRequired,
code: PropTypes.string.isRequired,
+ reason: PropTypes.string.isRequired,
};
-class MeetingEnded extends React.PureComponent {
+class MeetingEnded extends PureComponent {
static getComment() {
const textarea = document.getElementById('feedbackComment');
const comment = textarea.value;
@@ -110,9 +112,8 @@ class MeetingEnded extends React.PureComponent {
this.setSelectedStar = this.setSelectedStar.bind(this);
this.sendFeedback = this.sendFeedback.bind(this);
this.shouldShowFeedback = getFromUserSettings('bbb_ask_for_feedback_on_logout', Meteor.settings.public.app.askForFeedbackOnLogout);
- }
- componentDidMount() {
+ AudioManager.exitAudio();
Meteor.disconnect();
}
@@ -168,22 +169,20 @@ class MeetingEnded extends React.PureComponent {
}
render() {
- const { intl, code } = this.props;
- const {
- selected,
- } = this.state;
+ const { code, intl, reason } = this.props;
+ const { selected } = this.state;
const noRating = selected <= 0;
- logger.info({ logCode: 'meeting_ended_code', extraInfo: { endedCode: code } }, 'Meeting ended component');
+ logger.info({ logCode: 'meeting_ended_code', extraInfo: { endedCode: code, reason } }, 'Meeting ended component');
return (
<div className={styles.parent}>
- <div className={styles.modal}>
+ <div className={styles.modal} data-test="meetingEndedModal">
<div className={styles.content}>
- <h1 className={styles.title} data-test="meetingEndedModalTitle">
+ <h1 className={styles.title}>
{
- intl.formatMessage(intlMessage[code] || intlMessage[430])
+ intl.formatMessage(intlMessage[reason] || intlMessage[430])
}
</h1>
<div className={styles.text}>
@@ -192,7 +191,7 @@ class MeetingEnded extends React.PureComponent {
: intl.formatMessage(intlMessage.messageEnded)}
</div>
{this.shouldShowFeedback ? (
- <div>
+ <div data-test="rating">
<Rating
total="5"
onRate={this.setSelectedStar}
diff --git a/bigbluebutton-html5/imports/ui/components/muted-alert/component.jsx b/bigbluebutton-html5/imports/ui/components/muted-alert/component.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..88d03e90e055a64df7a03c0e6ea15ee98b797aeb
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/muted-alert/component.jsx
@@ -0,0 +1,84 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
+import hark from 'hark';
+import Icon from '/imports/ui/components/icon/component';
+import cx from 'classnames';
+import { styles } from './styles';
+
+const MUTE_ALERT_CONFIG = Meteor.settings.public.app.mutedAlert;
+
+const propTypes = {
+ inputStream: PropTypes.object.isRequired,
+};
+
+class MutedAlert extends Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ visible: false,
+ };
+
+ this.speechEvents = null;
+ this.timer = null;
+
+ this.resetTimer = this.resetTimer.bind(this);
+ }
+
+ componentDidMount() {
+ this._isMounted = true;
+ const { inputStream } = this.props;
+ const { interval, threshold, duration } = MUTE_ALERT_CONFIG;
+ this.speechEvents = hark(inputStream, { interval, threshold });
+ this.speechEvents.on('speaking', () => {
+ this.resetTimer();
+ if (this._isMounted) this.setState({ visible: true });
+ });
+ this.speechEvents.on('stopped_speaking', () => {
+ if (this._isMounted) {
+ this.timer = setTimeout(() => this.setState(
+ { visible: false },
+ ), duration);
+ }
+ });
+ }
+
+ componentWillUnmount() {
+ this._isMounted = false;
+ if (this.speechEvents) this.speechEvents.stop();
+ this.resetTimer();
+ }
+
+ resetTimer() {
+ if (this.timer) clearTimeout(this.timer);
+ this.timer = null;
+ }
+
+ render() {
+ const { enabled } = MUTE_ALERT_CONFIG;
+ if (!enabled) return null;
+ const { isViewer, isPresenter } = this.props;
+ const { visible } = this.state;
+ const style = {};
+ style[styles.alignForMod] = !isViewer || isPresenter;
+
+ return visible ? (
+ <div className={cx(styles.muteWarning, style)}>
+ <span>
+ <FormattedMessage
+ id="app.muteWarning.label"
+ description="Warning when someone speaks while muted"
+ values={{
+ 0: <Icon iconName="mute" />,
+ }}
+ />
+ </span>
+ </div>
+ ) : null;
+ }
+}
+
+MutedAlert.propTypes = propTypes;
+
+export default MutedAlert;
diff --git a/bigbluebutton-html5/imports/ui/components/muted-alert/styles.scss b/bigbluebutton-html5/imports/ui/components/muted-alert/styles.scss
new file mode 100644
index 0000000000000000000000000000000000000000..f1076a2cb4204fea2603579e717a6f5d5a7c0f32
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/muted-alert/styles.scss
@@ -0,0 +1,28 @@
+@import "../../stylesheets/variables/_all";
+
+.muteWarning {
+ position: absolute;
+ color: var(--color-white);
+ background-color: var(--color-tip-bg);
+ text-align: center;
+ line-height: 1;
+ font-size: var(--font-size-xl);
+ padding: var(--md-padding-x);
+ border-radius: var(--border-radius);
+ top: -50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ z-index: 5;
+
+ > span {
+ white-space: nowrap;
+ }
+
+ @include mq($small-only) {
+ font-size: var(--font-size-md);;
+ }
+}
+
+.alignForMod {
+ left: 52.25%;
+}
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
index 0a23e1e2c2bd5aadb3661c68b5f9ae7ee66fabbd..5acf94dcb45050cb205054522f92e77d0cd8d66e 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Session } from 'meteor/session';
import cx from 'classnames';
@@ -8,12 +8,11 @@ import getFromUserSettings from '/imports/ui/services/users-settings';
import { defineMessages, injectIntl } from 'react-intl';
import Icon from '../icon/component';
import { styles } from './styles.scss';
-import Button from '../button/component';
+import Button from '/imports/ui/components/button/component';
import RecordingIndicator from './recording-indicator/container';
import TalkingIndicatorContainer from '/imports/ui/components/nav-bar/talking-indicator/container';
import SettingsDropdownContainer from './settings-dropdown/container';
-
const intlMessages = defineMessages({
toggleUserListLabel: {
id: 'app.navBar.userListToggleBtnLabel',
@@ -41,7 +40,7 @@ const defaultProps = {
shortcuts: '',
};
-class NavBar extends PureComponent {
+class NavBar extends Component {
static handleToggleUserList() {
Session.set(
'openPanel',
@@ -50,6 +49,8 @@ class NavBar extends PureComponent {
: 'userlist',
);
Session.set('idChatOpen', '');
+
+ window.dispatchEvent(new Event('panelChanged'));
}
componentDidMount() {
@@ -89,7 +90,9 @@ class NavBar extends PureComponent {
ariaLabel += hasUnreadMessages ? (` ${intl.formatMessage(intlMessages.newMessages)}`) : '';
return (
- <div className={styles.navbar}>
+ <div
+ className={styles.navbar}
+ >
<div className={styles.top}>
<div className={styles.left}>
{!isExpanded ? null
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
index 1da1181f9ef240d79e04d5f98e57444d1d79b6c2..7de199723138be1e1fb5cd1ca6f91c0c5b5d48b6 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
@@ -212,6 +212,7 @@ class SettingsDropdown extends PureComponent {
const logoutOption = (
<DropdownListItem
key="list-item-logout"
+ data-test="logout"
icon="logout"
label={intl.formatMessage(intlMessages.leaveSessionLabel)}
description={intl.formatMessage(intlMessages.leaveSessionDesc)}
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss b/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss
index b3e4205a4709f36587341f26c2b1991f16968a83..0040f6a63ae7eb6696ac4eb7b6a9798aa3685dae 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss
@@ -11,7 +11,6 @@
.navbar {
display: flex;
flex-direction: column;
- height:var(--mobile-nav-height);
}
.top,
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx
index 414301d75e550ffc841dfce21267206d19ed79c3..b51b350b9d3a565822ad36ae231928c2f15dffbd 100644
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx
@@ -2,6 +2,7 @@ import React from 'react';
import { withTracker } from 'meteor/react-meteor-data';
import VoiceUsers from '/imports/api/voice-users';
import Auth from '/imports/ui/services/auth';
+import { debounce } from 'lodash';
import TalkingIndicator from './component';
import { makeCall } from '/imports/ui/services/api';
import Service from './service';
@@ -57,7 +58,7 @@ export default withTracker(() => {
return {
talkers,
- muteUser,
+ muteUser: id => debounce(muteUser(id), 500, { leading: true, trailing: false }),
openPanel: Session.get('openPanel'),
};
})(TalkingIndicatorContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/note/component.jsx b/bigbluebutton-html5/imports/ui/components/note/component.jsx
index 15c498d499e37c085722623c81b8c23ffc930ed4..289f0d613025c71a5e4023ff7f7cb726a4723643 100644
--- a/bigbluebutton-html5/imports/ui/components/note/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/note/component.jsx
@@ -64,9 +64,10 @@ class Note extends Component {
onClick={() => {
Session.set('openPanel', 'userlist');
}}
+ data-test="hideNoteLabel"
aria-label={intl.formatMessage(intlMessages.hideNoteLabel)}
label={intl.formatMessage(intlMessages.title)}
- icon={isRTL ? "right_arrow" : "left_arrow"}
+ icon={isRTL ? 'right_arrow' : 'left_arrow'}
className={styles.hideBtn}
/>
</div>
diff --git a/bigbluebutton-html5/imports/ui/components/notifications-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/notifications-bar/container.jsx
index 9576f160a98ed766f4eed283771bde9226eeda36..a6f8c61f17bd246c3e2960479492428b29b66294 100644
--- a/bigbluebutton-html5/imports/ui/components/notifications-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/notifications-bar/container.jsx
@@ -8,6 +8,7 @@ import Meetings, { MeetingTimeRemaining } from '/imports/api/meetings';
import Users from '/imports/api/users';
import BreakoutRemainingTime from '/imports/ui/components/breakout-room/breakout-remaining-time/container';
import SlowConnection from '/imports/ui/components/slow-connection/component';
+import ConnectionStatusService from '/imports/ui/components/connection-status/service';
import { styles } from './styles.scss';
import breakoutService from '/imports/ui/components/breakout-room/service';
@@ -29,6 +30,9 @@ const ENABLE_NETWORK_MONITORING = Meteor.settings.public.networkMonitoring.enabl
const HELP_LINK = METEOR_SETTINGS_APP.helpLink;
+const REMAINING_TIME_THRESHOLD = METEOR_SETTINGS_APP.remainingTimeThreshold;
+const REMAINING_TIME_ALERT_THRESHOLD = METEOR_SETTINGS_APP.remainingTimeAlertThreshold;
+
const intlMessages = defineMessages({
failedMessage: {
id: 'app.failedMessage',
@@ -66,13 +70,13 @@ const intlMessages = defineMessages({
id: 'app.meeting.meetingTimeHasEnded',
description: 'Message that tells time has ended and meeting will close',
},
- alertMeetingEndsUnderOneMinute: {
- id: 'app.meeting.alertMeetingEndsUnderOneMinute',
- description: 'Alert that tells that the meeting end under a minute',
+ alertMeetingEndsUnderMinutes: {
+ id: 'app.meeting.alertMeetingEndsUnderMinutes',
+ description: 'Alert that tells that the meeting ends under x minutes',
},
- alertBreakoutEndsUnderOneMinute: {
- id: 'app.meeting.alertBreakoutEndsUnderOneMinute',
- description: 'Alert that tells that the breakout end under a minute',
+ alertBreakoutEndsUnderMinutes: {
+ id: 'app.meeting.alertBreakoutEndsUnderMinutes',
+ description: 'Alert that tells that the breakout ends under x minutes',
},
slowEffectiveConnectionDetected: {
id: 'app.network.connection.effective.slow',
@@ -146,6 +150,22 @@ export default injectIntl(withTracker(({ intl }) => {
}
}
+ if (ConnectionStatusService.isEnabled()) {
+ const stats = ConnectionStatusService.getAudioStats();
+ if (stats) {
+ if (ConnectionStatusService.getLevel().includes(stats)) {
+ data.message = (
+ <SlowConnection effectiveConnectionType={stats}>
+ {intl.formatMessage(intlMessages.slowEffectiveConnectionDetected)}{' '}
+ <a href={ConnectionStatusService.getHelp()} target="_blank" rel="noopener noreferrer">
+ {intl.formatMessage(intlMessages.slowEffectiveConnectionHelpLink)}
+ </a>
+ </SlowConnection>
+ );
+ }
+ }
+ }
+
if (!connected) {
data.color = 'primary';
switch (status) {
@@ -181,6 +201,8 @@ export default injectIntl(withTracker(({ intl }) => {
const meetingId = Auth.meetingID;
const breakouts = breakoutService.getBreakouts();
+ const msg = { id: `${intlMessages.alertBreakoutEndsUnderMinutes.id}${REMAINING_TIME_ALERT_THRESHOLD == 1 ? 'Singular' : 'Plural'}` };
+
if (breakouts.length > 0) {
const currentBreakout = breakouts.find(b => b.breakoutId === meetingId);
@@ -190,9 +212,10 @@ export default injectIntl(withTracker(({ intl }) => {
breakoutRoom={currentBreakout}
messageDuration={intlMessages.breakoutTimeRemaining}
timeEndedMessage={intlMessages.breakoutWillClose}
- alertMessageUnderOneMinute={
- intl.formatMessage(intlMessages.alertBreakoutEndsUnderOneMinute)
+ alertMessage={
+ intl.formatMessage(msg, {0: REMAINING_TIME_ALERT_THRESHOLD})
}
+ alertUnderMinutes={REMAINING_TIME_ALERT_THRESHOLD}
/>
);
}
@@ -205,7 +228,9 @@ export default injectIntl(withTracker(({ intl }) => {
if (meetingTimeRemaining && Meeting) {
const { timeRemaining } = meetingTimeRemaining;
const { isBreakout } = Meeting.meetingProp;
- const underThirtyMin = timeRemaining && timeRemaining <= (30 * 60);
+ const underThirtyMin = timeRemaining && timeRemaining <= (REMAINING_TIME_THRESHOLD * 60);
+
+ const msg = { id: `${intlMessages.alertMeetingEndsUnderMinutes.id}${REMAINING_TIME_ALERT_THRESHOLD == 1 ? 'Singular' : 'Plural'}` };
if (underThirtyMin && !isBreakout) {
data.message = (
@@ -213,9 +238,10 @@ export default injectIntl(withTracker(({ intl }) => {
breakoutRoom={meetingTimeRemaining}
messageDuration={intlMessages.meetingTimeRemaining}
timeEndedMessage={intlMessages.meetingWillClose}
- alertMessageUnderOneMinute={
- intl.formatMessage(intlMessages.alertMeetingEndsUnderOneMinute)
+ alertMessage={
+ intl.formatMessage(msg, {0: REMAINING_TIME_ALERT_THRESHOLD})
}
+ alertUnderMinutes={REMAINING_TIME_ALERT_THRESHOLD}
/>
);
}
diff --git a/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx b/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx
index 1c867fa59c7648afbbed209ac61ee123c22c53e6..a77d4b43ed0fa48fc4307f2966bd0f085390aad3 100755
--- a/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
import PropTypes from 'prop-types';
import BreakoutRoomContainer from '/imports/ui/components/breakout-room/container';
import UserListContainer from '/imports/ui/components/user-list/container';
@@ -11,6 +11,13 @@ import { defineMessages, injectIntl } from 'react-intl';
import Resizable from 're-resizable';
import { styles } from '/imports/ui/components/app/styles';
import _ from 'lodash';
+import { withLayoutConsumer } from '/imports/ui/components/layout/context';
+import {
+ USERLIST_MIN_WIDTH,
+ USERLIST_MAX_WIDTH,
+ CHAT_MIN_WIDTH,
+ CHAT_MAX_WIDTH,
+} from '/imports/ui/components/layout/layout-manager';
const intlMessages = defineMessages({
chatLabel: {
@@ -43,12 +50,8 @@ const propTypes = {
const DEFAULT_PANEL_WIDTH = 340;
// Variables for resizing user-list.
-const USERLIST_MIN_WIDTH_PX = 150;
-const USERLIST_MAX_WIDTH_PX = 240;
-
-// Variables for resizing chat.
-const CHAT_MIN_WIDTH = 150;
-const CHAT_MAX_WIDTH = 350;
+const USERLIST_MIN_WIDTH_PX = USERLIST_MIN_WIDTH;
+const USERLIST_MAX_WIDTH_PX = USERLIST_MAX_WIDTH;
// Variables for resizing poll.
const POLL_MIN_WIDTH = 320;
@@ -66,11 +69,9 @@ const CAPTIONS_MAX_WIDTH = 400;
const WAITING_MIN_WIDTH = DEFAULT_PANEL_WIDTH;
const WAITING_MAX_WIDTH = 800;
-const dispatchResizeEvent = () => window.dispatchEvent(new Event('resize'));
-
-class PanelManager extends PureComponent {
- constructor() {
- super();
+class PanelManager extends Component {
+ constructor(props) {
+ super(props);
this.padKey = _.uniqueId('resize-pad-');
this.userlistKey = _.uniqueId('userlist-');
@@ -81,25 +82,234 @@ class PanelManager extends PureComponent {
this.captionsKey = _.uniqueId('captions-');
this.waitingUsers = _.uniqueId('waitingUsers-');
+ const { layoutContextState } = props;
+ const { userListSize, chatSize } = layoutContextState;
+
this.state = {
- chatWidth: DEFAULT_PANEL_WIDTH,
- pollWidth: DEFAULT_PANEL_WIDTH,
- userlistWidth: 180,
+ userlistWidth: userListSize.width,
+ chatWidth: chatSize.width,
noteWidth: DEFAULT_PANEL_WIDTH,
captionsWidth: DEFAULT_PANEL_WIDTH,
+ pollWidth: DEFAULT_PANEL_WIDTH,
waitingWidth: DEFAULT_PANEL_WIDTH,
+ breakoutRoomWidth: 0,
};
+
+ this.setUserListWidth = this.setUserListWidth.bind(this);
}
- componentDidUpdate(prevProps) {
- const { openPanel } = this.props;
- const { openPanel: oldOpenPanel } = prevProps;
+ shouldComponentUpdate(prevProps) {
+ const { layoutContextState } = this.props;
+ const { layoutContextState: prevLayoutContextState } = prevProps;
+ const {
+ userListSize,
+ chatSize,
+ breakoutRoomSize,
+ } = layoutContextState;
+ const {
+ userListSize: prevUserListSize,
+ chatSize: prevChatSize,
+ breakoutRoomSize: prevBreakoutRoomSize,
+ } = prevLayoutContextState;
+
+ if ((layoutContextState !== prevLayoutContextState)
+ && (userListSize.width === prevUserListSize.width
+ && chatSize.width === prevChatSize.width
+ && breakoutRoomSize.width === prevBreakoutRoomSize.width)) return false;
+ return true;
+ }
- if (openPanel !== oldOpenPanel) {
- window.dispatchEvent(new Event('resize'));
+ componentDidUpdate(prevProps) {
+ const {
+ userlistWidth,
+ chatWidth,
+ noteWidth,
+ captionsWidth,
+ pollWidth,
+ waitingWidth,
+ breakoutRoomWidth,
+ } = this.state;
+ const { layoutContextState } = this.props;
+ const {
+ userListSize,
+ chatSize,
+ noteSize,
+ captionsSize,
+ pollSize,
+ waitingSize,
+ breakoutRoomSize,
+ } = layoutContextState;
+ const { layoutContextState: oldLayoutContextState } = prevProps;
+ const {
+ userListSize: oldUserListSize,
+ chatSize: oldChatSize,
+ noteSize: oldNoteSize,
+ captionsSize: oldCaptionsSize,
+ pollSize: oldPollSize,
+ waitingSize: oldWaitingSize,
+ breakoutRoomSize: oldBreakoutRoomSize,
+ } = oldLayoutContextState;
+
+ if (userListSize.width !== oldUserListSize.width && userListSize.width !== userlistWidth) {
+ this.setUserListWidth(userListSize.width);
+ }
+ if (chatSize.width !== oldChatSize.width && chatSize.width !== chatWidth) {
+ this.setChatWidth(chatSize.width);
+ }
+ if (noteSize.width !== oldNoteSize.width && noteSize.width !== noteWidth) {
+ this.setNoteWidth(noteSize.width);
+ }
+ if (captionsSize.width !== oldCaptionsSize.width && captionsSize.width !== captionsWidth) {
+ this.setCaptionsWidth(captionsSize.width);
+ }
+ if (pollSize.width !== oldPollSize.width && pollSize.width !== pollWidth) {
+ this.setPollWidth(pollSize.width);
+ }
+ if (waitingSize.width !== oldWaitingSize.width && waitingSize.width !== waitingWidth) {
+ this.setWaitingWidth(waitingSize.width);
+ }
+ if (breakoutRoomSize.width !== oldBreakoutRoomSize.width
+ && breakoutRoomSize.width !== breakoutRoomWidth) {
+ this.setBreakoutRoomWidth(breakoutRoomSize.width);
}
}
+ setUserListWidth(userlistWidth) {
+ this.setState({ userlistWidth });
+ }
+
+ setChatWidth(chatWidth) {
+ this.setState({ chatWidth });
+ }
+
+ setNoteWidth(noteWidth) {
+ this.setState({ noteWidth });
+ }
+
+ setCaptionsWidth(captionsWidth) {
+ this.setState({ captionsWidth });
+ }
+
+ setPollWidth(pollWidth) {
+ this.setState({ pollWidth });
+ }
+
+ setWaitingWidth(waitingWidth) {
+ this.setState({ waitingWidth });
+ }
+
+ setBreakoutRoomWidth(breakoutRoomWidth) {
+ this.setState({ breakoutRoomWidth });
+ }
+
+ userListResizeStop(addvalue) {
+ const { userlistWidth } = this.state;
+ const { layoutContextDispatch } = this.props;
+
+ this.setUserListWidth(userlistWidth + addvalue);
+
+ layoutContextDispatch(
+ {
+ type: 'setUserListSize',
+ value: {
+ width: userlistWidth + addvalue,
+ },
+ },
+ );
+
+ window.dispatchEvent(new Event('panelChanged'));
+ }
+
+ chatResizeStop(addvalue) {
+ const { chatWidth } = this.state;
+ const { layoutContextDispatch } = this.props;
+
+ this.setChatWidth(chatWidth + addvalue);
+
+ layoutContextDispatch(
+ {
+ type: 'setChatSize',
+ value: {
+ width: chatWidth + addvalue,
+ },
+ },
+ );
+
+ window.dispatchEvent(new Event('panelChanged'));
+ }
+
+ noteResizeStop(addvalue) {
+ const { noteWidth } = this.state;
+ const { layoutContextDispatch } = this.props;
+
+ this.setNoteWidth(noteWidth + addvalue);
+
+ layoutContextDispatch(
+ {
+ type: 'setNoteSize',
+ value: {
+ width: noteWidth + addvalue,
+ },
+ },
+ );
+
+ window.dispatchEvent(new Event('panelChanged'));
+ }
+
+ captionsResizeStop(addvalue) {
+ const { captionsWidth } = this.state;
+ const { layoutContextDispatch } = this.props;
+
+ this.setCaptionsWidth(captionsWidth + addvalue);
+
+ layoutContextDispatch(
+ {
+ type: 'setCaptionsSize',
+ value: {
+ width: captionsWidth + addvalue,
+ },
+ },
+ );
+
+ window.dispatchEvent(new Event('panelChanged'));
+ }
+
+ pollResizeStop(addvalue) {
+ const { pollWidth } = this.state;
+ const { layoutContextDispatch } = this.props;
+
+ this.setPollWidth(pollWidth + addvalue);
+
+ layoutContextDispatch(
+ {
+ type: 'setPollSize',
+ value: {
+ width: pollWidth + addvalue,
+ },
+ },
+ );
+
+ window.dispatchEvent(new Event('panelChanged'));
+ }
+
+ waitingResizeStop(addvalue) {
+ const { waitingWidth } = this.state;
+ const { layoutContextDispatch } = this.props;
+
+ this.setWaitingWidth(waitingWidth + addvalue);
+
+ layoutContextDispatch(
+ {
+ type: 'setWaitingUsersPanelSize',
+ value: {
+ width: waitingWidth + addvalue,
+ },
+ },
+ );
+
+ window.dispatchEvent(new Event('panelChanged'));
+ }
+
renderUserList() {
const {
intl,
@@ -145,11 +355,8 @@ class PanelManager extends PureComponent {
enable={resizableEnableOptions}
key={this.userlistKey}
size={{ width: userlistWidth }}
- onResize={dispatchResizeEvent}
onResizeStop={(e, direction, ref, d) => {
- this.setState({
- userlistWidth: userlistWidth + d.width,
- });
+ this.userListResizeStop(d.width);
}}
>
{this.renderUserList()}
@@ -194,11 +401,8 @@ class PanelManager extends PureComponent {
enable={resizableEnableOptions}
key={this.chatKey}
size={{ width: chatWidth }}
- onResize={dispatchResizeEvent}
onResizeStop={(e, direction, ref, d) => {
- this.setState({
- chatWidth: chatWidth + d.width,
- });
+ this.chatResizeStop(d.width);
}}
>
{this.renderChat()}
@@ -243,11 +447,8 @@ class PanelManager extends PureComponent {
enable={resizableEnableOptions}
key={this.noteKey}
size={{ width: noteWidth }}
- onResize={dispatchResizeEvent}
onResizeStop={(e, direction, ref, d) => {
- this.setState({
- noteWidth: noteWidth + d.width,
- });
+ this.noteResizeStop(d.width);
}}
>
{this.renderNote()}
@@ -292,11 +493,8 @@ class PanelManager extends PureComponent {
enable={resizableEnableOptions}
key={this.captionsKey}
size={{ width: captionsWidth }}
- onResize={dispatchResizeEvent}
onResizeStop={(e, direction, ref, d) => {
- this.setState({
- captionsWidth: captionsWidth + d.width,
- });
+ this.captionsResizeStop(captionsWidth + d.width);
}}
>
{this.renderCaptions()}
@@ -341,11 +539,8 @@ class PanelManager extends PureComponent {
enable={resizableEnableOptions}
key={this.waitingUsers}
size={{ width: waitingWidth }}
- onResize={dispatchResizeEvent}
onResizeStop={(e, direction, ref, d) => {
- this.setState({
- waitingWidth: waitingWidth + d.width,
- });
+ this.waitingResizeStop(waitingWidth + d.width);
}}
>
{this.renderWaitingUsersPanel()}
@@ -354,8 +549,15 @@ class PanelManager extends PureComponent {
}
renderBreakoutRoom() {
+ const { breakoutRoomWidth } = this.state;
return (
- <div className={styles.breakoutRoom} key={this.breakoutroomKey}>
+ <div
+ className={styles.breakoutRoom}
+ key={this.breakoutroomKey}
+ style={{
+ width: breakoutRoomWidth,
+ }}
+ >
<BreakoutRoomContainer />
</div>
);
@@ -393,10 +595,8 @@ class PanelManager extends PureComponent {
key={this.pollKey}
size={{ width: pollWidth }}
onResizeStop={(e, direction, ref, d) => {
- window.dispatchEvent(new Event('resize'));
- this.setState({
- pollWidth: pollWidth + d.width,
- });
+ // window.dispatchEvent(new Event('resize'));
+ this.pollResizeStop(pollWidth + d.width);
}}
>
{this.renderPoll()}
@@ -408,6 +608,7 @@ class PanelManager extends PureComponent {
const { enableResize, openPanel } = this.props;
if (openPanel === '') return null;
const panels = [];
+
if (enableResize) {
panels.push(
this.renderUserListResizable(),
@@ -469,6 +670,6 @@ class PanelManager extends PureComponent {
}
}
-export default injectIntl(PanelManager);
+export default injectIntl(withLayoutConsumer(PanelManager));
PanelManager.propTypes = propTypes;
diff --git a/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx b/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx
index 1ce68a8d1993aa351f2486bd7b27b35743bbf3b9..0aa6f2ace9fb8bc84bb35c61ec1e8962807ad0b4 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx
@@ -38,6 +38,7 @@ const getResponseString = (obj) => {
if (typeof children !== 'string') {
return getResponseString(children[1]);
}
+
return children;
};
@@ -60,7 +61,7 @@ class LiveResult extends PureComponent {
userAnswers = userAnswers.map(id => Service.getUser(id))
.filter(user => user.connectionStatus === 'online')
.map((user) => {
- let answer = '-';
+ let answer = '';
if (responses) {
const response = responses.find(r => r.userId === user.userId);
@@ -158,7 +159,7 @@ class LiveResult extends PureComponent {
userCount = userAnswers.length;
userAnswers.map((user) => {
const response = getResponseString(user);
- if (response === '-') return user;
+ if (response === '') return user;
respondedCount += 1;
return user;
});
@@ -193,12 +194,15 @@ class LiveResult extends PureComponent {
Session.set('pollInitiated', false);
Service.publishPoll();
const { answers, numRespondents } = currentPoll;
-
+ let responded = 0;
let resultString = 'bbb-published-poll-\n';
- answers.forEach((item) => {
- const pct = Math.round(item.numVotes / numRespondents * 100);
+ answers.map((item) => {
+ responded += item.numVotes;
+ return item;
+ }).map((item) => {
+ const numResponded = responded === numRespondents ? numRespondents : responded;
+ const pct = Math.round(item.numVotes / numResponded * 100);
const pctFotmatted = `${Number.isNaN(pct) ? 0 : pct}%`;
-
resultString += `${item.key}: ${item.numVotes || 0} | ${pctFotmatted}\n`;
});
diff --git a/bigbluebutton-html5/imports/ui/components/poll/service.js b/bigbluebutton-html5/imports/ui/components/poll/service.js
index bd853982528d7f5bccab1a1eb0190fed87fbe636..5e31719c7caf473ae6989ef044292fb3fc847b5e 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/service.js
+++ b/bigbluebutton-html5/imports/ui/components/poll/service.js
@@ -59,7 +59,7 @@ const sendGroupMessage = (message) => {
color: '0',
correlationId: `${PUBLIC_CHAT_SYSTEM_ID}-${Date.now()}`,
sender: {
- id: PUBLIC_CHAT_SYSTEM_ID,
+ id: Auth.userID,
name: '',
},
message,
@@ -69,9 +69,12 @@ const sendGroupMessage = (message) => {
};
export default {
- amIPresenter: () => Users.findOne({ userId: Auth.userID }, { fields: { presenter: 1 } }).presenter,
+ amIPresenter: () => Users.findOne(
+ { userId: Auth.userID },
+ { fields: { presenter: 1 } },
+ ).presenter,
pollTypes,
- stopPoll: () => makeCall('stopPoll', Auth.userId),
+ stopPoll: () => makeCall('stopPoll', Auth.userID),
currentPoll: () => Polls.findOne({ meetingId: Auth.meetingID }),
pollAnswerIds,
sendGroupMessage,
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
index 796da6d291c219363fa3d9455507c9b82a59ccc5..e084ee858fbbf050cc99216f2fc06de0245cdd99 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
@@ -11,6 +11,7 @@ import AnnotationGroupContainer from '../whiteboard/annotation-group/container';
import PresentationOverlayContainer from './presentation-overlay/container';
import Slide from './slide/component';
import { styles } from './styles.scss';
+import toastStyles from '/imports/ui/components/toast/styles';
import MediaService, { shouldEnableSwapLayout } from '../media/service';
import PresentationCloseButton from './presentation-close-button/component';
import DownloadPresentationButton from './download-presentation-button/component';
@@ -18,6 +19,7 @@ import FullscreenService from '../fullscreen-button/service';
import FullscreenButtonContainer from '../fullscreen-button/container';
import { withDraggableConsumer } from '../media/webcam-draggable-overlay/context';
import Icon from '/imports/ui/components/icon/component';
+import { withLayoutConsumer } from '/imports/ui/components/layout/context';
const intlMessages = defineMessages({
presentationLabel: {
@@ -28,6 +30,10 @@ const intlMessages = defineMessages({
id: 'app.presentation.notificationLabel',
description: 'label displayed in toast when presentation switches',
},
+ downloadLabel: {
+ id: 'app.presentation.downloadLabel',
+ description: 'label for downloadable presentations',
+ },
});
const ALLOW_FULLSCREEN = Meteor.settings.public.app.allowFullscreen;
@@ -54,6 +60,10 @@ class PresentationArea extends PureComponent {
this.panAndZoomChanger = this.panAndZoomChanger.bind(this);
this.fitToWidthHandler = this.fitToWidthHandler.bind(this);
this.onFullscreenChange = this.onFullscreenChange.bind(this);
+ this.getPresentationSizesAvailable = this.getPresentationSizesAvailable.bind(this);
+ this.handleResize = this.handleResize.bind(this);
+
+
this.onResize = () => setTimeout(this.handleResize.bind(this), 0);
this.renderCurrentPresentationToast = this.renderCurrentPresentationToast.bind(this);
}
@@ -83,18 +93,34 @@ class PresentationArea extends PureComponent {
}
componentDidMount() {
- // adding an event listener to scale the whiteboard on 'resize' events sent by chat/userlist etc
- window.addEventListener('resize', this.onResize);
this.getInitialPresentationSizes();
this.refPresentationContainer.addEventListener('fullscreenchange', this.onFullscreenChange);
+ window.addEventListener('resize', this.onResize, false);
+ window.addEventListener('layoutSizesSets', this.onResize, false);
+ window.addEventListener('webcamAreaResize', this.handleResize, false);
- const { slidePosition, webcamDraggableDispatch } = this.props;
+ const { slidePosition, layoutContextDispatch } = this.props;
const { width: currWidth, height: currHeight } = slidePosition;
+
+ layoutContextDispatch({
+ type: 'setPresentationSlideSize',
+ value: {
+ width: currWidth,
+ height: currHeight,
+ },
+ });
+
if (currWidth > currHeight || currWidth === currHeight) {
- webcamDraggableDispatch({ type: 'setOrientationToLandscape' });
+ layoutContextDispatch({
+ type: 'setPresentationOrientation',
+ value: 'landscape',
+ });
}
if (currHeight > currWidth) {
- webcamDraggableDispatch({ type: 'setOrientationToPortrait' });
+ layoutContextDispatch({
+ type: 'setPresentationOrientation',
+ value: 'portrait',
+ });
}
}
@@ -102,46 +128,113 @@ class PresentationArea extends PureComponent {
const {
currentPresentation,
slidePosition,
- webcamDraggableDispatch,
+ layoutSwapped,
+ currentSlide,
+ publishedPoll,
+ isViewer,
+ toggleSwapLayout,
+ restoreOnUpdate,
+ layoutContextDispatch,
+ layoutContextState,
+ userIsPresenter,
} = this.props;
+ const { numUsersVideo } = layoutContextState;
+ const { layoutContextState: prevLayoutContextState } = prevProps;
+ const {
+ numUsersVideo: prevNumUsersVideo,
+ } = prevLayoutContextState;
+
+ if (numUsersVideo !== prevNumUsersVideo) {
+ this.onResize();
+ }
+
+ if (prevProps.slidePosition.id !== slidePosition.id) {
+ window.dispatchEvent(new Event('slideChanged'));
+ }
+
const { width: prevWidth, height: prevHeight } = prevProps.slidePosition;
const { width: currWidth, height: currHeight } = slidePosition;
if (prevWidth !== currWidth || prevHeight !== currHeight) {
+ layoutContextDispatch({
+ type: 'setPresentationSlideSize',
+ value: {
+ width: currWidth,
+ height: currHeight,
+ },
+ });
if (currWidth > currHeight || currWidth === currHeight) {
- webcamDraggableDispatch({ type: 'setOrientationToLandscape' });
+ layoutContextDispatch({
+ type: 'setPresentationOrientation',
+ value: 'landscape',
+ });
}
if (currHeight > currWidth) {
- webcamDraggableDispatch({ type: 'setOrientationToPortrait' });
+ layoutContextDispatch({
+ type: 'setPresentationOrientation',
+ value: 'portrait',
+ });
}
}
- if (prevProps.currentPresentation.name !== currentPresentation.name) {
+ const downloadableOn = !prevProps.currentPresentation.downloadable
+ && currentPresentation.downloadable;
+
+ const shouldCloseToast = !(currentPresentation.downloadable && !userIsPresenter);
+
+ if (
+ prevProps.currentPresentation.name !== currentPresentation.name
+ || (downloadableOn && !userIsPresenter)
+ ) {
if (this.currentPresentationToastId) {
- return toast.update(this.currentPresentationToastId, {
+ toast.update(this.currentPresentationToastId, {
+ autoClose: shouldCloseToast,
render: this.renderCurrentPresentationToast(),
});
+ } else {
+ this.currentPresentationToastId = toast(this.renderCurrentPresentationToast(), {
+ onClose: () => { this.currentPresentationToastId = null; },
+ autoClose: shouldCloseToast,
+ className: toastStyles.actionToast,
+ });
}
+ }
- this.currentPresentationToastId = toast(this.renderCurrentPresentationToast(), {
- onClose: () => { this.currentPresentationToastId = null; },
+ const downloadableOff = prevProps.currentPresentation.downloadable
+ && !currentPresentation.downloadable;
+
+ if (this.currentPresentationToastId && downloadableOff) {
+ toast.update(this.currentPresentationToastId, {
autoClose: true,
+ render: this.renderCurrentPresentationToast(),
});
}
+
+ if (layoutSwapped && restoreOnUpdate && isViewer && currentSlide) {
+ const slideChanged = currentSlide.id !== prevProps.currentSlide.id;
+ const positionChanged = slidePosition.viewBoxHeight !== prevProps.slidePosition.viewBoxHeight
+ || slidePosition.viewBoxWidth !== prevProps.slidePosition.viewBoxWidth;
+ const pollPublished = publishedPoll && !prevProps.publishedPoll;
+ if (slideChanged || positionChanged || pollPublished) {
+ toggleSwapLayout();
+ }
+ }
}
componentWillUnmount() {
- window.removeEventListener('resize', this.onResize);
+ window.removeEventListener('resize', this.onResize, false);
+ window.removeEventListener('layoutSizesSets', this.onResize, false);
this.refPresentationContainer.removeEventListener('fullscreenchange', this.onFullscreenChange);
}
onFullscreenChange() {
+ const { layoutContextDispatch } = this.props;
const { isFullscreen } = this.state;
const newIsFullscreen = FullscreenService.isFullScreen(this.refPresentationContainer);
if (isFullscreen !== newIsFullscreen) {
this.setState({ isFullscreen: newIsFullscreen });
- window.dispatchEvent(new Event('resize'));
+ layoutContextDispatch({ type: 'setPresentationFullscreen', value: newIsFullscreen });
}
}
@@ -162,25 +255,25 @@ class PresentationArea extends PureComponent {
}
getPresentationSizesAvailable() {
- const { userIsPresenter, multiUser } = this.props;
- const { refPresentationArea, refWhiteboardArea } = this;
- const presentationSizes = {};
-
- if (refPresentationArea && refWhiteboardArea) {
- // By default presentation sizes are equal to the sizes of the refPresentationArea
- // direct parent of the svg wrapper
- let { clientWidth, clientHeight } = refPresentationArea;
-
- // if a user is a presenter - this means there is a whiteboard toolbar on the right
- // and we have to get the width/height of the refWhiteboardArea
- // (inner hidden div with absolute position)
- if (userIsPresenter || multiUser) {
- ({ clientWidth, clientHeight } = refWhiteboardArea);
- }
+ const { layoutContextState } = this.props;
+ const {
+ presentationAreaSize,
+ webcamsAreaResizing,
+ mediaBounds,
+ tempWebcamsAreaSize,
+ webcamsPlacement,
+ } = layoutContextState;
+ const presentationSizes = {
+ presentationAreaWidth: 0,
+ presentationAreaHeight: 0,
+ };
- presentationSizes.presentationAreaHeight = clientHeight - this.getToolbarHeight();
- presentationSizes.presentationAreaWidth = clientWidth;
- }
+ presentationSizes.presentationAreaWidth = webcamsAreaResizing && (webcamsPlacement === 'left' || webcamsPlacement === 'right')
+ ? mediaBounds.width - tempWebcamsAreaSize.width
+ : presentationAreaSize.width;
+ presentationSizes.presentationAreaHeight = webcamsAreaResizing && (webcamsPlacement === 'top' || webcamsPlacement === 'bottom')
+ ? mediaBounds.height - tempWebcamsAreaSize.height - (this.getToolbarHeight() || 0) - 30
+ : presentationAreaSize.height - (this.getToolbarHeight() || 0);
return presentationSizes;
}
@@ -405,6 +498,7 @@ class PresentationArea extends PureComponent {
currentSlide,
slidePosition,
userIsPresenter,
+ layoutSwapped,
} = this.props;
const {
@@ -457,6 +551,7 @@ class PresentationArea extends PureComponent {
width: svgDimensions.width,
height: svgDimensions.height,
textAlign: 'center',
+ display: layoutSwapped ? 'none' : 'block',
}}
>
{this.renderPresentationClose()}
@@ -601,7 +696,10 @@ class PresentationArea extends PureComponent {
}
renderCurrentPresentationToast() {
- const { intl, currentPresentation } = this.props;
+ const {
+ intl, currentPresentation, userIsPresenter, downloadPresentationUri,
+ } = this.props;
+ const { downloadable } = currentPresentation;
return (
<div className={styles.innerToastWrapper}>
@@ -610,10 +708,28 @@ class PresentationArea extends PureComponent {
<Icon iconName="presentation" />
</div>
</div>
- <div className={styles.toastTextContent}>
+
+ <div className={styles.toastTextContent} data-test="toastSmallMsg">
<div>{`${intl.formatMessage(intlMessages.changeNotification)}`}</div>
<div className={styles.presentationName}>{`${currentPresentation.name}`}</div>
</div>
+
+ {downloadable && !userIsPresenter
+ ? (
+ <span className={styles.toastDownload}>
+ <div className={toastStyles.separator} />
+ <a
+ className={styles.downloadBtn}
+ aria-label={`${intl.formatMessage(intlMessages.downloadLabel)} ${currentPresentation.name}`}
+ href={downloadPresentationUri}
+ target="_blank"
+ rel="noopener noreferrer"
+ >
+ {intl.formatMessage(intlMessages.downloadLabel)}
+ </a>
+ </span>
+ ) : null
+ }
</div>
);
}
@@ -627,8 +743,8 @@ class PresentationArea extends PureComponent {
const {
showSlide,
- fitToWidth,
- presentationAreaWidth,
+ // fitToWidth,
+ // presentationAreaWidth,
localPosition,
} = this.state;
@@ -659,16 +775,7 @@ class PresentationArea extends PureComponent {
let toolbarWidth = 0;
if (this.refWhiteboardArea) {
- if (svgWidth === presentationAreaWidth
- || presentationAreaWidth <= 400
- || fitToWidth === true) {
- toolbarWidth = '100%';
- } else if (svgWidth <= 400
- && presentationAreaWidth > 400) {
- toolbarWidth = '400px';
- } else {
- toolbarWidth = svgWidth;
- }
+ toolbarWidth = svgWidth;
}
return (
@@ -718,7 +825,7 @@ class PresentationArea extends PureComponent {
}
}
-export default injectIntl(withDraggableConsumer(PresentationArea));
+export default injectIntl(withDraggableConsumer(withLayoutConsumer(PresentationArea)));
PresentationArea.propTypes = {
intl: intlShape.isRequired,
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/container.jsx b/bigbluebutton-html5/imports/ui/components/presentation/container.jsx
index 506c024930c5bcac570e9db64ced5210619d7047..d69440a982e36905c05a3514cbee2879b006b9a8 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/container.jsx
@@ -1,10 +1,16 @@
import React from 'react';
import { withTracker } from 'meteor/react-meteor-data';
-import { getSwapLayout, shouldEnableSwapLayout } from '/imports/ui/components/media/service';
+import MediaService, { getSwapLayout, shouldEnableSwapLayout } from '/imports/ui/components/media/service';
import { notify } from '/imports/ui/services/notification';
import PresentationAreaService from './service';
import PresentationArea from './component';
import PresentationToolbarService from './presentation-toolbar/service';
+import Auth from '/imports/ui/services/auth';
+import Meetings from '/imports/api/meetings';
+import Users from '/imports/api/users';
+import getFromUserSettings from '/imports/ui/services/users-settings';
+
+const ROLE_VIEWER = Meteor.settings.public.user.role_viewer;
const PresentationAreaContainer = ({ presentationPodIds, mountPresentationArea, ...props }) => (
mountPresentationArea && <PresentationArea {...props} />
@@ -14,6 +20,11 @@ export default withTracker(({ podId }) => {
const currentSlide = PresentationAreaService.getCurrentSlide(podId);
const presentationIsDownloadable = PresentationAreaService.isPresentationDownloadable(podId);
const layoutSwapped = getSwapLayout() && shouldEnableSwapLayout();
+ const isViewer = Users.findOne({ meetingId: Auth.meetingID, userId: Auth.userID }, {
+ fields: {
+ role: 1,
+ },
+ }).role === ROLE_VIEWER;
let slidePosition;
if (currentSlide) {
@@ -36,5 +47,18 @@ export default withTracker(({ podId }) => {
notify,
zoomSlide: PresentationToolbarService.zoomSlide,
podId,
+ layoutSwapped,
+ toggleSwapLayout: MediaService.toggleSwapLayout,
+ publishedPoll: Meetings.findOne({ meetingId: Auth.meetingID }, {
+ fields: {
+ publishedPoll: 1,
+ },
+ }).publishedPoll,
+ isViewer,
+ currentPresentationId: Session.get('currentPresentationId') || null,
+ restoreOnUpdate: getFromUserSettings(
+ 'bbb_force_restore_presentation_on_new_events',
+ Meteor.settings.public.presentation.restoreOnUpdate,
+ ),
};
})(PresentationAreaContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/cursor/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/cursor/component.jsx
index efc132f21dfe3f0e5e77ff9fb4c86ecb0129ddb4..85a74fee86897c799d7c29d24f804f48933dcdc6 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/cursor/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/cursor/component.jsx
@@ -191,7 +191,7 @@ export default class Cursor extends Component {
<circle
cx={x}
cy={y}
- r={finalRadius}
+ r={finalRadius === Infinity ? 0 : finalRadius}
fill={fill}
fillOpacity="0.6"
/>
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/default-content/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/default-content/component.jsx
index 7d390783c9227e7e4bc6de498df905c4e5d83a10..399ca470ffdba72c2795558473c377d66fa54ea8 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/default-content/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/default-content/component.jsx
@@ -1,33 +1,42 @@
import React from 'react';
import { FormattedMessage } from 'react-intl';
import { TransitionGroup, CSSTransition } from 'react-transition-group';
+import cx from 'classnames';
import { styles } from './styles.scss';
-export default () => (
- <TransitionGroup>
- <CSSTransition
- classNames={{
+const LAYOUT_CONFIG = Meteor.settings.public.layout;
+
+export default (props) => {
+ const { autoSwapLayout, hidePresentation } = props;
+ return (
+ <TransitionGroup>
+ <CSSTransition
+ classNames={{
appear: styles.appear,
appearActive: styles.appearActive,
}}
- appear
- enter={false}
- exit={false}
- timeout={{ enter: 400 }}
- className={styles.contentWrapper}
- >
- <div className={styles.content}>
- <div className={styles.defaultContent}>
- <p>
- <FormattedMessage
- id="app.home.greeting"
- description="Message to greet the user."
- defaultMessage="Your presentation will begin shortly..."
- />
- <br />
- </p>
+ appear
+ enter={false}
+ exit={false}
+ timeout={{ enter: 400 }}
+ className={styles.contentWrapper}
+ >
+ <div className={styles.content}>
+ <div className={cx(styles.defaultContent, {
+ [styles.hideContent]: autoSwapLayout && hidePresentation,
+ })}
+ >
+ <p>
+ <FormattedMessage
+ id="app.home.greeting"
+ description="Message to greet the user."
+ defaultMessage="Your presentation will begin shortly..."
+ />
+ <br />
+ </p>
+ </div>
</div>
- </div>
- </CSSTransition>
- </TransitionGroup>
-);
+ </CSSTransition>
+ </TransitionGroup>
+ );
+};
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/default-content/styles.scss b/bigbluebutton-html5/imports/ui/components/presentation/default-content/styles.scss
index 75456930ebbd82e39531809c3574a99ba8c3133d..d80f0b9aa8f0a5bb923fe8ebb8fc99e375abf073 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/default-content/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/presentation/default-content/styles.scss
@@ -36,6 +36,10 @@
overflow: auto;
}
+.hideContent {
+ visibility: hidden;
+}
+
.appear {
opacity: 0.01;
}
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/component.jsx
index 78ab1defa314dec05a77aba9c188b75767920a03..e719c820aeff08328b71ca8048dbe9cf6e969c51 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/component.jsx
@@ -9,7 +9,7 @@ import cx from 'classnames';
import { styles } from './styles.scss';
import ZoomTool from './zoom-tool/component';
import FullscreenButtonContainer from '../../fullscreen-button/container';
-import Tooltip from '/imports/ui/components/tooltip/component';
+import TooltipContainer from '/imports/ui/components/tooltip/container';
import QuickPollDropdownContainer from '/imports/ui/components/actions-bar/quick-poll-dropdown/container';
import KEY_CODES from '/imports/utils/keyCodes';
@@ -274,10 +274,7 @@ class PresentationToolbar extends PureComponent {
data-test="prevSlide"
/>
- <Tooltip
- title={intl.formatMessage(intlMessages.selectLabel)}
- className={styles.presentationBtn}
- >
+ <TooltipContainer title={intl.formatMessage(intlMessages.selectLabel)}>
<select
id="skipSlide"
aria-label={intl.formatMessage(intlMessages.skipSlideLabel)}
@@ -292,7 +289,7 @@ class PresentationToolbar extends PureComponent {
>
{this.renderSkipSlideOpts(numberOfSlides)}
</select>
- </Tooltip>
+ </TooltipContainer>
<Button
role="button"
aria-label={nextSlideAriaLabel}
@@ -314,14 +311,16 @@ class PresentationToolbar extends PureComponent {
{
!isMobileBrowser
? (
- <ZoomTool
- zoomValue={zoom}
- change={this.change}
- minBound={HUNDRED_PERCENT}
- maxBound={MAX_PERCENT}
- step={STEP}
- isMeteorConnected={isMeteorConnected}
- />
+ <TooltipContainer>
+ <ZoomTool
+ zoomValue={zoom}
+ change={this.change}
+ minBound={HUNDRED_PERCENT}
+ maxBound={MAX_PERCENT}
+ step={STEP}
+ isMeteorConnected={isMeteorConnected}
+ />
+ </TooltipContainer>
)
: null
}
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/styles.scss b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/styles.scss
index 8dec10b174f04291a2dcecf9b44fc51e518a4576..af0dcfca403f38a383c79456d91fab62e65b2853 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/styles.scss
@@ -79,7 +79,9 @@
&:-moz-focusring {
outline: none;
}
-
+ border: 0;
+ background-color: var(--color-off-white);
+ cursor: pointer;
margin: 0 var(--whiteboard-toolbar-margin) 0 0;
padding: var(--whiteboard-toolbar-padding);
padding-left: var(--whiteboard-toolbar-padding-sm);
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx
index cb2dacc5a0909f36d09fdaccfb613fcbeda38f5b..cba3c2b25da6098b7f0d0b545d0039aa4d8621b1 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx
@@ -1,24 +1,27 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
-import { defineMessages, injectIntl, intlShape } from 'react-intl';
+import { intlShape, injectIntl, defineMessages } from 'react-intl';
+import cx from 'classnames';
+import Button from '/imports/ui/components/button/component';
+import Checkbox from '/imports/ui/components/checkbox/component';
+import Icon from '/imports/ui/components/icon/component';
import Dropzone from 'react-dropzone';
import update from 'immutability-helper';
-import cx from 'classnames';
-import _ from 'lodash';
import logger from '/imports/startup/client/logger';
+import { notify } from '/imports/ui/services/notification';
+import { toast } from 'react-toastify';
import browser from 'browser-detect';
+import _ from 'lodash';
+import { styles } from './styles';
-import { notify } from '/imports/ui/services/notification';
-import ModalFullscreen from '/imports/ui/components/modal/fullscreen/component';
-import { withModalMounter } from '/imports/ui/components/modal/service';
-import Icon from '/imports/ui/components/icon/component';
-import Button from '/imports/ui/components/button/component';
-import Checkbox from '/imports/ui/components/checkbox/component';
-import { styles } from './styles.scss';
+const BROWSER_RESULTS = browser();
+const isMobileBrowser = (BROWSER_RESULTS ? BROWSER_RESULTS.mobile : false)
+ || (BROWSER_RESULTS && BROWSER_RESULTS.os
+ ? BROWSER_RESULTS.os.includes('Android') // mobile flag doesn't always work
+ : false);
const propTypes = {
intl: intlShape.isRequired,
- mountModal: PropTypes.func.isRequired,
defaultFileName: PropTypes.string.isRequired,
fileSizeMin: PropTypes.number.isRequired,
fileSizeMax: PropTypes.number.isRequired,
@@ -32,6 +35,7 @@ const propTypes = {
conversion: PropTypes.object,
upload: PropTypes.object,
})).isRequired,
+ isOpen: PropTypes.bool.isRequired,
};
const defaultProps = {
@@ -117,6 +121,10 @@ const intlMessages = defineMessages({
id: 'app.presentationUploder.conversion.conversionProcessingSlides',
description: 'indicates how many slides were converted',
},
+ genericError: {
+ id: 'app.presentationUploder.genericError',
+ description: 'generic error while uploading/converting',
+ },
genericConversionStatus: {
id: 'app.presentationUploder.conversion.genericConversionStatus',
description: 'indicates that file is being converted',
@@ -140,22 +148,10 @@ const intlMessages = defineMessages({
id: 'app.presentationUploder.conversion.pageCountExceeded',
description: 'warns the user that the conversion failed because of the page count',
},
- PAGE_COUNT_FAILED: {
- id: 'app.presentationUploder.conversion.pageCountFailed',
- description: '',
- },
PDF_HAS_BIG_PAGE: {
id: 'app.presentationUploder.conversion.pdfHasBigPage',
description: 'warns the user that the conversion failed because of the pdf page siz that exceeds the allowed limit',
},
- OFFICE_DOC_CONVERSION_INVALID: {
- id: 'app.presentationUploder.conversion.officeDocConversionInvalid',
- description: '',
- },
- OFFICE_DOC_CONVERSION_FAILED: {
- id: 'app.presentationUploder.conversion.officeDocConversionFailed',
- description: '',
- },
isDownloadable: {
id: 'app.presentationUploder.isDownloadableLabel',
description: 'presentation is available for downloading by all viewers',
@@ -184,82 +180,104 @@ const intlMessages = defineMessages({
id: 'app.presentationUploder.tableHeading.filename',
description: 'aria label for file name table heading',
},
+ uploading: {
+ id: 'app.presentationUploder.uploading',
+ description: 'uploading label for toast notification',
+ },
+ uploadStatus: {
+ id: 'app.presentationUploder.uploadStatus',
+ description: 'upload status for toast notification',
+ },
+ completed: {
+ id: 'app.presentationUploder.completed',
+ description: 'uploads complete label for toast notification',
+ },
+ item: {
+ id: 'app.presentationUploder.item',
+ description: 'single item label',
+ },
+ itemPlural: {
+ id: 'app.presentationUploder.itemPlural',
+ description: 'plural item label',
+ },
+ clearErrors: {
+ id: 'app.presentationUploder.clearErrors',
+ description: 'button label for clearing upload errors',
+ },
+ clearErrorsDesc: {
+ id: 'app.presentationUploder.clearErrorsDesc',
+ description: 'aria description for button clearing upload error',
+ },
});
-const BROWSER_RESULTS = browser();
-const isMobileBrowser = (BROWSER_RESULTS ? BROWSER_RESULTS.mobile : false)
- || (BROWSER_RESULTS && BROWSER_RESULTS.os
- ? BROWSER_RESULTS.os.includes('Android') // mobile flag doesn't always work
- : false);
-
class PresentationUploader extends Component {
constructor(props) {
super(props);
- const currentPres = props.presentations.find(p => p.isCurrent);
-
this.state = {
- presentations: props.presentations,
- oldCurrentId: currentPres ? currentPres.id : -1,
- preventClosing: false,
+ presentations: [],
disableActions: false,
+ toUploadCount: 0,
};
+ this.toastId = null;
+ this.hasError = null;
+
+ // handlers
+ this.handleFiledrop = this.handleFiledrop.bind(this);
this.handleConfirm = this.handleConfirm.bind(this);
this.handleDismiss = this.handleDismiss.bind(this);
- this.handleFiledrop = this.handleFiledrop.bind(this);
- this.handleCurrentChange = this.handleCurrentChange.bind(this);
this.handleRemove = this.handleRemove.bind(this);
- this.toggleDownloadable = this.toggleDownloadable.bind(this);
-
- this.updateFileKey = this.updateFileKey.bind(this);
+ this.handleCurrentChange = this.handleCurrentChange.bind(this);
+ this.handleDismissToast = this.handleDismissToast.bind(this);
+ this.handleToggleDownloadable = this.handleToggleDownloadable.bind(this);
+ // renders
+ this.renderDropzone = this.renderDropzone.bind(this);
+ this.renderPicDropzone = this.renderPicDropzone.bind(this);
+ this.renderPresentationList = this.renderPresentationList.bind(this);
+ this.renderPresentationItem = this.renderPresentationItem.bind(this);
+ this.renderPresentationItemStatus = this.renderPresentationItemStatus.bind(this);
+ this.renderToastList = this.renderToastList.bind(this);
+ this.renderToastItem = this.renderToastItem.bind(this);
+ // utilities
this.deepMergeUpdateFileKey = this.deepMergeUpdateFileKey.bind(this);
-
- this.releaseActionsOnPresentationError = this.releaseActionsOnPresentationError.bind(this);
+ this.updateFileKey = this.updateFileKey.bind(this);
+ this.isDefault = this.isDefault.bind(this);
}
- componentDidUpdate() {
- this.releaseActionsOnPresentationError();
- }
+ componentDidUpdate(prevProps) {
+ const { selectedToBeNextCurrent, isOpen, presentations: propPresentations } = this.props;
+ const { presentations } = this.state;
- releaseActionsOnPresentationError() {
- const {
- presentations,
- disableActions,
- } = this.state;
+ // cleared local presetation state errors and set to presentations available on the server
+ if (presentations.length === 0 && propPresentations.length > 1) {
+ return this.setState({ presentations: propPresentations });
+ }
- presentations.forEach((presentation) => {
- if (!presentation.conversion.done && presentation.conversion.error) {
- if (disableActions) {
- this.setState({
- disableActions: false,
- });
- }
+ // Only presentation available is the default coming from the server.
+ // set as selectedToBeNextCurrentOnConfirm once upload / coversion complete
+ if (presentations.length === 0 && propPresentations.length === 1) {
+ if (propPresentations[0].upload.done && propPresentations[0].conversion.done) {
+ return this.setState({
+ presentations: propPresentations,
+ }, Session.set('selectedToBeNextCurrent', propPresentations[0].id));
}
- });
- }
+ }
- updateFileKey(id, key, value, operation = '$set') {
- this.setState(({ presentations }) => {
- const fileIndex = presentations.findIndex(f => f.id === id);
+ if (presentations.length > 0) {
+ const selected = propPresentations.filter(p => p.isCurrent);
+ if (selected.length > 0) Session.set('selectedToBeNextCurrent', selected[0].id);
+ }
- return fileIndex === -1 ? false : {
- presentations: update(presentations, {
- [fileIndex]: {
- $apply: file => update(file, {
- [key]: {
- [operation]: value,
- },
- }),
- },
- }),
- };
- });
- }
+ if (this.toastId) {
+ if (!prevProps.isOpen && isOpen) {
+ this.handleDismissToast(this.toastId);
+ }
- deepMergeUpdateFileKey(id, key, value) {
- const applyValue = toUpdate => update(toUpdate, { $merge: value });
- this.updateFileKey(id, key, applyValue, '$apply');
+ toast.update(this.toastId, {
+ render: this.renderToastList(),
+ });
+ }
}
isDefault(presentation) {
@@ -268,74 +286,13 @@ class PresentationUploader extends Component {
&& !presentation.id.includes(defaultFileName);
}
- handleConfirm() {
- const { mountModal, handleSave } = this.props;
- const { disableActions, presentations, oldCurrentId } = this.state;
- const presentationsToSave = presentations
- .filter(p => !p.upload.error && !p.conversion.error);
-
- this.setState({
- disableActions: true,
- preventClosing: true,
- presentations: presentationsToSave,
- });
-
- if (!disableActions) {
- return handleSave(presentationsToSave)
- .then(() => {
- const hasError = presentations.some(p => p.upload.error || p.conversion.error);
- if (!hasError) {
- this.setState({
- disableActions: false,
- preventClosing: false,
- });
-
- mountModal(null);
- return;
- }
-
- // if there's error we don't want to close the modal
- this.setState({
- disableActions: false,
- preventClosing: true,
- }, () => {
- // if the selected current has error we revert back to the old one
- const newCurrent = presentations.find(p => p.isCurrent);
- if (newCurrent.upload.error || newCurrent.conversion.error) {
- this.handleCurrentChange(oldCurrentId);
- }
- });
- })
- .catch((error) => {
- logger.error({
- logCode: 'presentationuploader_component_save_error',
- extraInfo: { error },
- }, 'Presentation uploader catch error on confirm');
-
- this.setState({
- disableActions: false,
- preventClosing: true,
- });
- });
- }
- return null;
- }
-
- handleDismiss() {
- const { mountModal } = this.props;
-
- return new Promise((resolve) => {
- mountModal(null);
-
- this.setState({
- preventClosing: false,
- disableActions: false,
- }, resolve);
- });
+ handleDismissToast() {
+ return toast.dismiss(this.toastId);
}
handleFiledrop(files, files2) {
const { fileValidMimeTypes, intl } = this.props;
+ const { toUploadCount } = this.state;
const validMimes = fileValidMimeTypes.map(fileValid => fileValid.mime);
const validExtentions = fileValidMimeTypes.map(fileValid => fileValid.extension);
const [accepted, rejected] = _.partition(files
@@ -383,6 +340,7 @@ class PresentationUploader extends Component {
this.setState(({ presentations }) => ({
presentations: presentations.concat(presentationsToUpload),
+ toUploadCount: (toUploadCount + presentationsToUpload.length),
}), () => {
// after the state is set (files have been dropped),
// make the first of the new presentations current
@@ -391,19 +349,192 @@ class PresentationUploader extends Component {
}
});
-
if (rejected.length > 0) {
notify(intl.formatMessage(intlMessages.rejectedError), 'error');
}
}
+ renderToastItem(item) {
+ const isUploading = !item.upload.done && item.upload.progress > 0;
+ const isConverting = !item.conversion.done && item.upload.done;
+ const hasError = item.conversion.error || item.upload.error;
+ const isProcessing = (isUploading || isConverting) && !hasError;
+
+ const {
+ intl, selectedToBeNextCurrent,
+ } = this.props;
+
+ const itemClassName = {
+ [styles.done]: !isProcessing && !hasError,
+ [styles.err]: hasError,
+ [styles.loading]: isProcessing,
+ };
+
+ const statusInfoStyle = {
+ [styles.textErr]: hasError,
+ [styles.textInfo]: !hasError,
+ };
+
+ let icon = isProcessing ? 'blank' : 'check';
+ if (hasError) icon = 'circle_close';
+
+ return (
+ <div
+ key={item.id}
+ className={styles.uploadRow}
+ onClick={() => {
+ if (hasError || isProcessing) Session.set('showUploadPresentationView', true);
+ }}
+ >
+ <div className={styles.fileLine}>
+ <span className={styles.fileIcon}>
+ <Icon iconName="file" />
+ </span>
+ <span className={styles.toastFileName}>
+ <span>{item.filename}</span>
+ </span>
+ <span className={styles.statusIcon}>
+ <Icon iconName={icon} className={cx(itemClassName)} />
+ </span>
+ </div>
+ <div className={styles.statusInfo}>
+ <span className={cx(statusInfoStyle)}>{this.renderPresentationItemStatus(item)}</span>
+ </div>
+ </div>
+ );
+ }
+
+ handleToggleDownloadable(item) {
+ const { dispatchTogglePresentationDownloadable } = this.props;
+ const { presentations } = this.state;
+
+ const oldDownloadableState = item.isDownloadable;
+
+ const outOfDatePresentationIndex = presentations.findIndex(p => p.id === item.id);
+ const commands = {};
+ commands[outOfDatePresentationIndex] = {
+ $apply: (presentation) => {
+ const p = presentation;
+ p.isDownloadable = !oldDownloadableState;
+ return p;
+ },
+ };
+ const presentationsUpdated = update(presentations, commands);
+
+ this.setState({
+ presentations: presentationsUpdated,
+ });
+
+ // If the presentation has not be uploaded yet, adjusting the state suffices
+ // otherwise set previously uploaded presentation to [not] be downloadable
+ if (item.upload.done) {
+ dispatchTogglePresentationDownloadable(item, !oldDownloadableState);
+ }
+ }
+
+ updateFileKey(id, key, value, operation = '$set') {
+ this.setState(({ presentations }) => {
+ const fileIndex = presentations.findIndex(f => f.id === id);
+
+ return fileIndex === -1 ? false : {
+ presentations: update(presentations, {
+ [fileIndex]: {
+ $apply: file => update(file, {
+ [key]: {
+ [operation]: value,
+ },
+ }),
+ },
+ }),
+ };
+ });
+ }
+
+ handleDismiss() {
+ const { presentations } = this.state;
+ const { presentations: propPresentations } = this.props;
+ const ids = new Set(propPresentations.map(d => d.ID));
+ const merged = [
+ ...propPresentations,
+ ...presentations.filter(d => !ids.has(d.ID)),
+ ];
+ this.setState(
+ { presentations: merged },
+ Session.set('showUploadPresentationView', false),
+ );
+ }
+
+ handleConfirm(hasNewUpload) {
+ const {
+ handleSave, selectedToBeNextCurrent,
+ } = this.props;
+ const { disableActions, presentations } = this.state;
+ const presentationsToSave = presentations;
+
+ this.setState({ disableActions: true });
+
+ if (hasNewUpload) {
+ this.toastId = toast.info(this.renderToastList(), {
+ hideProgressBar: true,
+ autoClose: false,
+ newestOnTop: true,
+ closeOnClick: true,
+ onClose: () => {
+ this.toastId = null;
+ },
+ });
+ }
+
+ if (this.toastId) Session.set('UploadPresentationToastId', this.toastId);
+
+ if (!disableActions) {
+ Session.set('showUploadPresentationView', false);
+ return handleSave(presentationsToSave)
+ .then(() => {
+ const hasError = presentations.some(p => p.upload.error || p.conversion.error);
+ if (!hasError) {
+ this.setState({
+ disableActions: false,
+ toUploadCount: 0,
+ });
+ return;
+ }
+ // if there's error we don't want to close the modal
+ this.setState({
+ disableActions: true,
+ // preventClosing: true,
+ }, () => {
+ // if the selected current has error we revert back to the old one
+ const newCurrent = presentations.find(p => p.isCurrent);
+ if (newCurrent.upload.error || newCurrent.conversion.error) {
+ this.handleCurrentChange(selectedToBeNextCurrent);
+ }
+ });
+ })
+ .catch((error) => {
+ logger.error({
+ logCode: 'presentationuploader_component_save_error',
+ extraInfo: { error },
+ }, 'Presentation uploader catch error on confirm');
+ });
+ }
+
+ Session.set('showUploadPresentationView', false);
+ return null;
+ }
+
+ deepMergeUpdateFileKey(id, key, value) {
+ const applyValue = toUpdate => update(toUpdate, { $merge: value });
+ this.updateFileKey(id, key, applyValue, '$apply');
+ }
+
handleCurrentChange(id) {
const { presentations, disableActions } = this.state;
+
if (disableActions) return;
const currentIndex = presentations.findIndex(p => p.isCurrent);
const newCurrentIndex = presentations.findIndex(p => p.id === id);
-
const commands = {};
// we can end up without a current presentation
@@ -426,51 +557,45 @@ class PresentationUploader extends Component {
};
const presentationsUpdated = update(presentations, commands);
-
- this.setState({
- presentations: presentationsUpdated,
- });
+ this.setState({ presentations: presentationsUpdated });
}
- handleRemove(item) {
- const { presentations, disableActions } = this.state;
- if (disableActions) return;
+ handleRemove(item, withErr = false) {
+ if (withErr) {
+ const { presentations } = this.props;
+ this.hasError = false;
+ return this.setState({
+ presentations,
+ disableActions: false,
+ });
+ }
+ const { presentations } = this.state;
const toRemoveIndex = presentations.indexOf(item);
-
- this.setState({
+ return this.setState({
presentations: update(presentations, {
$splice: [[toRemoveIndex, 1]],
}),
- });
- }
-
- toggleDownloadable(item) {
- const { dispatchTogglePresentationDownloadable } = this.props;
- const { presentations } = this.state;
-
- const oldDownloadableState = item.isDownloadable;
-
- const outOfDatePresentationIndex = presentations.findIndex(p => p.id === item.id);
- const commands = {};
- commands[outOfDatePresentationIndex] = {
- $apply: (presentation) => {
- const p = presentation;
- p.isDownloadable = !oldDownloadableState;
- return p;
- },
- };
- const presentationsUpdated = update(presentations, commands);
+ }, () => {
+ const { presentations: updatedPresentations, oldCurrentId } = this.state;
+ const currentIndex = updatedPresentations.findIndex(p => p.isCurrent);
+ const actualCurrentIndex = updatedPresentations.findIndex(p => p.id === oldCurrentId);
+
+ if (currentIndex === -1 && updatedPresentations.length > 0) {
+ const commands = {};
+ const newCurrentIndex = actualCurrentIndex === -1 ? 0 : actualCurrentIndex;
+ commands[newCurrentIndex] = {
+ $apply: (presentation) => {
+ const p = presentation;
+ p.isCurrent = true;
+ return p;
+ },
+ };
- this.setState({
- presentations: presentationsUpdated,
+ const updatedCurrent = update(updatedPresentations, commands);
+ this.setState({ presentations: updatedCurrent });
+ }
});
-
- // If the presentation has not be uploaded yet, adjusting the state suffices
- // otherwise set previously uploaded presentation to [not] be downloadable
- if (item.upload.done) {
- dispatchTogglePresentationDownloadable(item, !oldDownloadableState);
- }
}
renderPresentationList() {
@@ -500,53 +625,86 @@ class PresentationUploader extends Component {
);
}
- renderPresentationItemStatus(item) {
- const { intl } = this.props;
+ renderToastList() {
+ const { presentations, toUploadCount } = this.state;
- if (!item.upload.done && item.upload.progress === 0) {
- return intl.formatMessage(intlMessages.fileToUpload);
+ if (toUploadCount === 0) {
+ return this.handleDismissToast(this.toastId);
}
- if (!item.upload.done && !item.upload.error) {
- return intl.formatMessage(intlMessages.uploadProcess, {
- 0: Math.floor(item.upload.progress).toString(),
+ const { intl } = this.props;
+ let converted = 0;
+
+ let presentationsSorted = presentations
+ .filter(p => (p.upload.progress || p.conversion.status) && p.file)
+ .sort((a, b) => a.uploadTimestamp - b.uploadTimestamp)
+ .sort((a, b) => a.conversion.done - b.conversion.done);
+
+ presentationsSorted = presentationsSorted
+ .splice(0, toUploadCount)
+ .map((p) => {
+ if (p.conversion.done) converted += 1;
+ return p;
});
- }
- if (item.upload.done && item.upload.error) {
- return intl.formatMessage(intlMessages[item.upload.status]);
- }
+ let toastHeading = '';
+ const itemLabel = presentationsSorted.length > 1
+ ? intl.formatMessage(intlMessages.itemPlural)
+ : intl.formatMessage(intlMessages.item);
- if (!item.conversion.done && item.conversion.error) {
- return intl.formatMessage(intlMessages[item.conversion.status]);
+ if (converted === 0) {
+ toastHeading = intl.formatMessage(intlMessages.uploading, {
+ 0: presentationsSorted.length,
+ 1: itemLabel,
+ });
}
- if (!item.conversion.done && !item.conversion.error) {
- if (item.conversion.pagesCompleted < item.conversion.numPages) {
- return intl.formatMessage(intlMessages.conversionProcessingSlides, {
- 0: item.conversion.pagesCompleted,
- 1: item.conversion.numPages,
- });
- }
+ if (converted > 0 && converted !== presentationsSorted.length) {
+ toastHeading = intl.formatMessage(intlMessages.uploadStatus, {
+ 0: converted,
+ 1: presentationsSorted.length,
+ });
+ }
- const conversionStatusMessage = intlMessages[item.conversion.status]
- || intlMessages.genericConversionStatus;
- return intl.formatMessage(conversionStatusMessage);
+ if (converted === presentationsSorted.length) {
+ toastHeading = intl.formatMessage(intlMessages.completed, {
+ 0: converted,
+ });
}
- return null;
+ return (
+ <div className={styles.toastWrapper}>
+ <div className={styles.uploadToastHeader}>
+ <Icon className={styles.uploadIcon} iconName="upload" />
+ <span className={styles.uploadToastTitle}>{toastHeading}</span>
+ </div>
+ <div className={styles.innerToast}>
+ <div>
+ <div>
+ {presentationsSorted.map(item => this.renderToastItem(item))}
+ </div>
+ </div>
+ </div>
+ </div>
+ );
}
renderPresentationItem(item) {
- const { disableActions, oldCurrentId } = this.state;
- const { intl, allowDownloadable } = this.props;
+ const { disableActions, hasError: stateError } = this.state;
+ const {
+ intl, selectedToBeNextCurrent,
+ } = this.props;
- const isActualCurrent = item.id === oldCurrentId;
+ const isActualCurrent = selectedToBeNextCurrent ? item.id === selectedToBeNextCurrent : item.isCurrent;
const isUploading = !item.upload.done && item.upload.progress > 0;
const isConverting = !item.conversion.done && item.upload.done;
const hasError = item.conversion.error || item.upload.error;
const isProcessing = (isUploading || isConverting) && !hasError;
+ if (!stateError && hasError) {
+ this.hasError = true;
+ }
+
const itemClassName = {
[styles.tableItemNew]: item.id.indexOf(item.filename) !== -1,
[styles.tableItemUploading]: isUploading,
@@ -555,10 +713,6 @@ class PresentationUploader extends Component {
[styles.tableItemAnimated]: isProcessing,
};
- const itemActions = {
- [styles.notDownloadable]: !allowDownloadable,
- };
-
const hideRemove = this.isDefault(item);
const formattedDownloadableLabel = item.isDownloadable
? intl.formatMessage(intlMessages.isDownloadable)
@@ -569,6 +723,7 @@ class PresentationUploader extends Component {
const isDownloadableStyle = item.isDownloadable
? cx(styles.itemAction, styles.itemActionRemove, styles.checked)
: cx(styles.itemAction, styles.itemActionRemove);
+
return (
<tr
key={item.id}
@@ -595,26 +750,24 @@ class PresentationUploader extends Component {
{this.renderPresentationItemStatus(item)}
</td>
{hasError ? null : (
- <td className={cx(styles.tableItemActions, itemActions)}>
- {allowDownloadable ? (
- <Button
- className={isDownloadableStyle}
- label={formattedDownloadableLabel}
- aria-label={formattedDownloadableAriaLabel}
- hideLabel
- size="sm"
- icon={item.isDownloadable ? 'download' : 'download-off'}
- onClick={() => this.toggleDownloadable(item)}
- />
- ) : null
- }
+ <td className={styles.tableItemActions}>
+ <Button
+ disabled={disableActions}
+ className={isDownloadableStyle}
+ label={formattedDownloadableLabel}
+ aria-label={formattedDownloadableAriaLabel}
+ hideLabel
+ size="sm"
+ icon={item.isDownloadable ? 'download' : 'download-off'}
+ onClick={() => this.handleToggleDownloadable(item)}
+ />
<Checkbox
ariaLabel={`${intl.formatMessage(intlMessages.setAsCurrentPresentation)} ${item.filename}`}
checked={item.isCurrent}
className={styles.itemAction}
- disabled={disableActions}
keyValue={item.id}
- onChange={this.handleCurrentChange}
+ onChange={() => this.handleCurrentChange(item.id)}
+ disabled={disableActions}
/>
{hideRemove ? null : (
<Button
@@ -634,124 +787,196 @@ class PresentationUploader extends Component {
);
}
- renderPicDropzone() {
+ renderDropzone() {
const {
intl,
fileSizeMin,
fileSizeMax,
+ fileValidMimeTypes,
} = this.props;
const { disableActions } = this.state;
- if (disableActions) return null;
-
- return (
+ if (disableActions && !this.hasError) return null;
+
+ return this.hasError ? (
+ <div>
+ <Button
+ color="danger"
+ onClick={() => this.handleRemove(null, true)}
+ label={intl.formatMessage(intlMessages.clearErrors)}
+ aria-describedby="clearErrorDesc"
+ />
+ <div id="clearErrorDesc" style={{ display: 'none' }}>
+ {intl.formatMessage(intlMessages.clearErrorsDesc)}
+ </div>
+ </div>
+ ) : (
+ // Until the Dropzone package has fixed the mime type hover validation, the rejectClassName
+ // prop is being remove to prevent the error styles from being applied to valid file types.
+ // Error handling is being done in the onDrop prop.
<Dropzone
multiple
className={styles.dropzone}
activeClassName={styles.dropzoneActive}
- rejectClassName={styles.dropzoneReject}
- accept="image/*"
+ accept={fileValidMimeTypes.map(fileValid => fileValid.extension)}
minSize={fileSizeMin}
maxSize={fileSizeMax}
- disablePreview
+ disablepreview="true"
onDrop={this.handleFiledrop}
>
<Icon className={styles.dropzoneIcon} iconName="upload" />
<p className={styles.dropzoneMessage}>
- {intl.formatMessage(intlMessages.dropzoneImagesLabel)}
+ {intl.formatMessage(intlMessages.dropzoneLabel)}
<span className={styles.dropzoneLink}>
- {intl.formatMessage(intlMessages.browseImagesLabel)}
+ {intl.formatMessage(intlMessages.browseFilesLabel)}
</span>
</p>
</Dropzone>
);
}
- renderDropzone() {
+ renderPicDropzone() {
const {
intl,
fileSizeMin,
fileSizeMax,
- fileValidMimeTypes,
} = this.props;
const { disableActions } = this.state;
- if (disableActions) return null;
-
- return (
- // Until the Dropzone package has fixed the mime type hover validation, the rejectClassName
- // prop is being remove to prevent the error styles from being applied to valid file types.
- // Error handling is being done in the onDrop prop.
+ if (disableActions && !this.hasError) return null;
+
+ return this.hasError ? (
+ <div>
+ <Button
+ color="danger"
+ onClick={() => this.handleRemove(null, true)}
+ label={intl.formatMessage(intlMessages.clearErrors)}
+ aria-describedby="clearErrorDesc"
+ />
+ <div id="clearErrorDesc" style={{ display: 'none' }}>
+ {intl.formatMessage(intlMessages.clearErrorsDesc)}
+ </div>
+ </div>
+ ) : (
<Dropzone
multiple
className={styles.dropzone}
activeClassName={styles.dropzoneActive}
- accept={isMobileBrowser ? '' : fileValidMimeTypes.map(fileValid => fileValid.extension)}
+ rejectClassName={styles.dropzoneReject}
+ accept="image/*"
minSize={fileSizeMin}
maxSize={fileSizeMax}
disablepreview="true"
+ data-test="fileUploadDropZone"
onDrop={this.handleFiledrop}
>
- <Icon className={styles.dropzoneIcon} data-test="fileUploadDropZone" iconName="upload" />
+ <Icon className={styles.dropzoneIcon} iconName="upload" />
<p className={styles.dropzoneMessage}>
- {intl.formatMessage(intlMessages.dropzoneLabel)}
+ {intl.formatMessage(intlMessages.dropzoneImagesLabel)}
<span className={styles.dropzoneLink}>
- {intl.formatMessage(intlMessages.browseFilesLabel)}
+ {intl.formatMessage(intlMessages.browseImagesLabel)}
</span>
</p>
</Dropzone>
);
}
- render() {
+ renderPresentationItemStatus(item) {
const { intl } = this.props;
+ if (!item.upload.done && item.upload.progress === 0) {
+ return intl.formatMessage(intlMessages.fileToUpload);
+ }
+
+ if (!item.upload.done && !item.upload.error) {
+ return intl.formatMessage(intlMessages.uploadProcess, {
+ 0: Math.floor(item.upload.progress).toString(),
+ });
+ }
+
+ if (item.upload.done && item.upload.error) {
+ const errorMessage = intlMessages[item.upload.status] || intlMessages.genericError;
+ return intl.formatMessage(errorMessage);
+ }
+
+ if (!item.conversion.done && item.conversion.error) {
+ const errorMessage = intlMessages[item.conversion.status] || intlMessages.genericConversionStatus;
+ return intl.formatMessage(errorMessage);
+ }
+
+ if (!item.conversion.done && !item.conversion.error) {
+ if (item.conversion.pagesCompleted < item.conversion.numPages) {
+ return intl.formatMessage(intlMessages.conversionProcessingSlides, {
+ 0: item.conversion.pagesCompleted,
+ 1: item.conversion.numPages,
+ });
+ }
+
+ const conversionStatusMessage = intlMessages[item.conversion.status]
+ || intlMessages.genericConversionStatus;
+ return intl.formatMessage(conversionStatusMessage);
+ }
+
+ return null;
+ }
+
+ render() {
const {
- preventClosing, disableActions, presentations,
- } = this.state;
+ isOpen, isPresenter, intl,
+ } = this.props;
+ if (!isPresenter) return null;
+ const { presentations, disableActions } = this.state;
+
+ let hasNewUpload = false;
- let awaitingConversion = false;
- presentations.map((presentation) => {
- if (!presentation.conversion.done) awaitingConversion = true;
- return null;
+ presentations.map((item) => {
+ if (item.id.indexOf(item.filename) !== -1 && item.upload.progress === 0) hasNewUpload = true;
});
- const confirmLabel = awaitingConversion
- ? intl.formatMessage(intlMessages.uploadLabel)
- : intl.formatMessage(intlMessages.confirmLabel);
+ return isOpen ? (
+ <div className={styles.modal}>
+ <div
+ className={styles.modalInner}
+ >
+ <div className={styles.modalHeader}>
+ <h1>Presentation</h1>
+ <div className={styles.actionWrapper}>
+ <Button
+ className={styles.dismiss}
+ color="default"
+ onClick={this.handleDismiss}
+ label={intl.formatMessage(intlMessages.dismissLabel)}
+ aria-describedby={intl.formatMessage(intlMessages.dismissDesc)}
+ />
+ <Button
+ className={styles.confirm}
+ color="primary"
+ onClick={() => this.handleConfirm(hasNewUpload)}
+ disabled={disableActions}
+ label={hasNewUpload
+ ? intl.formatMessage(intlMessages.uploadLabel)
+ : intl.formatMessage(intlMessages.confirmLabel)
+ }
+ />
+ </div>
+ </div>
- return (
- <ModalFullscreen
- title={intl.formatMessage(intlMessages.title)}
- preventClosing={preventClosing}
- confirm={{
- callback: this.handleConfirm,
- label: confirmLabel,
- description: intl.formatMessage(intlMessages.confirmDesc),
- disabled: disableActions,
- }}
- dismiss={{
- callback: this.handleDismiss,
- label: intl.formatMessage(intlMessages.dismissLabel),
- description: intl.formatMessage(intlMessages.dismissDesc),
- disabled: disableActions,
- }}
- >
- <p>{intl.formatMessage(intlMessages.message)}</p>
- {this.renderPresentationList()}
- <div className={styles.dropzoneWrapper}>
+ <div className={styles.modalHint}>
+ {`${intl.formatMessage(intlMessages.message)}`}
+ </div>
+ {this.renderPresentationList()}
{isMobileBrowser ? this.renderPicDropzone() : null}
{this.renderDropzone()}
</div>
- </ModalFullscreen>
- );
+ </div>
+ ) : null;
}
}
PresentationUploader.propTypes = propTypes;
PresentationUploader.defaultProps = defaultProps;
-export default withModalMounter(injectIntl(PresentationUploader));
+export default injectIntl(PresentationUploader);
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/container.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/container.jsx
index 8f94ee6ad73745b355aa438885de0dcb28c0f2bb..b4e0575517a1da963900b61a6abb98aef8cc4bd7 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/container.jsx
@@ -1,15 +1,15 @@
import React from 'react';
+import { Meteor } from 'meteor/meteor';
import { withTracker } from 'meteor/react-meteor-data';
-
import Service from './service';
-import PresentationUploader from './component';
+import PresentationService from '../service';
+import Uploader from './component';
+
+const PRESENTATION_CONFIG = Meteor.settings.public.presentation;
-const PresentationUploaderContainer = props => (
- <PresentationUploader {...props} />
-);
+const UploaderContainer = props => <Uploader {...props} />;
export default withTracker(() => {
- const PRESENTATION_CONFIG = Meteor.settings.public.presentation;
const currentPresentations = Service.getPresentations();
const {
dispatchDisableDownloadable,
@@ -23,7 +23,6 @@ export default withTracker(() => {
fileSizeMin: PRESENTATION_CONFIG.uploadSizeMin,
fileSizeMax: PRESENTATION_CONFIG.uploadSizeMax,
fileValidMimeTypes: PRESENTATION_CONFIG.uploadValidMimeTypes,
- allowDownloadable: PRESENTATION_CONFIG.allowDownloadable,
handleSave: presentations => Service.persistPresentationChanges(
currentPresentations,
presentations,
@@ -33,5 +32,8 @@ export default withTracker(() => {
dispatchDisableDownloadable,
dispatchEnableDownloadable,
dispatchTogglePresentationDownloadable,
+ isOpen: Session.get('showUploadPresentationView') || false,
+ selectedToBeNextCurrent: Session.get('selectedToBeNextCurrent') || null,
+ isPresenter: PresentationService.isPresenter('DEFAULT_PRESENTATION_POD'),
};
-})(PresentationUploaderContainer);
+})(UploaderContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/styles.scss b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/styles.scss
index e1ba89b2943b97795397502046bb10be2690c0bb..147a7fee2fe0f8e16bf4722abb985e43080438a3 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/styles.scss
@@ -1,11 +1,29 @@
-@import "../../../stylesheets/variables/_all";
-@import "../../../stylesheets/mixins/_scrollable";
+@import "/imports/ui/stylesheets/variables/_all";
+@import "/imports/ui/stylesheets/mixins/_scrollable";
+
+:root {
+ --uploadIconSize: 2.286rem;
+ --statusIconSize: 16px;
+ --statusInfoHeight: 8px;
+ --toast-md-margin: .5rem;
+ --iconLineHeight: 2.35rem;
+ --iconPadding-md: .65rem;
+ --fileLineWidth: 16.75rem;
+ --itemActionsWidth: 68px; // size of the 2 icons (check/trash)
+ --uploadListHeight: 30vh;
+ --modalInnerWidth: 37.5rem;
+}
@keyframes bar-stripes {
from { background-position: 1rem 0; }
to { background-position: 0 0; }
}
+@keyframes rotate {
+ 0% { transform: rotate(0); }
+ 100% { transform: rotate(360deg); }
+}
+
.visuallyHidden {
position: absolute;
overflow: hidden;
@@ -16,10 +34,15 @@
.fileList {
@include scrollbox-vertical();
- max-height: 35vh;
+ height: 100%;
+ max-height: var(--uploadListHeight);
+ padding: 1px;
+ margin-bottom: 2rem;
+ overflow-x: hidden;
}
.table {
+ position: relative;
width: 100%;
border-spacing: 0;
border-collapse: collapse;
@@ -71,7 +94,7 @@
}
.tableItemActions {
- min-width: 68px; // size of the 2 icons (check/trash)
+ min-width: var(--itemActionsWidth);
text-align: left;
[dir="rtl"] & {
@@ -79,10 +102,6 @@
}
}
-.notDownloadable {
- min-width: 48px;
-}
-
.tableItemIcon > i {
font-size: 1.35rem;
}
@@ -161,6 +180,7 @@
}
.itemAction {
+ margin-left: var(--sm-padding-x);
div > i {
margin-top: .25rem;
}
@@ -169,7 +189,7 @@
.itemAction,
.itemAction > i {
display: inline-block;
- border: none;
+ border: 0;
background: transparent;
cursor: pointer;
font-size: 1.35rem;
@@ -192,7 +212,6 @@
& > i:focus,
& > i:hover {
color: var(--color-danger) !important;
- background-color: transparent;
}
&[aria-disabled="true"] {
@@ -215,7 +234,8 @@
.dropzone {
flex: auto;
- border: 2px dashed;
+ border: var(--border-size) dashed var(--color-gray);
+ color: var(--color-gray);
border-radius: var(--border-radius);
padding: calc(var(--lg-padding-y) * 2.5) var(--lg-padding-x);
text-align: center;
@@ -256,3 +276,225 @@
border-radius: .25em;
text-transform: uppercase;
}
+
+.uploadIcon {
+ background-color: var(--color-primary);
+ color: var(--color-white);
+ height: var(--uploadIconSize);
+ width: var(--uploadIconSize);
+ border-radius: 50%;
+ font-size: 135%;
+ line-height: var(--iconLineHeight);
+ margin-right: var(--sm-padding-x);
+
+ [dir="rtl"] & {
+ margin-left: var(--sm-padding-x);
+ margin-right: 0;
+ }
+}
+
+.uploadToastTitle {
+ position: fixed;
+ font-weight: 600;
+ margin-top: var(--toast-md-margin);
+}
+
+.uploadToastHeader {
+ position: relative;
+ margin-bottom: var(--toast-md-margin);
+ padding-bottom: var(--sm-padding-x);
+ border-bottom: 1px var(--color-gray-separator) solid;
+}
+
+.toastFileName {
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ height: 1.25rem !important;
+}
+
+.toastFileName,
+.fileName {
+ margin-left: var(--lg-padding-x);
+ top: var(--border-size-large);
+ height: 1rem;
+ width: auto;
+ position: relative;
+ text-align: left;
+ font-weight: var(--headings-font-weight);
+
+ [dir="rtl"] & {
+ margin-right: var(--lg-padding-x);
+ margin-left: 0;
+ text-align: right;
+ }
+}
+
+.fileIcon {
+ width: 1%;
+ padding-bottom: var(--iconPadding-md);
+ i {
+ position: relative;
+ top: var(--border-size-large);
+ }
+}
+
+.loading {
+ color: var(--color-gray-lightest);
+ border: 1px solid;
+ border-radius: 50%;
+ border-right-color: var(--color-gray);
+ animation: rotate 1s linear infinite;
+}
+
+.done {
+ color: var(--color-success);
+}
+
+.err {
+ color: var(--color-danger);
+}
+
+.loading,
+.done,
+.err{
+ position: relative;
+ width: var(--statusIconSize);
+ height: var(--statusIconSize);
+ font-size: 117%;
+ bottom: var(--border-size);
+ left: var(--statusInfoHeight);
+}
+
+.uploadRow {
+ display: flex;
+ flex-direction: column;
+ margin-bottom: var(--statusInfoHeight);
+ margin-top: var(--statusInfoHeight);
+}
+
+.textErr,
+.textInfo {
+ font-size: 70%;
+}
+
+.textErr {
+ display: inline-block;
+ color: var(--color-danger);
+}
+
+.statusInfo {
+ padding: 0;
+ bottom: var(--toast-md-margin);
+ position: relative;
+ left: var(--border-size-large);
+ max-height: var(--statusInfoHeight);
+ height: var(--statusInfoHeight);
+
+ [dir="rtl"] & {
+ right: var(--border-size-large);
+ left: 0;
+ }
+}
+
+.fileLine {
+ display: flex;
+ flex-direction: row;
+ width: var(--fileLineWidth);
+}
+
+.statusIcon {
+ margin-left: auto;
+ [dir="rtl"] & {
+ margin-right: auto;
+ margin-left: 0;
+ }
+
+ i {
+ position: relative;
+ top: 1px;
+ height: var(--statusIconSize);
+ width: var(--statusIconSize);
+ }
+}
+
+.modal {
+ background-color: white;
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 1300;
+}
+
+.modalInner {
+ margin-left: auto;
+ margin-right: auto;
+ width: var(--modalInnerWidth);
+ max-height: 100%;
+ max-width: 100%;
+ padding-bottom: .75rem;
+ overflow-y: auto;
+
+ @include mq($small-only) {
+ padding-left: var(--statusInfoHeight);
+ padding-right: var(--statusInfoHeight);
+ }
+}
+
+.modalHeader {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ border-bottom: var(--border-size) solid var(--color-gray-lighter);
+ margin-bottom: 2rem;
+
+ h1 {
+ font-weight: var(--modal-title-fw);
+ }
+
+ div {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ }
+}
+
+.modalHint {
+ margin-bottom: 2rem;
+ color: var(--color-text);
+ font-weight: normal;
+}
+
+.actionWrapper {
+ display: flex;
+ align-items: center;
+}
+
+.confirm,
+.dismiss {
+ width: 6rem;
+ height: 1.875rem;
+}
+
+.dismiss {
+ margin-right: var(--toast-md-margin);
+}
+
+.innerToast {
+ @include scrollbox-vertical();
+ position: relative;
+ width: 100%;
+ height: 100%;
+ max-height: var(--uploadListHeight);
+ overflow-y: auto;
+ padding-right: 1rem;
+ box-sizing: content-box;
+ background: none;
+}
+
+.toastWrapper {
+ max-height: 50%;
+ width: var(--fileLineWidth);
+}
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/styles.scss b/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
index d7efec3bc5d2f1fe856e3ca6c5ddc5eb6f650db7..fdf85c3c894c8b633929d5d47f64bd5c9887e988 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
@@ -4,6 +4,7 @@
:root {
--innerToastWidth: 17rem;
--iconWrapperSize: 2rem;
+ --toast-icon-side: 40px;
}
.enter {
@@ -93,14 +94,17 @@
}
.innerToastWrapper {
- display: flex;
- flex-direction: row;
width: var(--innerToastWidth);
}
.toastTextContent {
position: relative;
overflow: hidden;
+ margin-top: var(--sm-padding-y);
+
+ > div:first-of-type {
+ font-weight: bold;
+ }
}
.presentationName {
@@ -108,6 +112,13 @@
overflow: hidden;
}
+.toastMessage {
+ font-size: var(--font-size-small);
+ margin-top: var(--toast-margin);
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
.toastIcon {
margin-right: var(--sm-padding-x);
[dir="rtl"] & {
@@ -118,21 +129,37 @@
.iconWrapper {
background-color: var(--color-primary);
- width: var(--iconWrapperSize);
- height: var(--iconWrapperSize);
+ width: var(--toast-icon-side);
+ height: var(--toast-icon-side);
border-radius: 50%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
> i {
position: relative;
- left: var(--md-padding-y);
- top: var(--sm-padding-y);
- font-size: var(--font-size-base);
color: var(--color-white);
+ font-size: var(--font-size-larger);
+ }
+}
+
+.toastDownload {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
- [dir="rtl"] & {
- left: 0;
- right: var(--md-padding-y);
- }
+ a {
+ color: var(--color-primary);
+ cursor: pointer;
+ text-decoration: none;
+
+ &:focus,
+ &:hover,
+ &:active {
+ color: var(--color-primary);
+ box-shadow: 0;
+ }
}
}
diff --git a/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx b/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
index 3781cbab9c23bf85b8cd8fb16dc3347f4f2974de..5c3e45860b42b8f12240ffa061acb669d0a28893 100755
--- a/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
@@ -59,8 +59,14 @@ class ScreenshareComponent extends React.Component {
componentWillUnmount() {
const {
- presenterScreenshareHasEnded, unshareScreen,
+ presenterScreenshareHasEnded,
+ unshareScreen,
+ getSwapLayout,
+ shouldEnableSwapLayout,
+ toggleSwapLayout,
} = this.props;
+ const layoutSwapped = getSwapLayout() && shouldEnableSwapLayout();
+ if (layoutSwapped) toggleSwapLayout();
presenterScreenshareHasEnded();
unshareScreen();
this.screenshareContainer.removeEventListener('fullscreenchange', this.onFullscreenChange);
@@ -170,7 +176,10 @@ class ScreenshareComponent extends React.Component {
<video
id="screenshareVideo"
key="screenshareVideo"
- style={{ maxHeight: '100%', width: '100%' }}
+ style={{
+ maxHeight: '100%',
+ width: '100%',
+ }}
playsInline
onLoadedData={this.onVideoLoad}
ref={(ref) => { this.videoTag = ref; }}
diff --git a/bigbluebutton-html5/imports/ui/components/screenshare/container.jsx b/bigbluebutton-html5/imports/ui/components/screenshare/container.jsx
index dff5bf6cfd706223bc0b4b8f0ab8539edd1c8a86..699204b1365376479d816218d24c5029af3148be 100755
--- a/bigbluebutton-html5/imports/ui/components/screenshare/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/screenshare/container.jsx
@@ -2,6 +2,7 @@ import React from 'react';
import { withTracker } from 'meteor/react-meteor-data';
import Users from '/imports/api/users/';
import Auth from '/imports/ui/services/auth';
+import MediaService, { getSwapLayout, shouldEnableSwapLayout } from '/imports/ui/components/media/service';
import {
isVideoBroadcasting, presenterScreenshareHasEnded, unshareScreen,
presenterScreenshareHasStarted,
@@ -24,5 +25,8 @@ export default withTracker(() => {
isVideoBroadcasting,
presenterScreenshareHasStarted,
presenterScreenshareHasEnded,
+ getSwapLayout,
+ shouldEnableSwapLayout,
+ toggleSwapLayout: MediaService.toggleSwapLayout,
};
})(ScreenshareContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/settings/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/component.jsx
index 83ea1bbbff2fda0d48431043dcfd634915896a9a..dc16059efee8e7ebf4787bc13255c026d0220636 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/component.jsx
@@ -109,7 +109,7 @@ class Settings extends Component {
this.handleSelectTab = this.handleSelectTab.bind(this);
}
- componentWillMount() {
+ componentDidMount() {
const { availableLocales } = this.props;
availableLocales.then((locales) => {
this.setState({ availableLocales: locales });
@@ -131,6 +131,7 @@ class Settings extends Component {
renderModalContent() {
const {
intl,
+ isModerator,
} = this.props;
const {
@@ -194,6 +195,7 @@ class Settings extends Component {
<Notification
handleUpdateSettings={this.handleUpdateSettings}
settings={current.application}
+ {...{ isModerator }}
/>
</TabPanel>
{/* <TabPanel className={styles.tabPanel}> */}
diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
index 1b1219f04326fe6f6f46a933fdc48d8db7117f78..daf223ffd33d2d2956dfed6307960cf74c026385 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
@@ -68,6 +68,7 @@ class ApplicationMenu extends BaseMenu {
settings: props.settings,
isLargestFontSize: false,
isSmallestFontSize: false,
+ showSelect: false,
fontSizes: [
'12px',
'14px',
@@ -82,6 +83,17 @@ class ApplicationMenu extends BaseMenu {
this.setInitialFontSize();
}
+ componentDidUpdate() {
+ const { availableLocales } = this.props;
+
+ if (availableLocales && availableLocales.length > 0) {
+ // I used setTimout to create a smooth animation transition
+ setTimeout(() => this.setState({
+ showSelect: true,
+ }), 500);
+ }
+ }
+
setInitialFontSize() {
const { fontSizes } = this.state;
const clientFont = document.getElementsByTagName('html')[0].style.fontSize;
@@ -143,7 +155,7 @@ class ApplicationMenu extends BaseMenu {
render() {
const { availableLocales, intl } = this.props;
- const { isLargestFontSize, isSmallestFontSize, settings } = this.state;
+ const { isLargestFontSize, isSmallestFontSize, settings, showSelect } = this.state;
// conversions can be found at http://pxtoem.com
const pixelPercentage = {
@@ -201,7 +213,7 @@ class ApplicationMenu extends BaseMenu {
</div>
<div className={styles.col}>
<span className={cx(styles.formElement, styles.pullContentRight)}>
- {availableLocales && availableLocales.length > 0 ? (
+ {showSelect ? (
<select
id="langSelector"
defaultValue={this.state.settings.locale}
@@ -216,7 +228,15 @@ class ApplicationMenu extends BaseMenu {
</option>
))}
</select>
- ) : null}
+ )
+ : (
+ <div className={styles.spinnerOverlay}>
+ <div className={styles.bounce1} />
+ <div className={styles.bounce2} />
+ <div />
+ </div>
+ )
+ }
</span>
</div>
</div>
diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/notification/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/notification/component.jsx
index ba464556cd5acd3dd4c5aaa83f003e985ea69f92..8b6974857d9cfe31a6adfdd3e22ea7c4648bf398 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/submenus/notification/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/notification/component.jsx
@@ -49,7 +49,7 @@ class NotificationMenu extends BaseMenu {
}
render() {
- const { intl } = this.props;
+ const { intl, isModerator } = this.props;
const { settings } = this.state;
return (
@@ -130,33 +130,35 @@ class NotificationMenu extends BaseMenu {
</div>
</div>
- <div className={styles.row}>
- <div className={styles.col}>
- <label className={styles.label}>
- {intl.formatMessage(intlMessages.raiseHandLabel)}
- </label>
- </div>
- <div className={styles.col}>
- <div className={cx(styles.formElement, styles.pullContentCenter)}>
- <Toggle
- icons={false}
- defaultChecked={settings.raiseHandAudioAlerts}
- onChange={() => this.handleToggle('raiseHandAudioAlerts')}
- ariaLabel={`${intl.formatMessage(intlMessages.raiseHandLabel)} ${intl.formatMessage(intlMessages.audioAlertLabel)}`}
- />
+ {isModerator ? (
+ <div className={styles.row}>
+ <div className={styles.col}>
+ <label className={styles.label}>
+ {intl.formatMessage(intlMessages.raiseHandLabel)}
+ </label>
</div>
- </div>
- <div className={styles.col}>
- <div className={cx(styles.formElement, styles.pullContentCenter)}>
- <Toggle
- icons={false}
- defaultChecked={settings.raiseHandPushAlerts}
- onChange={() => this.handleToggle('raiseHandPushAlerts')}
- ariaLabel={`${intl.formatMessage(intlMessages.raiseHandLabel)} ${intl.formatMessage(intlMessages.pushAlertLabel)}`}
- />
+ <div className={styles.col}>
+ <div className={cx(styles.formElement, styles.pullContentCenter)}>
+ <Toggle
+ icons={false}
+ defaultChecked={settings.raiseHandAudioAlerts}
+ onChange={() => this.handleToggle('raiseHandAudioAlerts')}
+ ariaLabel={`${intl.formatMessage(intlMessages.raiseHandLabel)} ${intl.formatMessage(intlMessages.audioAlertLabel)}`}
+ />
+ </div>
+ </div>
+ <div className={styles.col}>
+ <div className={cx(styles.formElement, styles.pullContentCenter)}>
+ <Toggle
+ icons={false}
+ defaultChecked={settings.raiseHandPushAlerts}
+ onChange={() => this.handleToggle('raiseHandPushAlerts')}
+ ariaLabel={`${intl.formatMessage(intlMessages.raiseHandLabel)} ${intl.formatMessage(intlMessages.pushAlertLabel)}`}
+ />
+ </div>
</div>
</div>
- </div>
+ ) : null}
</div>
</div>
diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/styles.scss b/bigbluebutton-html5/imports/ui/components/settings/submenus/styles.scss
index 250006c8e40ad43f013df9d858760c2aa36179fe..c30f8ddd5960524ec5baca2e7b648470b03de782 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/submenus/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/styles.scss
@@ -1,6 +1,7 @@
@import '/imports/ui/stylesheets/mixins/focus';
@import '/imports/ui/stylesheets/mixins/_indicators';
@import '/imports/ui/stylesheets/variables/_all';
+@import '/imports/ui/components/loading-screen/styles';
.title {
color: var(--color-gray-dark);
@@ -122,3 +123,10 @@
margin: 0 1rem 0 0;
}
}
+
+.spinnerOverlay {
+ @extend .spinner;
+ & > div {
+ background-color: black;
+ }
+}
diff --git a/bigbluebutton-html5/imports/ui/components/shortcut-help/service.jsx b/bigbluebutton-html5/imports/ui/components/shortcut-help/service.jsx
index 4449ba56af842aae1fbc2b855cbb94823512af0a..a0e983d71d5ff596fed217d94e54004e4f3bedf9 100644
--- a/bigbluebutton-html5/imports/ui/components/shortcut-help/service.jsx
+++ b/bigbluebutton-html5/imports/ui/components/shortcut-help/service.jsx
@@ -25,7 +25,7 @@ const withShortcutHelper = (WrappedComponent, param) => (props) => {
shortcuts = shortcuts
.filter(el => param.map(p => p.toLowerCase()).includes(el.descId.toLowerCase()))
.reduce((acc, current) => {
- acc[current.descId] = current.accesskey;
+ acc[current.descId.toLowerCase()] = current.accesskey;
return acc;
}, {});
}
diff --git a/bigbluebutton-html5/imports/ui/components/status-notifier/component.jsx b/bigbluebutton-html5/imports/ui/components/status-notifier/component.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..78f822c1fbe5b18ebf25412fd42eed9c66ca32fa
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/status-notifier/component.jsx
@@ -0,0 +1,193 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl } from 'react-intl';
+import { toast } from 'react-toastify';
+import Icon from '/imports/ui/components/icon/component';
+import Button from '/imports/ui/components/button/component';
+import { ENTER } from '/imports/utils/keyCodes';
+import toastStyles from '/imports/ui/components/toast/styles';
+import { styles } from './styles';
+
+const messages = defineMessages({
+ lowerHandsLabel: {
+ id: 'app.statusNotifier.lowerHands',
+ description: 'text displayed to clear all raised hands',
+ },
+ raisedHandsTitle: {
+ id: 'app.statusNotifier.raisedHandsTitle',
+ description: 'heading for raised hands toast',
+ },
+ raisedHandDesc: {
+ id: 'app.statusNotifier.raisedHandDesc',
+ description: 'label for user with raised hands',
+ },
+ and: {
+ id: 'app.statusNotifier.and',
+ description: 'used as conjunction word',
+ },
+});
+
+const MAX_AVATAR_COUNT = 3;
+
+class StatusNotifier extends Component {
+ constructor(props) {
+ super(props);
+
+ this.statusNotifierId = null;
+
+ this.audio = new Audio(`${Meteor.settings.public.app.cdn + Meteor.settings.public.app.basename}/resources/sounds/bbb-handRaise.mp3`);
+
+ this.renderRaisedHands = this.renderRaisedHands.bind(this);
+ this.getRaisedHandNames = this.getRaisedHandNames.bind(this);
+ this.raisedHandAvatars = this.raisedHandAvatars.bind(this);
+ }
+
+ componentDidUpdate(prevProps) {
+ const {
+ emojiUsers, raiseHandAudioAlert, raiseHandPushAlert, status, isViewer,
+ } = this.props;
+
+ if (isViewer) {
+ if (this.statusNotifierId) toast.dismiss(this.statusNotifierId);
+ return false;
+ }
+
+ switch (status) {
+ case 'raiseHand':
+ if (emojiUsers.length === 0) return toast.dismiss(this.statusNotifierId);
+
+ if (raiseHandAudioAlert && emojiUsers.length > prevProps.emojiUsers.length) {
+ this.audio.play();
+ }
+
+ if (raiseHandPushAlert) {
+ if (this.statusNotifierId) {
+ return toast.update(this.statusNotifierId, {
+ render: this.renderRaisedHands(),
+ });
+ }
+
+ this.statusNotifierId = toast(this.renderRaisedHands(), {
+ onClose: () => { this.statusNotifierId = null; },
+ autoClose: false,
+ closeOnClick: false,
+ closeButton: false,
+ className: toastStyles.actionToast,
+ });
+ }
+ break;
+ default:
+ break;
+ }
+
+ return true;
+ }
+
+ getRaisedHandNames() {
+ const { emojiUsers, intl } = this.props;
+ if (emojiUsers.length === 0) return '';
+
+ const _names = emojiUsers.map(u => u.name);
+ const { length } = _names;
+ const and = intl.formatMessage(messages.and);
+ let formattedNames = '';
+
+ switch (length) {
+ case 1:
+ formattedNames = _names;
+ break;
+ case 2:
+ formattedNames = _names.join(` ${and} `);
+ break;
+ case 3:
+ formattedNames = _names.slice(0, length - 1).join(', ');
+ formattedNames += ` ${and} ${_names.slice(length - 1)}`;
+ break;
+ default:
+ formattedNames = _names.slice(0, MAX_AVATAR_COUNT).join(', ');
+ formattedNames += ` ${and} ${length - MAX_AVATAR_COUNT}+ `;
+ break;
+ }
+
+ return intl.formatMessage(messages.raisedHandDesc, { 0: formattedNames });
+ }
+
+ raisedHandAvatars() {
+ const { emojiUsers, clearUserStatus } = this.props;
+ let users = emojiUsers;
+ if (emojiUsers.length > MAX_AVATAR_COUNT) users = users.slice(0, MAX_AVATAR_COUNT);
+
+ const avatars = users.map(u => (
+ <div
+ role="button"
+ tabIndex={0}
+ className={styles.avatar}
+ style={{ backgroundColor: `${u.color}` }}
+ onClick={() => clearUserStatus(u.userId)}
+ onKeyDown={e => (e.keyCode === ENTER ? clearUserStatus(u.userId) : null)}
+ key={`statusToastAvatar-${u.userId}`}
+ >
+ {u.name.slice(0, 2)}
+ </div>
+ ));
+
+ if (emojiUsers.length > MAX_AVATAR_COUNT) {
+ avatars.push(
+ <div
+ className={styles.avatarsExtra}
+ key={`statusToastAvatar-${emojiUsers.length}`}
+ >
+ {emojiUsers.length}
+ </div>,
+ );
+ }
+
+ return avatars;
+ }
+
+ renderRaisedHands() {
+ const { emojiUsers, intl, clearUserStatus } = this.props;
+ const formattedRaisedHands = this.getRaisedHandNames();
+ return (
+ <div>
+ <div className={styles.toastIcon}>
+ <div className={styles.iconWrapper}>
+ <Icon iconName="hand" />
+ </div>
+ </div>
+ <div className={styles.avatarsWrapper}>
+ {this.raisedHandAvatars()}
+ </div>
+ <div className={styles.toastMessage}>
+ <div>{intl.formatMessage(messages.raisedHandsTitle)}</div>
+ {formattedRaisedHands}
+ </div>
+ <div className={toastStyles.separator} />
+ <Button
+ className={styles.clearBtn}
+ label={intl.formatMessage(messages.lowerHandsLabel)}
+ color="default"
+ size="md"
+ onClick={() => {
+ emojiUsers.map(u => clearUserStatus(u.userId));
+ }}
+ />
+ </div>
+ );
+ }
+
+ render() { return null; }
+}
+
+export default injectIntl(StatusNotifier);
+
+StatusNotifier.propTypes = {
+ intl: PropTypes.shape({
+ formatMessage: PropTypes.func.isRequired,
+ }).isRequired,
+ clearUserStatus: PropTypes.func.isRequired,
+ emojiUsers: PropTypes.instanceOf(Array).isRequired,
+ status: PropTypes.string.isRequired,
+ raiseHandAudioAlert: PropTypes.bool.isRequired,
+ raiseHandPushAlert: PropTypes.bool.isRequired,
+};
diff --git a/bigbluebutton-html5/imports/ui/components/status-notifier/container.jsx b/bigbluebutton-html5/imports/ui/components/status-notifier/container.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..ab6d34f43441cbe8ebf43faaea604bd0fee58940
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/status-notifier/container.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { withTracker } from 'meteor/react-meteor-data';
+import Auth from '/imports/ui/services/auth';
+import Users from '/imports/api/users';
+import Settings from '/imports/ui/services/settings';
+import { makeCall } from '/imports/ui/services/api';
+import StatusNotifier from './component';
+
+const ROLE_VIEWER = Meteor.settings.public.user.role_viewer;
+
+const StatusNotifierContainer = ({ ...props }) => <StatusNotifier {...props} />;
+
+export default withTracker((props) => {
+ const AppSettings = Settings.application;
+ const currentUser = Users.findOne({ userId: Auth.userID }, { fields: { userId: 1, role: 1 } });
+ const { status } = props;
+ const emojiUsers = Users.find({ meetingId: Auth.meetingID, emoji: status }, {
+ fields: {
+ emojiTime: 1, emoji: 1, userId: 1, name: 1, color: 1,
+ },
+ })
+ .fetch()
+ .filter(u => u.emoji === status && u.userId !== currentUser.userId);
+ const clearUserStatus = userId => makeCall('setEmojiStatus', userId, 'none');
+
+ return {
+ isViewer: currentUser.role === ROLE_VIEWER,
+ clearUserStatus,
+ emojiUsers,
+ status,
+ raiseHandAudioAlert: AppSettings.raiseHandAudioAlerts,
+ raiseHandPushAlert: AppSettings.raiseHandPushAlerts,
+ };
+})(StatusNotifierContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/status-notifier/styles.scss b/bigbluebutton-html5/imports/ui/components/status-notifier/styles.scss
new file mode 100644
index 0000000000000000000000000000000000000000..d5f4978fdcc6aa48bc4f341695ddb773d6d2b84c
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/status-notifier/styles.scss
@@ -0,0 +1,112 @@
+@import "/imports/ui/stylesheets/variables/_all";
+@import "/imports/ui/stylesheets/mixins/_indicators";
+
+:root {
+ --iconWrapperSize: 40px;
+ --innerToastWidth: 17rem;
+ --toast-margin: .5rem;
+ --toast-icon-side: 40px;
+ --avatar-side: 34px;
+ --avatar-wrapper-offset: 14px;
+ --avatar-inset: -7px;
+}
+
+.clearBtn {
+ position: relative;
+ width: 100%;
+ margin-top: var(--toast-margin);
+ color: var(--color-primary);
+
+ &:focus,
+ &:hover,
+ &:active {
+ color: var(--color-primary);
+ box-shadow: 0;
+ }
+}
+
+.separator {
+ position: relative;
+ width: 100%;
+ height: var(--border-size-small);
+ background-color: var(--color-gray-lighter);
+ margin-top: var(--toast-margin);
+ margin-bottom: var(--toast-margin);
+}
+
+.toastMessage {
+ font-size: var(--font-size-small);
+ margin-top: var(--toast-margin);
+
+ > div {
+ font-weight: bold;
+ }
+}
+
+.toastIcon {
+ margin-right: var(--sm-padding-x);
+ [dir="rtl"] & {
+ margin-right: 0;
+ margin-left: var(--sm-padding-x);
+ }
+}
+
+.avatarsWrapper {
+ display: flex;
+ flex-direction: row;
+ position: absolute;
+ top: var(--avatar-wrapper-offset);
+ right: 1rem;
+ left: auto;
+
+ [dir="rtl"] & {
+ left: var(--jumbo-padding-y);
+ right: auto;
+ }
+}
+
+.avatarsExtra {
+ background-color: var(--color-gray-light);
+}
+
+.avatar {
+ cursor: pointer;
+}
+
+.avatarsExtra,
+.avatar {
+ @include highContrastOutline();
+ width: var(--avatar-side);
+ height: var(--avatar-side);
+ color: var(--color-white);
+ border-radius: 50%;
+ border: solid var(--border-size) var(--color-white);
+ margin-left: var(--avatar-inset);
+ text-align: center;
+ padding: 5px 0;
+}
+
+.avatar:hover,
+.avatar:focus {
+ border: solid var(--border-size) var(--color-gray-lighter);
+}
+
+.iconWrapper {
+ background-color: var(--color-primary);
+ width: var(--toast-icon-side);
+ height: var(--toast-icon-side);
+ border-radius: 50%;
+
+ > i {
+ position: relative;
+ color: var(--color-white);
+ top: var(--toast-margin);
+ left: var(--toast-margin);
+ font-size: var(--font-size-xl);
+
+ [dir="rtl"] & {
+ left: 0;
+ right: 10px;
+ }
+ }
+}
diff --git a/bigbluebutton-html5/imports/ui/components/subscriptions/component.jsx b/bigbluebutton-html5/imports/ui/components/subscriptions/component.jsx
index 2ba28e04d46def1693ec70e147384e135c528ec8..2f9d5de2169c0b69034f20cc0c43389bc2c4223f 100755
--- a/bigbluebutton-html5/imports/ui/components/subscriptions/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/subscriptions/component.jsx
@@ -4,6 +4,7 @@ import Auth from '/imports/ui/services/auth';
import logger from '/imports/startup/client/logger';
import GroupChat from '/imports/api/group-chat';
import Annotations from '/imports/api/annotations';
+import Users from '/imports/api/users';
import AnnotationsTextService from '/imports/ui/components/whiteboard/annotations/text/service';
import { Annotations as AnnotationsLocal } from '/imports/ui/components/whiteboard/service';
@@ -18,7 +19,7 @@ const SUBSCRIPTIONS = [
'voiceUsers', 'whiteboard-multi-user', 'screenshare', 'group-chat',
'presentation-pods', 'users-settings', 'guestUser', 'users-infos', 'note', 'meeting-time-remaining',
'network-information', 'ping-pong', 'local-settings', 'users-typing', 'record-meetings', 'video-streams',
- 'voice-call-states', 'breakouts',
+ 'connection-status', 'voice-call-states',
];
class Subscriptions extends Component {
@@ -44,6 +45,8 @@ export default withTracker(() => {
};
}
+ const currentUser = Users.findOne({ intId: requesterUserId }, { fields: { role: 1 } });
+
const subscriptionErrorHandler = {
onError: (error) => {
logger.error({
@@ -58,14 +61,16 @@ export default withTracker(() => {
if ((!TYPING_INDICATOR_ENABLED && name.indexOf('typing') !== -1)
|| (!CHAT_ENABLED && name.indexOf('chat') !== -1)) return;
- return Meteor.subscribe(
- name,
- subscriptionErrorHandler,
- );
+ return Meteor.subscribe(name, subscriptionErrorHandler);
});
+ if (currentUser) {
+ subscriptionsHandlers.push(Meteor.subscribe('meetings', currentUser.role, subscriptionErrorHandler));
+ subscriptionsHandlers.push(Meteor.subscribe('users', currentUser.role, subscriptionErrorHandler));
+ subscriptionsHandlers.push(Meteor.subscribe('breakouts', currentUser.role, subscriptionErrorHandler));
+ }
+
let groupChatMessageHandler = {};
- // let annotationsHandler = {};
if (CHAT_ENABLED) {
const chats = GroupChat.find({
diff --git a/bigbluebutton-html5/imports/ui/components/toast/styles.scss b/bigbluebutton-html5/imports/ui/components/toast/styles.scss
index 87c738630089ef47fab7fc5aea4cac98fef1ca6e..5749ed0116b3152eb3b060cb91d6f1155aeec3f3 100755
--- a/bigbluebutton-html5/imports/ui/components/toast/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/toast/styles.scss
@@ -144,20 +144,28 @@
}
}
-.toast {
+.toast ,
+.actionToast {
position: relative;
margin-bottom: var(--sm-padding-x);
- padding: var(--md-padding-x);
+ padding: var(--sm-padding-x);
border-radius: var(--border-radius);
box-shadow: 0 var(--border-size-small) 10px 0 rgba(0, 0, 0, 0.1), 0 var(--border-size) 15px 0 rgba(0, 0, 0, 0.05);
display: flex;
justify-content: space-between;
- cursor: pointer;
color: var(--color-text);
- background-color: var(--background);
+ -webkit-animation-duration: 0.75s;
animation-duration: 0.75s;
+ -webkit-animation-fill-mode: both;
animation-fill-mode: both;
max-width: var(--toast-max-width);
+ min-width: var(--toast-max-width);
+ width: var(--toast-max-width);
+}
+
+.toast {
+ cursor: pointer;
+ background-color: var(--background);
&:hover,
&:focus {
@@ -165,6 +173,14 @@
}
}
+.actionToast {
+ background-color: var(--color-white);
+
+ i.close {
+ left: none !important;
+ }
+}
+
.body {
margin: auto auto;
flex: 1;
diff --git a/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx b/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
index ee8ab37bf02d272313e68aa1723dbccd36d8df68..83438a888ebb2650bc5e207b40945ba477b7bb21 100755
--- a/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
@@ -16,7 +16,7 @@ const ANIMATION_NONE = 'none';
const TIP_OFFSET = '0, 10';
const propTypes = {
- title: PropTypes.string.isRequired,
+ title: PropTypes.string,
position: PropTypes.oneOf(['bottom']),
children: PropTypes.element.isRequired,
className: PropTypes.string,
@@ -25,6 +25,7 @@ const propTypes = {
const defaultProps = {
position: 'bottom',
className: null,
+ title: '',
};
class Tooltip extends Component {
@@ -69,7 +70,7 @@ class Tooltip extends Component {
componentDidUpdate() {
const { animations } = Settings.application;
- const { title } = this.props;
+ const { title, fullscreen } = this.props;
const elements = document.querySelectorAll('[id^="tippy-"]');
Array.from(elements).filter((e) => {
@@ -93,7 +94,8 @@ class Tooltip extends Component {
});
const elem = document.getElementById(this.tippySelectorId);
- if (elem._tippy) elem._tippy.setProps({ content: title });
+ const opts = { content: title, appendTo: fullscreen || document.body };
+ if (elem && elem._tippy) elem._tippy.setProps(opts);
}
onShow() {
diff --git a/bigbluebutton-html5/imports/ui/components/tooltip/container.jsx b/bigbluebutton-html5/imports/ui/components/tooltip/container.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..c83bce9be62a38bc4597d4473613772e81c6b51c
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/tooltip/container.jsx
@@ -0,0 +1,10 @@
+import React from 'react';
+import { withTracker } from 'meteor/react-meteor-data';
+import FullscreenService from '/imports/ui/components/fullscreen-button/service';
+import Tooltip from './component';
+
+const TooltipContainer = props => <Tooltip {...props} />;
+
+export default withTracker(() => ({
+ fullscreen: FullscreenService.getFullscreenElement(),
+}))(TooltipContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
index 6420327c623cf7eed982f22a47b8b131acaf6850..0f993dd5bfe4447e8d8be6a869fb00a02d726671 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
@@ -56,6 +56,7 @@ const handleClickToggleChat = (id) => {
} else {
Session.set('idChatOpen', '');
}
+ window.dispatchEvent(new Event('panelChanged'));
};
const ChatListItem = (props) => {
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/service.js b/bigbluebutton-html5/imports/ui/components/user-list/service.js
index b297016ab210c8cb11e82d849352a7862dd31c55..4ca35b290a7a7f2b92b5de0fd71765570cf23ee2 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/service.js
+++ b/bigbluebutton-html5/imports/ui/components/user-list/service.js
@@ -423,8 +423,8 @@ const toggleVoice = (userId) => {
} else {
makeCall('toggleVoice', userId);
logger.info({
- logCode: 'usermenu_option_mute_audio',
- extraInfo: { logType: 'moderator_action' },
+ logCode: 'usermenu_option_mute_toggle_audio',
+ extraInfo: { logType: 'moderator_action', userId },
}, 'moderator muted user microphone');
}
};
@@ -531,7 +531,12 @@ export const getUserNamesLink = () => {
.map(u => u.name)
.join('\r\n');
const link = document.createElement('a');
- link.setAttribute('download', `save-users-list-${Date.now()}.txt`);
+ const meeting = Meetings.findOne({ meetingId: Auth.meetingID },
+ { fields: { 'meetingProp.name': 1 } });
+ const date = new Date();
+ const time = `${date.getHours()}-${date.getMinutes()}`;
+ const dateString = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}_${time}`;
+ link.setAttribute('download', `bbb-${meeting.meetingProp.name}[users-list]_${dateString}.txt`);
link.setAttribute(
'href',
`data: ${mimeType} ;charset=utf-16,${encodeURIComponent(userNameListString)}`,
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/breakout-room/component.jsx
index 2371966dcebd2ea19ec83c19668894aafb260a61..ef853eea3a020a5df7e1b9fe892db46481903b51 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/breakout-room/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/breakout-room/component.jsx
@@ -18,6 +18,7 @@ const toggleBreakoutPanel = () => {
? 'userlist'
: 'breakoutroom',
);
+ window.dispatchEvent(new Event('panelChanged'));
};
const BreakoutRoomItem = ({
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/styles.scss
index 561fe03a1fadbae7239693922634366911293548..4b8d5621f4944e56f26efbb1d2d74ce2f3581fec 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/styles.scss
@@ -92,7 +92,7 @@
[dir="rtl"] & {
padding-right: var(--lg-padding-y);
- padding-left: none;
+ padding-left: 0;
}
> i {
@@ -141,6 +141,11 @@
.unreadMessages {
@extend %flex-column;
justify-content: center;
+ margin-left: auto;
+ [dir="rtl"] & {
+ margin-right: auto;
+ margin-left: 0;
+ }
}
.unreadMessagesText {
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
index d73376919bb59600c52e89d23d01364b5df5c4f5..955e8977bc1d904a7040bb3063e0458623e46a01 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
@@ -93,7 +93,7 @@ class UserNotes extends Component {
>
<Icon iconName="copy" />
<div aria-hidden>
- <div className={styles.noteTitle}>
+ <div className={styles.noteTitle} data-test="sharedNotes">
{intl.formatMessage(intlMessages.sharedNotes)}
</div>
{disableNote
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
index 726bb5db2dbbfb4da15b714a9ffccf02c7106c4f..e918f217c22bbec6da9b9ac1ecde8eeef76d6525 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
@@ -167,7 +167,10 @@ class UserParticipants extends Component {
}
handleClickSelectedUser(event) {
- const selectedUser = event.path.find(p => p.className && p.className.includes('participantsList'));
+ let selectedUser = null;
+ if (event.path) {
+ selectedUser = event.path.find(p => p.className && p.className.includes('participantsList'));
+ }
this.setState({ selectedUser });
}
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/container.jsx
index a240d7ecaf6c9fce62b24d6f22ba986b2fe69368..c5b781f538245824b2e208f636fb4ba900b763bc 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/container.jsx
@@ -3,10 +3,8 @@ import { withTracker } from 'meteor/react-meteor-data';
import BreakoutService from '/imports/ui/components/breakout-room/service';
import Meetings from '/imports/api/meetings';
import Auth from '/imports/ui/services/auth';
-import Settings from '/imports/ui/services/settings';
import UserListItem from './component';
import UserListService from '/imports/ui/components/user-list/service';
-import { notify } from '/imports/ui/services/notification';
const UserListItemContainer = props => <UserListItem {...props} />;
const isMe = intId => intId === Auth.userID;
@@ -16,7 +14,6 @@ export default withTracker(({ user }) => {
const breakoutSequence = (findUserInBreakout || {}).sequence;
const Meeting = Meetings.findOne({ meetingId: Auth.meetingID },
{ fields: { lockSettingsProps: 1 } });
- const AppSettings = Settings.application;
return {
user,
@@ -38,8 +35,5 @@ export default withTracker(({ user }) => {
getEmojiList: UserListService.getEmojiList(),
getEmoji: UserListService.getEmoji(),
hasPrivateChatBetweenUsers: UserListService.hasPrivateChatBetweenUsers,
- notify,
- raiseHandAudioAlert: AppSettings.raiseHandAudioAlerts,
- raiseHandPushAlert: AppSettings.raiseHandPushAlerts,
};
})(UserListItemContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
index beff6705e8dc82230cb6d8fcb3faa5b3bfb1867d..a784bdfcb5bdfcd28b0d67dc73ae700b6a7e38af 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
@@ -101,10 +101,6 @@ const messages = defineMessages({
id: 'app.userList.menu.directoryLookup.label',
description: 'Directory lookup',
},
- handAlertLabel: {
- id: 'app.userList.handAlert',
- description: 'text displayed in raise hand toast',
- },
yesLabel: {
id: 'app.endMeeting.yesLabel',
description: 'confirm button label',
@@ -136,7 +132,6 @@ const propTypes = {
};
const CHAT_ENABLED = Meteor.settings.public.chat.enabled;
const ROLE_MODERATOR = Meteor.settings.public.user.role_moderator;
-const MAX_ALERT_RANGE = 550;
class UserDropdown extends PureComponent {
/**
@@ -161,8 +156,6 @@ class UserDropdown extends PureComponent {
showNestedOptions: false,
};
- this.audio = new Audio(`${Meteor.settings.public.app.cdn + Meteor.settings.public.app.basename}/resources/sounds/bbb-handRaise.mp3`);
-
this.handleScroll = this.handleScroll.bind(this);
this.onActionsShow = this.onActionsShow.bind(this);
this.onActionsHide = this.onActionsHide.bind(this);
@@ -323,7 +316,13 @@ class UserDropdown extends PureComponent {
));
}
- if (CHAT_ENABLED && enablePrivateChat && !meetingIsBreakout && isMeteorConnected) {
+ const showChatOption = CHAT_ENABLED
+ && enablePrivateChat
+ && user.clientType !== 'dial-in-user'
+ && !meetingIsBreakout
+ && isMeteorConnected;
+
+ if (showChatOption) {
actions.push(this.makeDropdownItem(
'activeChat',
intl.formatMessage(messages.ChatLabel),
@@ -513,17 +512,12 @@ class UserDropdown extends PureComponent {
renderUserAvatar() {
const {
- intl,
normalizeEmojiName,
user,
- currentUser,
userInBreakout,
breakoutSequence,
meetingIsBreakout,
voiceUser,
- notify,
- raiseHandAudioAlert,
- raiseHandPushAlert,
} = this.props;
const { clientType } = user;
@@ -535,18 +529,6 @@ class UserDropdown extends PureComponent {
const iconVoiceOnlyUser = (<Icon iconName="audio_on" />);
const userIcon = isVoiceOnly ? iconVoiceOnlyUser : iconUser;
- const shouldAlert = user.emoji === 'raiseHand'
- && currentUser.userId !== user.userId
- && new Date() - user.emojiTime < MAX_ALERT_RANGE;
-
- if (shouldAlert) {
- if (raiseHandAudioAlert) this.audio.play();
- if (raiseHandPushAlert) {
- notify(
- `${user.name} ${intl.formatMessage(messages.handAlertLabel)}`, 'info', 'hand',
- );
- }
- }
return (
<UserAvatar
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
index 20880d4ea834c60ea403c979ec2722451a9dd357..d2580f7372090e96ba2f2714626fe17d9d7aa51a 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
@@ -10,8 +10,10 @@ import DropdownContent from '/imports/ui/components/dropdown/content/component';
import DropdownList from '/imports/ui/components/dropdown/list/component';
import DropdownListItem from '/imports/ui/components/dropdown/list/item/component';
import LockViewersContainer from '/imports/ui/components/lock-viewers/container';
+import ConnectionStatusContainer from '/imports/ui/components/connection-status/modal/container';
import BreakoutRoom from '/imports/ui/components/actions-bar/create-breakout-room/container';
import CaptionsService from '/imports/ui/components/captions/service';
+import ConnectionStatusService from '/imports/ui/components/connection-status/service';
import CaptionsWriterMenu from '/imports/ui/components/captions/writer-menu/container';
import DropdownListSeparator from '/imports/ui/components/dropdown/list/separator/component';
import { styles } from './styles';
@@ -70,6 +72,14 @@ const intlMessages = defineMessages({
id: 'app.userList.userOptions.lockViewersDesc',
description: 'Lock viewers description',
},
+ connectionStatusLabel: {
+ id: 'app.userList.userOptions.connectionStatusLabel',
+ description: 'Connection status label',
+ },
+ connectionStatusDesc: {
+ id: 'app.userList.userOptions.connectionStatusDesc',
+ description: 'Connection status description',
+ },
muteAllExceptPresenterLabel: {
id: 'app.userList.userOptions.muteAllExceptPresenterLabel',
description: 'Mute all except presenter label',
@@ -116,6 +126,7 @@ class UserOptions extends PureComponent {
this.muteId = _.uniqueId('list-item-');
this.muteAllId = _.uniqueId('list-item-');
this.lockId = _.uniqueId('list-item-');
+ this.connectionStatusId = _.uniqueId('list-item-');
this.createBreakoutId = _.uniqueId('list-item-');
this.saveUsersNameId = _.uniqueId('list-item-');
this.captionsId = _.uniqueId('list-item-');
@@ -250,6 +261,15 @@ class UserOptions extends PureComponent {
onClick={() => mountModal(<LockViewersContainer />)}
/>) : null
),
+ (ConnectionStatusService.isEnabled() && isMeteorConnected ? (
+ <DropdownListItem
+ key={this.connectionStatusId}
+ icon="warning"
+ label={intl.formatMessage(intlMessages.connectionStatusLabel)}
+ description={intl.formatMessage(intlMessages.connectionStatusDesc)}
+ onClick={() => mountModal(<ConnectionStatusContainer />)}
+ />) : null
+ ),
(isMeteorConnected ? <DropdownListSeparator key={_.uniqueId('list-separator-')} /> : null),
(canCreateBreakout && isMeteorConnected ? (
<DropdownListItem
diff --git a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
index dd802abc7a5d65b96bdf04922957675c3f853647..9fd9e78f0c145765a4d979554af848571d8c5ae5 100755
--- a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
@@ -9,6 +9,7 @@ import logger from '/imports/startup/client/logger';
import Modal from '/imports/ui/components/modal/simple/component';
import browser from 'browser-detect';
import VideoService from '../video-provider/service';
+import cx from 'classnames';
import { styles } from './styles';
const CAMERA_PROFILES = Meteor.settings.public.kurento.cameraProfiles;
@@ -29,6 +30,7 @@ const propTypes = {
resolve: PropTypes.func,
skipVideoPreview: PropTypes.bool.isRequired,
hasMediaDevices: PropTypes.bool.isRequired,
+ hasVideoStream: PropTypes.bool.isRequired,
webcamDeviceId: PropTypes.string,
sharedDevices: PropTypes.arrayOf(PropTypes.string),
};
@@ -72,6 +74,10 @@ const intlMessages = defineMessages({
id: 'app.videoPreview.stopSharingLabel',
description: 'Stop sharing button label',
},
+ stopSharingAllLabel: {
+ id: 'app.videoPreview.stopSharingAllLabel',
+ description: 'Stop sharing all button label',
+ },
sharedCameraLabel: {
id: 'app.videoPreview.sharedCameraLabel',
description: 'Already Shared camera label',
@@ -182,6 +188,7 @@ class VideoPreview extends Component {
this.handleProceed = this.handleProceed.bind(this);
this.handleStartSharing = this.handleStartSharing.bind(this);
this.handleStopSharing = this.handleStopSharing.bind(this);
+ this.handleStopSharingAll = this.handleStopSharingAll.bind(this);
this.handleSelectWebcam = this.handleSelectWebcam.bind(this);
this.handleSelectProfile = this.handleSelectProfile.bind(this);
@@ -201,6 +208,7 @@ class VideoPreview extends Component {
};
this.userParameterProfile = VideoService.getUserParameterProfile();
+ this.mirrorOwnWebcam = VideoService.mirrorOwnWebcam();
}
componentDidMount() {
@@ -234,6 +242,8 @@ class VideoPreview extends Component {
const webcams = [];
let initialDeviceId;
+ VideoService.updateNumberOfDevices(devices);
+
if (!this._isMounted) return;
// set webcam
@@ -369,6 +379,13 @@ class VideoPreview extends Component {
if (resolve) resolve();
}
+ handleStopSharingAll() {
+ const { resolve, stopSharing } = this.props;
+ this.stopTracks();
+ stopSharing();
+ if (resolve) resolve();
+ }
+
handleProceed() {
const { resolve, closeModal } = this.props;
this.stopTracks();
@@ -586,7 +603,10 @@ class VideoPreview extends Component {
<video
id="preview"
data-test="videoPreview"
- className={styles.preview}
+ className={cx({
+ [styles.preview]: true,
+ [styles.mirroredVideo]: this.mirrorOwnWebcam,
+ })}
ref={(ref) => { this.video = ref; }}
autoPlay
playsInline
@@ -606,6 +626,7 @@ class VideoPreview extends Component {
intl,
skipVideoPreview,
sharedDevices,
+ hasVideoStream,
} = this.props;
const {
@@ -639,6 +660,17 @@ class VideoPreview extends Component {
{this.renderContent()}
<div className={styles.footer}>
+ {hasVideoStream ?
+ (<div className={styles.extraActions}>
+ <Button
+ color="danger"
+ label={intl.formatMessage(intlMessages.stopSharingAllLabel)}
+ onClick={this.handleStopSharingAll}
+ disabled={shouldDisableButtons}
+ />
+ </div>)
+ : null
+ }
<div className={styles.actions}>
<Button
label={intl.formatMessage(intlMessages.cancelLabel)}
diff --git a/bigbluebutton-html5/imports/ui/components/video-preview/container.jsx b/bigbluebutton-html5/imports/ui/components/video-preview/container.jsx
index 41ae06e1af6786d16ccb227f3b70dc4c8f92a2b0..746f01de492924623cae010b977d2dd2c666cb01 100755
--- a/bigbluebutton-html5/imports/ui/components/video-preview/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-preview/container.jsx
@@ -34,8 +34,12 @@ export default withModalMounter(withTracker(({ mountModal, fromInterface }) => (
},
stopSharing: (deviceId) => {
mountModal(null);
- const stream = VideoService.getMyStream(deviceId);
- if (stream) VideoService.stopVideo(stream);
+ if (deviceId) {
+ const stream = VideoService.getMyStream(deviceId);
+ if (stream) VideoService.stopVideo(stream);
+ } else {
+ VideoService.exitVideo();
+ }
},
sharedDevices: VideoService.getSharedDevices(),
isCamLocked: isCamLocked(),
@@ -45,4 +49,5 @@ export default withModalMounter(withTracker(({ mountModal, fromInterface }) => (
changeProfile: profileId => Service.changeProfile(profileId),
hasMediaDevices: deviceInfo.hasMediaDevices,
skipVideoPreview: VideoService.getSkipVideoPreview(fromInterface),
+ hasVideoStream: VideoService.hasVideoStream(),
}))(VideoPreviewContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/video-preview/styles.scss b/bigbluebutton-html5/imports/ui/components/video-preview/styles.scss
index a2208c9fc812bff6d512bf792b1498bc02a9ad07..e4ec3e41c3ef1fa7c32847f9b3f0800d0b4c1295 100755
--- a/bigbluebutton-html5/imports/ui/components/video-preview/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-preview/styles.scss
@@ -40,6 +40,26 @@
}
}
+.extraActions {
+ margin-right: auto;
+ margin-left: 3px;
+
+ [dir="rtl"] & {
+ margin-left: auto;
+ margin-right: 3px;
+ }
+
+ :first-child {
+ margin-left: 3px;
+ margin-right: inherit;
+
+ [dir="rtl"] & {
+ margin-left: inherit;
+ margin-right: 3px;
+ }
+ }
+}
+
.closeBtn {
i {
color: var(--color-gray-light);
@@ -123,6 +143,10 @@
}
}
+.mirroredVideo {
+ transform: scale(-1, 1);
+}
+
.row {
display: flex;
}
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
index 910f89894aeedad10b7c019a322d9685cce3c13f..8ebb5fee311a23b26a8d205645a719f49d82ab6f 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
@@ -77,6 +77,10 @@ const propTypes = {
};
class VideoProvider extends Component {
+ static onBeforeUnload() {
+ VideoService.onBeforeUnload();
+ }
+
constructor(props) {
super(props);
@@ -101,8 +105,6 @@ class VideoProvider extends Component {
this.onWsClose = this.onWsClose.bind(this);
this.onWsMessage = this.onWsMessage.bind(this);
- this.onBeforeUnload = this.onBeforeUnload.bind(this);
-
this.updateStreams = this.updateStreams.bind(this);
}
@@ -115,7 +117,7 @@ class VideoProvider extends Component {
this.ws.onmessage = this.onWsMessage;
- window.addEventListener('beforeunload', this.onBeforeUnload);
+ window.addEventListener('beforeunload', VideoProvider.onBeforeUnload);
}
componentDidUpdate(prevProps) {
@@ -134,7 +136,7 @@ class VideoProvider extends Component {
window.removeEventListener('online', this.openWs);
window.removeEventListener('offline', this.onWsClose);
- window.removeEventListener('beforeunload', this.onBeforeUnload);
+ window.removeEventListener('beforeunload', VideoProvider.onBeforeUnload);
VideoService.exitVideo();
@@ -205,17 +207,41 @@ class VideoProvider extends Component {
this.setState({ socketOpen: true });
}
- onBeforeUnload() {
- VideoService.onBeforeUnload();
+ setReconnectionTimeout(cameraId, isLocal) {
+ const peer = this.webRtcPeers[cameraId];
+ const peerHasStarted = peer && peer.started === true;
+ const shouldSetReconnectionTimeout = !this.restartTimeout[cameraId] && !peerHasStarted;
+
+ if (shouldSetReconnectionTimeout) {
+ const newReconnectTimer = this.restartTimer[cameraId] || CAMERA_SHARE_FAILED_WAIT_TIME;
+ this.restartTimer[cameraId] = newReconnectTimer;
+
+ logger.info({
+ logCode: 'video_provider_setup_reconnect',
+ extraInfo: {
+ cameraId,
+ reconnectTimer: newReconnectTimer,
+ },
+ }, `Camera has a new reconnect timer of ${newReconnectTimer} ms for ${cameraId}`);
+
+ this.restartTimeout[cameraId] = setTimeout(
+ this._getWebRTCStartTimeout(cameraId, isLocal),
+ this.restartTimer[cameraId],
+ );
+ }
}
updateStreams(streams) {
const streamsCameraIds = streams.map(s => s.cameraId);
const streamsConnected = Object.keys(this.webRtcPeers);
- const streamsToConnect = streamsCameraIds.filter(cameraId => !streamsConnected.includes(cameraId));
+ const streamsToConnect = streamsCameraIds.filter(
+ cameraId => !streamsConnected.includes(cameraId),
+ );
- const streamsToDisconnect = streamsConnected.filter(cameraId => !streamsCameraIds.includes(cameraId));
+ const streamsToDisconnect = streamsConnected.filter(
+ cameraId => !streamsCameraIds.includes(cameraId),
+ );
streamsToConnect.forEach((cameraId) => {
const isLocal = VideoService.isLocalStream(cameraId);
@@ -505,7 +531,8 @@ class VideoProvider extends Component {
const peer = this.webRtcPeers[cameraId];
if (peer && peer.peerConnection) {
const conn = peer.peerConnection;
- conn.oniceconnectionstatechange = this._getOnIceConnectionStateChangeCallback(cameraId, isLocal);
+ conn.oniceconnectionstatechange = this
+ ._getOnIceConnectionStateChangeCallback(cameraId, isLocal);
VideoService.monitor(conn);
}
}
@@ -595,30 +622,6 @@ class VideoProvider extends Component {
}, `Camera peer creation failed for ${cameraId} due to ${error.message}`);
}
- setReconnectionTimeout(cameraId, isLocal) {
- const peer = this.webRtcPeers[cameraId];
- const peerHasStarted = peer && peer.started === true;
- const shouldSetReconnectionTimeout = !this.restartTimeout[cameraId] && !peerHasStarted;
-
- if (shouldSetReconnectionTimeout) {
- const newReconnectTimer = this.restartTimer[cameraId] || CAMERA_SHARE_FAILED_WAIT_TIME;
- this.restartTimer[cameraId] = newReconnectTimer;
-
- logger.info({
- logCode: 'video_provider_setup_reconnect',
- extraInfo: {
- cameraId,
- reconnectTimer: newReconnectTimer,
- },
- }, `Camera has a new reconnect timer of ${newReconnectTimer} ms for ${cameraId}`);
-
- this.restartTimeout[cameraId] = setTimeout(
- this._getWebRTCStartTimeout(cameraId, isLocal),
- this.restartTimer[cameraId],
- );
- }
- }
-
_getOnIceCandidateCallback(cameraId, isLocal) {
return (candidate) => {
const peer = this.webRtcPeers[cameraId];
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/container.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/container.jsx
index 6e3e491010fe05d77f308e49b388d1085f32c2bb..214027c24aa8c72088035cb2ccefe490efeb5f68 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/container.jsx
@@ -2,6 +2,7 @@ import React from 'react';
import { withTracker } from 'meteor/react-meteor-data';
import VideoProvider from './component';
import VideoService from './service';
+import { withLayoutContext } from '/imports/ui/components/layout/context';
const VideoProviderContainer = ({ children, ...props }) => {
const { streams } = props;
@@ -12,4 +13,4 @@ export default withTracker(props => ({
swapLayout: props.swapLayout,
streams: VideoService.getVideoStreams(),
isUserLocked: VideoService.isUserLocked(),
-}))(VideoProviderContainer);
+}))(withLayoutContext(VideoProviderContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/service.js b/bigbluebutton-html5/imports/ui/components/video-provider/service.js
index 9fa5c1e9c9b8500a72f0f743f6a2bb0bff68cd93..d251126a591cd80603b66f0e372e5bb5cdc8bfef 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/service.js
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/service.js
@@ -19,7 +19,9 @@ const SKIP_VIDEO_PREVIEW = Meteor.settings.public.kurento.skipVideoPreview;
const SFU_URL = Meteor.settings.public.kurento.wsUrl;
const ROLE_MODERATOR = Meteor.settings.public.user.role_moderator;
+const ROLE_VIEWER = Meteor.settings.public.user.role_viewer;
const ENABLE_NETWORK_MONITORING = Meteor.settings.public.networkMonitoring.enableNetworkMonitoring;
+const MIRROR_WEBCAM = Meteor.settings.public.app.mirrorOwnWebcam;
const TOKEN = '_';
@@ -29,11 +31,8 @@ class VideoService {
isConnecting: false,
isConnected: false,
});
- this.skipVideoPreview = getFromUserSettings('bbb_skip_video_preview', false) || SKIP_VIDEO_PREVIEW;
- this.userParameterProfile = getFromUserSettings(
- 'bbb_preferred_camera_profile',
- (CAMERA_PROFILES.filter(i => i.default) || {}).id,
- );
+ this.skipVideoPreview = null;
+ this.userParameterProfile = null;
const BROWSER_RESULTS = browser();
this.isMobile = BROWSER_RESULTS.mobile || BROWSER_RESULTS.os.includes('Android');
this.isSafari = BROWSER_RESULTS.name === 'safari';
@@ -72,16 +71,26 @@ class VideoService {
});
}
- updateNumberOfDevices() {
- navigator.mediaDevices.enumerateDevices().then((devices) => {
- const deviceIds = [];
- devices.forEach((d) => {
- if (d.kind === 'videoinput' && !deviceIds.includes(d.deviceId)) {
- deviceIds.push(d.deviceId);
- }
- });
- this.numberOfDevices = deviceIds.length;
+ fetchNumberOfDevices(devices) {
+ const deviceIds = [];
+ devices.forEach(d => {
+ const validDeviceId = d.deviceId !== '' && !deviceIds.includes(d.deviceId)
+ if (d.kind === 'videoinput' && validDeviceId) {
+ deviceIds.push(d.deviceId);
+ }
});
+
+ return deviceIds.length;
+ }
+
+ updateNumberOfDevices(devices = null) {
+ if (devices) {
+ this.numberOfDevices = this.fetchNumberOfDevices(devices);
+ } else {
+ navigator.mediaDevices.enumerateDevices().then(devices => {
+ this.numberOfDevices = this.fetchNumberOfDevices(devices);
+ });
+ }
}
joinVideo(deviceId) {
@@ -154,7 +163,7 @@ class VideoService {
}
getVideoStreams() {
- const streams = VideoStreams.find(
+ let streams = VideoStreams.find(
{ meetingId: Auth.meetingID },
{
fields: {
@@ -163,8 +172,11 @@ class VideoService {
},
).fetch();
- const connectingStream = this.getConnectingStream(streams);
+ const hideUsers = this.hideUserList();
+ const moderatorOnly = this.webcamsOnlyForModerator();
+ if (hideUsers || moderatorOnly) streams = this.filterModeratorOnly(streams);
+ const connectingStream = this.getConnectingStream(streams);
if (connectingStream) streams.push(connectingStream);
return streams.map(vs => ({
@@ -215,16 +227,50 @@ class VideoService {
return streams.find(s => s.stream === stream);
}
+ filterModeratorOnly(streams) {
+ const me = Users.findOne({ userId: Auth.userID });
+ const amIViewer = me?.role === ROLE_VIEWER;
+
+ if (amIViewer) {
+ const moderators = Users.find(
+ {
+ meetingId: Auth.meetingID,
+ connectionStatus: 'online',
+ role: ROLE_MODERATOR,
+ },
+ { fields: { userId: 1 } },
+ ).fetch().map(user => user.userId);
+
+ return streams.reduce((result, stream) => {
+ const { userId } = stream;
+
+ const isModerator = moderators.includes(userId);
+ const isMe = me?.userId === userId;
+
+ if (isModerator || isMe) result.push(stream);
+
+ return result;
+ }, []);
+ }
+ return streams;
+ }
+
disableCam() {
const m = Meetings.findOne({ meetingId: Auth.meetingID },
{ fields: { 'lockSettingsProps.disableCam': 1 } });
return m.lockSettingsProps ? m.lockSettingsProps.disableCam : false;
}
+ webcamsOnlyForModerator() {
+ const m = Meetings.findOne({ meetingId: Auth.meetingID },
+ { fields: { 'usersProp.webcamsOnlyForModerator': 1 } });
+ return m?.usersProp ? m.usersProp.webcamsOnlyForModerator : false;
+ }
+
hideUserList() {
const m = Meetings.findOne({ meetingId: Auth.meetingID },
{ fields: { 'lockSettingsProps.hideUserList': 1 } });
- return m.lockSettingsProps ? m.lockSettingsProps.hideUserList : false;
+ return m?.lockSettingsProps ? m.lockSettingsProps.hideUserList : false;
}
getInfo() {
@@ -240,6 +286,13 @@ class VideoService {
};
}
+ mirrorOwnWebcam(userId = null) {
+ // only true if setting defined and video ids match
+ const isOwnWebcam = userId ? Auth.userID === userId : true;
+ const isEnabledMirroring = getFromUserSettings('bbb_mirror_own_webcam', MIRROR_WEBCAM);
+ return isOwnWebcam && isEnabledMirroring;
+ }
+
getMyStream(deviceId) {
const videoStream = VideoStreams.findOne(
{
@@ -329,11 +382,22 @@ class VideoService {
return isLocal ? 'share' : 'viewer';
}
- getSkipVideoPreview(fromInterface) {
+ getSkipVideoPreview(fromInterface = false) {
+ if (this.skipVideoPreview === null) {
+ this.skipVideoPreview = getFromUserSettings('bbb_skip_video_preview', false) || SKIP_VIDEO_PREVIEW;
+ }
+
return this.skipVideoPreview && !fromInterface;
}
getUserParameterProfile() {
+ if (this.userParameterProfile === null) {
+ this.userParameterProfile = getFromUserSettings(
+ 'bbb_preferred_camera_profile',
+ (CAMERA_PROFILES.filter(i => i.default) || {}).id,
+ );
+ }
+
return this.userParameterProfile;
}
@@ -342,7 +406,7 @@ class VideoService {
// Mobile shouldn't be able to share more than one camera at the same time
// Safari needs to implement devicechange event for safe device control
return MULTIPLE_CAMERAS
- && !this.skipVideoPreview
+ && !this.getSkipVideoPreview()
&& !this.isMobile
&& !this.isSafari
&& this.numberOfDevices > 1;
@@ -378,6 +442,8 @@ export default {
getUserParameterProfile: () => videoService.getUserParameterProfile(),
isMultipleCamerasEnabled: () => videoService.isMultipleCamerasEnabled(),
monitor: conn => videoService.monitor(conn),
+ mirrorOwnWebcam: userId => videoService.mirrorOwnWebcam(userId),
onBeforeUnload: () => videoService.onBeforeUnload(),
notify: message => notify(message, 'error', 'video'),
+ updateNumberOfDevices: devices => videoService.updateNumberOfDevices(devices),
};
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/component.jsx
index bfe4b551bc8d658fd1605b061c08e6699594c0d1..210bfec8f9af83e1f0c03d0a960e46f3713e4c1c 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/component.jsx
@@ -102,11 +102,13 @@ class VideoList extends Component {
this.handleCanvasResize();
window.addEventListener('resize', this.handleCanvasResize, false);
+ window.addEventListener('layoutSizesSets', this.handleCanvasResize, false);
window.addEventListener('videoPlayFailed', this.handlePlayElementFailed);
}
componentWillUnmount() {
window.removeEventListener('resize', this.handleCanvasResize, false);
+ window.removeEventListener('layoutSizesSets', this.handleCanvasResize, false);
window.removeEventListener('videoPlayFailed', this.handlePlayElementFailed);
}
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
index 5faef91f29fd7092a8193c6fec4005ba57a1e278..cd8821a7d2792b3c36efaa1b13cc754cd5cf571f 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
@@ -49,6 +49,10 @@
}
}
+.mirroredVideo {
+ transform: scale(-1, 1);
+}
+
.content {
position: relative;
display: flex;
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx
index 4ee1dabca179bd8fb0d24098b9d0316a6c828686..12879320f4fa323694328726016963b44f498776 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx
@@ -17,6 +17,7 @@ import FullscreenService from '/imports/ui/components/fullscreen-button/service'
import FullscreenButtonContainer from '/imports/ui/components/fullscreen-button/container';
import { styles } from '../styles';
import { withDraggableConsumer } from '/imports/ui/components/media/webcam-draggable-overlay/context';
+import VideoService from '../../service';
const ALLOW_FULLSCREEN = Meteor.settings.public.app.allowFullscreen;
@@ -30,6 +31,8 @@ class VideoListItem extends Component {
isFullscreen: false,
};
+ this.mirrorOwnWebcam = VideoService.mirrorOwnWebcam(props.userId);
+
this.setVideoIsReady = this.setVideoIsReady.bind(this);
this.onFullscreenChange = this.onFullscreenChange.bind(this);
}
@@ -174,6 +177,7 @@ class VideoListItem extends Component {
&& !isFullscreen && !swapLayout,
[styles.cursorGrabbing]: webcamDraggableState.dragging
&& !isFullscreen && !swapLayout,
+ [styles.mirroredVideo]: this.mirrorOwnWebcam,
})}
ref={(ref) => { this.videoTag = ref; }}
autoPlay
diff --git a/bigbluebutton-html5/imports/ui/components/waiting-users/styles.scss b/bigbluebutton-html5/imports/ui/components/waiting-users/styles.scss
index 8de7dcd950d18b5020522d5985cd19b8887ef2dc..ce87bc18c0de67924a69b0f066e6243c5bbe1ceb 100644
--- a/bigbluebutton-html5/imports/ui/components/waiting-users/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/waiting-users/styles.scss
@@ -7,7 +7,7 @@
display: flex;
flex-grow: 1;
flex-direction: column;
- overflow: hidden;
+ overflow: scroll;
height: 100vh;
}
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/reactive-annotation/container.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/reactive-annotation/container.jsx
index 2a58ad9993b4bff434322db54c10ff71addac229..259fd9f2f7f03af3929a9e455efeba5e366ea2d3 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/reactive-annotation/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/reactive-annotation/container.jsx
@@ -1,8 +1,14 @@
import React from 'react';
import PropTypes from 'prop-types';
import { withTracker } from 'meteor/react-meteor-data';
+import MediaService, { getSwapLayout, shouldEnableSwapLayout } from '/imports/ui/components/media/service';
import ReactiveAnnotationService from './service';
import ReactiveAnnotation from './component';
+import Auth from '/imports/ui/services/auth';
+import Users from '/imports/api/users';
+import getFromUserSettings from '/imports/ui/services/users-settings';
+
+const ROLE_VIEWER = Meteor.settings.public.user.role_viewer;
const ReactiveAnnotationContainer = (props) => {
const { annotation, drawObject } = props;
@@ -24,6 +30,21 @@ const ReactiveAnnotationContainer = (props) => {
export default withTracker((params) => {
const { shapeId } = params;
const annotation = ReactiveAnnotationService.getAnnotationById(shapeId);
+ const isViewer = Users.findOne({ meetingId: Auth.meetingID, userId: Auth.userID }, {
+ fields: {
+ role: 1,
+ },
+ }).role === ROLE_VIEWER;
+
+ const restoreOnUpdate = getFromUserSettings(
+ 'bbb_force_restore_presentation_on_new_events',
+ Meteor.settings.public.presentation.restoreOnUpdate,
+ );
+
+ if (restoreOnUpdate && isViewer) {
+ const layoutSwapped = getSwapLayout() && shouldEnableSwapLayout();
+ if (layoutSwapped) MediaService.toggleSwapLayout();
+ }
return {
annotation,
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/poll/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/poll/component.jsx
index c9da2f1e72a3f5f4723c38422fc0ff3f4fca6ed5..c6382af1ef3f2d93f758617505d43f7055d784fd 100644
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/poll/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/poll/component.jsx
@@ -217,9 +217,10 @@ class PollDrawComponent extends Component {
// first check if we can still increase the font-size
if (fontSizeDirection === 1) {
- if (keySizes.width < maxLineWidth && keySizes.height < maxLineHeight
+ if ((keySizes.width < maxLineWidth && keySizes.height < maxLineHeight
&& voteSizes.width < maxLineWidth && voteSizes.height < maxLineHeight
- && percSizes.width < maxLineWidth && percSizes.height < maxLineHeight) {
+ && percSizes.width < maxLineWidth && percSizes.height < maxLineHeight)
+ && calcFontSize < 100) {
return this.setState({
calcFontSize: calcFontSize + fontSizeIncrement,
});
@@ -232,9 +233,10 @@ class PollDrawComponent extends Component {
});
} if (fontSizeDirection === -1) {
// check if the font-size is still bigger than allowed
- if (keySizes.width > maxLineWidth || keySizes.height > maxLineHeight
+ if ((keySizes.width > maxLineWidth || keySizes.height > maxLineHeight
|| voteSizes.width > maxLineWidth || voteSizes.height > maxLineHeight
- || percSizes.width > maxLineWidth || percSizes.height > maxLineHeight) {
+ || percSizes.width > maxLineWidth || percSizes.height > maxLineHeight)
+ && calcFontSize > 0) {
return this.setState({
calcFontSize: calcFontSize - fontSizeIncrement,
});
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
index 88a72545d753216703242408045269e6a1b35d10..ecd3bae28befcdc945fa4b5fa25bbab6b6050810 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
@@ -115,6 +115,7 @@ class WhiteboardToolbar extends Component {
this.displaySubMenu = this.displaySubMenu.bind(this);
this.closeSubMenu = this.closeSubMenu.bind(this);
+ this.handleClose = this.handleClose.bind(this);
this.handleUndo = this.handleUndo.bind(this);
this.handleClearAll = this.handleClearAll.bind(this);
this.handleSwitchWhiteboardMode = this.handleSwitchWhiteboardMode.bind(this);
@@ -400,6 +401,13 @@ class WhiteboardToolbar extends Component {
});
}
+ handleClose() {
+ this.setState({
+ onBlurEnabled: true,
+ currentSubmenuOpen: '',
+ });
+ }
+
handleFontSizeChange(fontSize) {
const { actions } = this.props;
actions.setFontSize(fontSize.value);
@@ -475,6 +483,7 @@ class WhiteboardToolbar extends Component {
objectSelected={annotationSelected}
handleMouseEnter={this.handleMouseEnter}
handleMouseLeave={this.handleMouseLeave}
+ handleClose={this.handleClose}
/>
)
: null}
@@ -507,6 +516,7 @@ class WhiteboardToolbar extends Component {
objectSelected={fontSizeSelected}
handleMouseEnter={this.handleMouseEnter}
handleMouseLeave={this.handleMouseLeave}
+ handleClose={this.handleClose}
/>
)
: null}
@@ -569,6 +579,7 @@ class WhiteboardToolbar extends Component {
objectSelected={thicknessSelected}
handleMouseEnter={this.handleMouseEnter}
handleMouseLeave={this.handleMouseLeave}
+ handleClose={this.handleClose}
/>
)
: null}
@@ -671,6 +682,7 @@ class WhiteboardToolbar extends Component {
objectSelected={colorSelected}
handleMouseEnter={this.handleMouseEnter}
handleMouseLeave={this.handleMouseLeave}
+ handleClose={this.handleClose}
/>
)
: null}
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-submenu/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-submenu/component.jsx
index c452c8368c669e9242303dff22a766bea26fc56c..9df18ca12763a9dd0a999f0178c6e0c22ee767b5 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-submenu/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-submenu/component.jsx
@@ -129,11 +129,14 @@ class ToolbarSubmenu extends Component {
this.handleMouseEnter = this.handleMouseEnter.bind(this);
this.handleMouseLeave = this.handleMouseLeave.bind(this);
+ this.handleMouseDown = this.handleMouseDown.bind(this);
this.onItemClick = this.onItemClick.bind(this);
this.findCurrentElement = this.findCurrentElement.bind(this);
}
componentDidMount() {
+ document.addEventListener('mousedown', this.handleMouseDown);
+ document.addEventListener('touchstart', this.handleMouseDown);
const { handleMouseEnter, objectSelected, type } = this.props;
if (handleMouseEnter) {
@@ -174,6 +177,11 @@ class ToolbarSubmenu extends Component {
}
}
+ componentWillUnmount() {
+ document.removeEventListener('mousedown', this.handleMouseDown);
+ document.removeEventListener('touchstart', this.handleMouseDown);
+ }
+
onItemClick(objectToReturn) {
const { onItemClick } = this.props;
@@ -188,6 +196,19 @@ class ToolbarSubmenu extends Component {
return node;
}
+ handleMouseDown(e) {
+ const { handleClose } = this.props;
+ for (let i = 0; i < e.path.length; i += 1) {
+ const p = e.path[i];
+ if (p && p.className && typeof p.className === 'string') {
+ if (p.className.search('tool') !== -1) {
+ return false;
+ }
+ }
+ }
+ return handleClose();
+ }
+
handleMouseEnter() {
const { handleMouseEnter } = this.props;
if (handleMouseEnter) {
diff --git a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
index 4b7f36cad3df23ddc044cd9f22e8dc8962bdf088..bdf4689646ec499c7acfaa6810409b01a5a8f4c2 100755
--- a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
+++ b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
@@ -11,8 +11,7 @@ import { tryGenerateIceCandidates } from '/imports/utils/safari-webrtc';
import { monitorAudioConnection } from '/imports/utils/stats';
import AudioErrors from './error-codes';
-const ENABLE_NETWORK_MONITORING = Meteor.settings.public.networkMonitoring.enableNetworkMonitoring;
-
+const STATS = Meteor.settings.public.stats;
const MEDIA = Meteor.settings.public.media;
const MEDIA_TAG = MEDIA.mediaTag;
const ECHO_TEST_NUMBER = MEDIA.echoTestNumber;
@@ -311,7 +310,7 @@ class AudioManager {
window.parent.postMessage({ response: 'joinedAudio' }, '*');
this.notify(this.intl.formatMessage(this.messages.info.JOINED_AUDIO));
logger.info({ logCode: 'audio_joined' }, 'Audio Joined');
- if (ENABLE_NETWORK_MONITORING) this.monitor();
+ if (STATS.enabled) this.monitor();
}
}
diff --git a/bigbluebutton-html5/imports/ui/services/auth/index.js b/bigbluebutton-html5/imports/ui/services/auth/index.js
index e6e80b1d66f3059a72b37e89e899076d853e9e19..b866da0b3b78b888633e163089012dc2bec7dfb0 100755
--- a/bigbluebutton-html5/imports/ui/services/auth/index.js
+++ b/bigbluebutton-html5/imports/ui/services/auth/index.js
@@ -207,7 +207,7 @@ class Auth {
}
validateAuthToken() {
- return new Promise((resolve, reject) => {
+ return new Promise(async (resolve, reject) => {
let computation = null;
const validationTimeout = setTimeout(() => {
@@ -218,9 +218,19 @@ class Auth {
});
}, CONNECTION_TIMEOUT);
+ const result = await makeCall('validateAuthToken', this.meetingID, this.userID, this.token, this.externUserID);
+
+ if (!result) {
+ clearTimeout(validationTimeout);
+ reject({
+ error: 401,
+ description: 'User has been banned.',
+ });
+ return;
+ }
+
Tracker.autorun((c) => {
computation = c;
- makeCall('validateAuthToken', this.meetingID, this.userID, this.token);
Meteor.subscribe('current-user');
const selector = { meetingId: this.meetingID, userId: this.userID };
@@ -237,6 +247,7 @@ class Auth {
}
if (User.ejected) {
+ computation.stop();
reject({
error: 401,
description: 'User has been ejected.',
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/variables/palette.scss b/bigbluebutton-html5/imports/ui/stylesheets/variables/palette.scss
index 288d3a11fc9c312f7beeb9a597101b353af8f95b..4edfd06d5d23937fc2e0c4cf3106f6c8336891ff 100644
--- a/bigbluebutton-html5/imports/ui/stylesheets/variables/palette.scss
+++ b/bigbluebutton-html5/imports/ui/stylesheets/variables/palette.scss
@@ -30,4 +30,5 @@
--color-gray-label: var(--color-gray);
--color-transparent: #ff000000;
+ --color-tip-bg: #333333;
}
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/variables/typography.scss b/bigbluebutton-html5/imports/ui/stylesheets/variables/typography.scss
index 29270a5be8f5f102063778eff2946a80b2e85bfc..492a95241e8efe68fb598d2e72ba61e68c458f96 100644
--- a/bigbluebutton-html5/imports/ui/stylesheets/variables/typography.scss
+++ b/bigbluebutton-html5/imports/ui/stylesheets/variables/typography.scss
@@ -6,6 +6,8 @@
--font-family-base: var(--font-family-sans-serif);
--font-size-base: 1rem;
+ --font-size-xl: 1.75rem;
+ --font-size-larger: 1.5rem;
--font-size-large: 1.25rem;
--font-size-md: 0.95rem;
--font-size-small: 0.875rem;
diff --git a/bigbluebutton-html5/imports/utils/stats.js b/bigbluebutton-html5/imports/utils/stats.js
index 5e9b6c8cfad68a89040b7584c82d4ea32de24d53..e1f7542a9bb38dba7650ab0f2284947ca04ff782 100644
--- a/bigbluebutton-html5/imports/utils/stats.js
+++ b/bigbluebutton-html5/imports/utils/stats.js
@@ -1,24 +1,54 @@
import logger from '/imports/startup/client/logger';
-const STATS_LENGTH = 5;
-const STATS_INTERVAL = 2000;
+const STATS = Meteor.settings.public.stats;
+
+const STATS_LENGTH = STATS.length;
+const STATS_INTERVAL = STATS.interval;
+const STATS_LOG = STATS.log;
const stop = callback => {
- logger.info(
- {
- logCode: 'stats_stop_monitor'
- },
+ logger.debug(
+ { logCode: 'stats_stop_monitor' },
'Lost peer connection. Stopping monitor'
);
callback(clearResult());
return;
};
+const isActive = conn => {
+ let active = false;
+
+ if (conn) {
+ const { connectionState } = conn;
+ const logCode = 'stats_connection_state';
+
+ switch (connectionState) {
+ case 'new':
+ case 'connecting':
+ case 'connected':
+ case 'disconnected':
+ active = true;
+ break;
+ case 'failed':
+ case 'closed':
+ default:
+ logger.warn({ logCode }, connectionState);
+ }
+ } else {
+ logger.error(
+ { logCode: 'stats_missing_connection' },
+ 'Missing connection'
+ );
+ }
+
+ return active;
+};
+
const collect = (conn, callback) => {
let stats = [];
- const monitor = (conn, stats) => {
- if (!conn) return stop(callback);
+ const monitor = (conn, stats, iteration) => {
+ if (!isActive(conn)) return stop(callback);
conn.getStats().then(results => {
if (!results) return stop(callback);
@@ -40,12 +70,8 @@ const collect = (conn, callback) => {
if (inboundRTP || remoteInboundRTP) {
if (!inboundRTP) {
- const { peerIdentity } = conn;
- logger.warn(
- {
- logCode: 'missing_inbound_rtc',
- extraInfo: { peerIdentity }
- },
+ logger.debug(
+ { logCode: 'stats_missing_inbound_rtc' },
'Missing local inbound RTC. Using remote instead'
);
}
@@ -54,13 +80,21 @@ const collect = (conn, callback) => {
while (stats.length > STATS_LENGTH) stats.shift();
const interval = calculateInterval(stats);
- callback(buildResult(interval));
+ callback(buildResult(interval, iteration));
}
- setTimeout(monitor, STATS_INTERVAL, conn, stats);
- }).catch(error => logger.error(error));
+ setTimeout(monitor, STATS_INTERVAL, conn, stats, iteration + 1);
+ }).catch(error => {
+ logger.debug(
+ {
+ logCode: 'stats_get_stats_error',
+ extraInfo: { error }
+ },
+ 'WebRTC stats not available'
+ );
+ });
};
- monitor(conn, stats);
+ monitor(conn, stats, 1);
};
const buildData = inboundRTP => {
@@ -76,9 +110,10 @@ const buildData = inboundRTP => {
};
};
-const buildResult = (interval) => {
+const buildResult = (interval, iteration) => {
const rate = calculateRate(interval.packets);
return {
+ iteration: iteration,
packets: {
received: interval.packets.received,
lost: interval.packets.lost
@@ -95,6 +130,7 @@ const buildResult = (interval) => {
const clearResult = () => {
return {
+ iteration: 0,
packets: {
received: 0,
lost: 0
@@ -123,7 +159,7 @@ const calculateInterval = (stats) => {
bytes: {
received: diff(single, first.bytes.received, last.bytes.received)
},
- jitter: Math.max.apply(Math, stats.map(s => s.jitter))
+ jitter: single ? first.jitter : last.jitter
};
};
@@ -142,19 +178,40 @@ const calculateMOS = (rate) => {
return 1 + (0.035) * rate + (0.000007) * rate * (rate - 60) * (100 - rate);
};
-const monitorAudioConnection = conn => {
- if (!conn) return;
+const logResult = (id, result) => {
+ if (!STATS_LOG) return null;
- const { peerIdentity } = conn;
+ const {
+ iteration,
+ loss,
+ jitter
+ } = result;
+ // Avoiding messages flood
+ if (!iteration || iteration % STATS_LENGTH !== 0) return null;
+
+ const duration = STATS_LENGTH * STATS_INTERVAL / 1000;
logger.info(
{
- logCode: 'stats_audio_monitor',
- extraInfo: { peerIdentity }
+ logCode: 'stats_monitor_result',
+ extraInfo: {
+ id,
+ result
+ }
},
+ `Stats result for the last ${duration} seconds: loss: ${loss}, jitter: ${jitter}.`
+ );
+};
+
+const monitorAudioConnection = conn => {
+ if (!conn) return;
+
+ logger.debug(
+ { logCode: 'stats_audio_monitor' },
'Starting to monitor audio connection'
);
collect(conn, (result) => {
+ logResult('audio', result);
const event = new CustomEvent('audiostats', { detail: result });
window.dispatchEvent(event);
});
@@ -163,12 +220,8 @@ const monitorAudioConnection = conn => {
const monitorVideoConnection = conn => {
if (!conn) return;
- const { peerIdentity } = conn;
- logger.info(
- {
- logCode: 'stats_video_monitor',
- extraInfo: { peerIdentity }
- },
+ logger.debug(
+ { logCode: 'stats_video_monitor' },
'Starting to monitor video connection'
);
diff --git a/bigbluebutton-html5/package-lock.json b/bigbluebutton-html5/package-lock.json
index 1eb19db7f7d9386ae488100b60226b5cddfea3c4..f7fbbdccd48d22f9acbeb121c2e96b66fa09078f 100644
--- a/bigbluebutton-html5/package-lock.json
+++ b/bigbluebutton-html5/package-lock.json
@@ -303,9 +303,9 @@
}
},
"@babel/runtime": {
- "version": "7.9.6",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
- "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
+ "version": "7.10.5",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.5.tgz",
+ "integrity": "sha512-otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
@@ -416,6 +416,16 @@
"minimist": "^1.2.0"
}
},
+ "@dabh/diagnostics": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz",
+ "integrity": "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==",
+ "requires": {
+ "colorspace": "1.1.x",
+ "enabled": "2.0.x",
+ "kuler": "^2.0.0"
+ }
+ },
"@iamstarkov/listr-update-renderer": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/@iamstarkov/listr-update-renderer/-/listr-update-renderer-0.4.1.tgz",
@@ -1495,12 +1505,9 @@
"dev": true
},
"async": {
- "version": "2.6.3",
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
- "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
- "requires": {
- "lodash": "^4.17.14"
- }
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
+ "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="
},
"async-foreach": {
"version": "0.1.3",
@@ -2220,11 +2227,6 @@
"simple-swizzle": "^0.2.2"
}
},
- "colornames": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz",
- "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y="
- },
"colors": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
@@ -2594,16 +2596,6 @@
"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
"dev": true
},
- "diagnostics": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz",
- "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==",
- "requires": {
- "colorspace": "1.1.x",
- "enabled": "1.0.x",
- "kuler": "1.0.x"
- }
- },
"diff-sequences": {
"version": "25.2.6",
"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
@@ -2681,12 +2673,9 @@
"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
},
"enabled": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
- "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=",
- "requires": {
- "env-variable": "0.0.x"
- }
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
+ "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="
},
"end-of-stream": {
"version": "1.4.4",
@@ -2697,11 +2686,6 @@
"once": "^1.4.0"
}
},
- "env-variable": {
- "version": "0.0.6",
- "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz",
- "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg=="
- },
"error-ex": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -3457,9 +3441,9 @@
}
},
"fecha": {
- "version": "2.3.3",
- "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
- "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz",
+ "integrity": "sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="
},
"fibers": {
"version": "4.0.3",
@@ -3548,6 +3532,11 @@
"integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=",
"dev": true
},
+ "fn.name": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
+ "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
+ },
"follow-redirects": {
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
@@ -3788,6 +3777,14 @@
"har-schema": "^2.0.0"
}
},
+ "hark": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/hark/-/hark-1.2.3.tgz",
+ "integrity": "sha512-u68vz9SCa38ESiFJSDjqK8XbXqWzyot7Cj6Y2b6jk2NJ+II3MY2dIrLMg/kjtIAun4Y1DHF/20hfx4rq1G5GMg==",
+ "requires": {
+ "wildemitter": "^1.2.0"
+ }
+ },
"has": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -4566,7 +4563,8 @@
"is-stream": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
- "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+ "dev": true
},
"is-string": {
"version": "1.0.5",
@@ -6592,12 +6590,9 @@
"dev": true
},
"kuler": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz",
- "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==",
- "requires": {
- "colornames": "^1.1.1"
- }
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
+ "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
},
"langmap": {
"version": "0.0.16",
@@ -6922,9 +6917,9 @@
}
},
"lodash": {
- "version": "4.17.15",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
- "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+ "version": "4.17.19",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+ "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
},
"lodash.sortby": {
"version": "4.7.0",
@@ -6996,13 +6991,13 @@
}
},
"logform": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz",
- "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz",
+ "integrity": "sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==",
"requires": {
"colors": "^1.2.1",
"fast-safe-stringify": "^2.0.4",
- "fecha": "^2.3.3",
+ "fecha": "^4.2.0",
"ms": "^2.1.1",
"triple-beam": "^1.3.0"
},
@@ -8110,9 +8105,12 @@
}
},
"one-time": {
- "version": "0.0.4",
- "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz",
- "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4="
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
+ "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
+ "requires": {
+ "fn.name": "1.x.x"
+ }
},
"onetime": {
"version": "2.0.1",
@@ -8710,9 +8708,9 @@
}
},
"react-device-detect": {
- "version": "1.12.1",
- "resolved": "https://registry.npmjs.org/react-device-detect/-/react-device-detect-1.12.1.tgz",
- "integrity": "sha512-BQ7xIEHx0VqPBGEtEFJRybHnhZ1Qn3BXX8dRR3EKLRfSTKpITUw925VYCGnygZDpmgYSq5NX0IvHGhy0w7Sckg==",
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/react-device-detect/-/react-device-detect-1.13.1.tgz",
+ "integrity": "sha512-XTPgAMsUVHC5lMNUGiAeO2UfAfhMfjq0CBUM67eHnc9XfO7iESh6h/cffKV8VGgrZBX+dyuqJl23bLLHoav5Ig==",
"requires": {
"ua-parser-js": "^0.7.21"
}
@@ -8747,9 +8745,9 @@
}
},
"react-fast-compare": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.1.1.tgz",
- "integrity": "sha512-SCsAORWK59BvauR2L1BTdjQbJcSGJJz03U0awektk2hshLKrITDDFTlgGCqIZpTDlPC/NFlZee6xTMzXPVLiHw=="
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
+ "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
},
"react-intl": {
"version": "2.7.2",
@@ -8785,9 +8783,9 @@
}
},
"react-player": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/react-player/-/react-player-2.0.1.tgz",
- "integrity": "sha512-QG/NutOfDq4FF/7nzMDzM4nmb8ExVES/5n973NSZgZ/1iE6ObmhDOau9gO67NPYOQv/RhOJ4S8b0g9bVAdK9vA==",
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/react-player/-/react-player-2.5.0.tgz",
+ "integrity": "sha512-wwTp6KO6uF/QRvwV2rh+jb6A7rfZLgdVPKTgidXYYvb2IkjYd3Db9BtSVGqQeLw1e9y3OSucBCrLlJtovSMuzg==",
"requires": {
"deepmerge": "^4.0.0",
"load-script": "^1.0.0",
@@ -10673,22 +10671,32 @@
"string-width": "^1.0.2 || 2"
}
},
+ "wildemitter": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/wildemitter/-/wildemitter-1.2.1.tgz",
+ "integrity": "sha512-UMmSUoIQSir+XbBpTxOTS53uJ8s/lVhADCkEbhfRjUGFDPme/XGOb0sBWLx5sTz7Wx/2+TlAw1eK9O5lw5PiEw=="
+ },
"winston": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz",
- "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==",
- "requires": {
- "async": "^2.6.1",
- "diagnostics": "^1.1.1",
- "is-stream": "^1.1.0",
- "logform": "^2.1.1",
- "one-time": "0.0.4",
- "readable-stream": "^3.1.1",
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz",
+ "integrity": "sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==",
+ "requires": {
+ "@dabh/diagnostics": "^2.0.2",
+ "async": "^3.1.0",
+ "is-stream": "^2.0.0",
+ "logform": "^2.2.0",
+ "one-time": "^1.0.0",
+ "readable-stream": "^3.4.0",
"stack-trace": "0.0.x",
"triple-beam": "^1.3.0",
- "winston-transport": "^4.3.0"
+ "winston-transport": "^4.4.0"
},
"dependencies": {
+ "is-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+ "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
+ },
"readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -10702,11 +10710,11 @@
}
},
"winston-transport": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz",
- "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==",
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz",
+ "integrity": "sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==",
"requires": {
- "readable-stream": "^2.3.6",
+ "readable-stream": "^2.3.7",
"triple-beam": "^1.2.0"
}
},
diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json
index b2eb594725a48d907cf5694ca88d8621fc9b3df1..d98926a3370c56318542f658f3ca42a6ce36c5ea 100755
--- a/bigbluebutton-html5/package.json
+++ b/bigbluebutton-html5/package.json
@@ -30,7 +30,7 @@
}
},
"dependencies": {
- "@babel/runtime": "^7.7.7",
+ "@babel/runtime": "^7.10.5",
"@browser-bunyan/server-stream": "^1.5.3",
"@jitsi/sdp-interop": "0.1.14",
"autoprefixer": "~9.3.1",
@@ -44,9 +44,10 @@
"fastdom": "^1.0.9",
"fibers": "^4.0.2",
"flat": "~4.1.0",
+ "hark": "^1.2.3",
"immutability-helper": "~2.8.1",
"langmap": "0.0.16",
- "lodash": "^4.17.15",
+ "lodash": "^4.17.19",
"makeup-screenreader-trap": "0.0.5",
"meteor-node-stubs": "^0.4.1",
"node-sass": "^4.13.1",
@@ -57,13 +58,13 @@
"react": "^16.12.0",
"react-autosize-textarea": "^5.0.1",
"react-color": "^2.18.0",
- "react-device-detect": "^1.11.14",
+ "react-device-detect": "^1.13.1",
"react-dom": "^16.12.0",
"react-draggable": "^3.3.2",
"react-dropzone": "^7.0.1",
"react-intl": "~2.7.2",
"react-modal": "~3.6.1",
- "react-player": "^2.0.1",
+ "react-player": "^2.5.0",
"react-render-in-browser": "^1.1.1",
"react-tabs": "^2.3.1",
"react-tether": "^2.0.7",
@@ -77,7 +78,7 @@
"string-hash": "~1.1.3",
"tippy.js": "^5.1.3",
"useragent": "^2.3.0",
- "winston": "^3.2.1",
+ "winston": "^3.3.3",
"yaml": "^1.7.2"
},
"devDependencies": {
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index 65e3f384110008bedec270af7f34e097d3cb65c0..849b5dac29e8ff17f97afaac3792c4c87b400441 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -9,7 +9,7 @@ public:
skipCheck: false
clientTitle: BigBlueButton
appName: BigBlueButton HTML5 Client
- bbbServerVersion: 2.2
+ bbbServerVersion: 2.3-dev
copyright: "©2020 BigBlueButton Inc."
html5ClientBuild: HTML5_CLIENT_VERSION
helpLink: https://bigbluebutton.org/html5/
@@ -20,12 +20,20 @@ public:
allowUserLookup: false
enableNetworkInformation: false
enableLimitOfViewersInWebcam: false
- enableMultipleCameras: false
+ enableMultipleCameras: true
enableTalkingIndicator: true
+ mirrorOwnWebcam: false
viewersInWebcam: 8
ipv4FallbackDomain: ""
allowLogout: true
allowFullscreen: true
+ mutedAlert:
+ enabled: true
+ interval: 200
+ threshold: -50
+ duration: 4000
+ remainingTimeThreshold: 30
+ remainingTimeAlertThreshold: 1
defaultSettings:
application:
animations: true
@@ -33,8 +41,8 @@ public:
chatPushAlerts: false
userJoinAudioAlerts: false
userJoinPushAlerts: false
- raiseHandAudioAlerts: false
- raiseHandPushAlerts: false
+ raiseHandAudioAlerts: true
+ raiseHandPushAlerts: true
fallbackLocale: en
overrideLocale: null
audio:
@@ -72,7 +80,7 @@ public:
accesskey: A
descId: openActions
branding:
- displayBrandingArea: false
+ displayBrandingArea: true
connectionTimeout: 60000
showHelpButton: true
effectiveConnection:
@@ -106,6 +114,17 @@ public:
- screen
firefoxScreenshareSource: window
cameraProfiles:
+ # id: unique identifier of the profile
+ # name: name of the profile visible to users
+ # default: if this is the default profile which is pre-selected
+ # bitrate: the average bitrate for used for a webcam stream
+ # constraints:
+ # # Optional constraints put on the requested video a browser MAY honor
+ # # For a detailed list on possible values see:
+ # # https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackConstraints
+ # # Examples:
+ # width: requested width of the camera stream
+ # frameRate: requested framerate
- id: low
name: Low quality
default: false
@@ -149,6 +168,7 @@ public:
time: 5000
chat:
enabled: true
+ startClosed: false
min_message_length: 1
max_message_length: 5000
grouping_messages_window: 10000
@@ -189,10 +209,29 @@ public:
callHangupMaximumRetries: 10
echoTestNumber: 'echo'
relayOnlyOnReconnect: false
+ stats:
+ enabled: true
+ interval: 2000
+ length: 5
+ log: false
+ jitter:
+ - 10
+ - 20
+ - 30
+ loss:
+ - 0.05
+ - 0.1
+ - 0.2
+ level:
+ - warning
+ - danger
+ - critical
+ help: STATS_HELP_URL
presentation:
allowDownloadable: true
defaultPresentationFile: default.pdf
panZoomThrottle: 32
+ restoreOnUpdate: false
uploadEndpoint: "/bigbluebutton/presentation/upload"
uploadSizeMin: 0
uploadSizeMax: 50000000
diff --git a/bigbluebutton-html5/private/locales/bg_BG.json b/bigbluebutton-html5/private/locales/bg_BG.json
index 37dddf0ad2e59737a27a6ce758f35b25d857538d..d7a129049a8e504802a0c42824a586aea40b858f 100644
--- a/bigbluebutton-html5/private/locales/bg_BG.json
+++ b/bigbluebutton-html5/private/locales/bg_BG.json
@@ -63,6 +63,7 @@
"app.userList.presenter": "Лектор",
"app.userList.you": "Вие",
"app.userList.locked": "Заключено",
+ "app.userList.byModerator": "от (Модератор)",
"app.userList.label": "СпиÑък на потребителите",
"app.userList.toggleCompactView.label": "Превключи към режим на компактен преглед",
"app.userList.guest": "ГоÑÑ‚",
@@ -111,6 +112,8 @@
"app.media.autoplayAlertDesc": "Разреши доÑтъпа",
"app.media.screenshare.start": "СподелÑнето на екрана започна",
"app.media.screenshare.end": "СподелÑнето на екрана приключи",
+ "app.media.screenshare.unavailable": "СподелÑнето на екран не е възможно",
+ "app.media.screenshare.notSupported": " СподелÑнето на екран не е възможно Ñ Ñ‚Ð¾Ð·Ð¸ браузър.",
"app.media.screenshare.autoplayBlockedDesc": "Ðуждаем Ñе от Вашето разрешение за да Ви покажем екрана на презентатора",
"app.media.screenshare.autoplayAllowLabel": "Виж ÑÐ¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¸Ñ ÐµÐºÑ€Ð°Ð½",
"app.screenshare.notAllowed": "Грешка: Ðе беше дадено разрешение за доÑтъп до екрана",
diff --git a/bigbluebutton-html5/private/locales/ca.json b/bigbluebutton-html5/private/locales/ca.json
index 6e1490344e8b7ceb8337a57f859cfa4b358368bb..e734249c226b07ae2c99e9858cabf2c0c340a9c8 100644
--- a/bigbluebutton-html5/private/locales/ca.json
+++ b/bigbluebutton-html5/private/locales/ca.json
@@ -62,7 +62,7 @@
"app.userList.captionsTitle": "SubtÃtols",
"app.userList.presenter": "Presentador/a",
"app.userList.you": "Vós",
- "app.userList.locked": "Tancat",
+ "app.userList.locked": "Bloquejat/da",
"app.userList.byModerator": "Per (Moderador/a)",
"app.userList.label": "Llista d'usuaris",
"app.userList.toggleCompactView.label": "Canvia al mode compacte",
@@ -74,7 +74,7 @@
"app.userList.menu.clearStatus.label": "Neteja l'estat",
"app.userList.menu.removeUser.label": "Elimina usuari/Ã ria",
"app.userList.menu.removeConfirmation.label": "Eliminar usuari/Ã ria ({0})",
- "app.userlist.menu.removeConfirmation.desc": "Esteu segurs d'eliminar aquest usuari/à ria? Un cop ho feu no podrà tornar a entrar en aquesta sala. Si el voleu tornar a incloure haureu de finalitzar sessió i tornar-la a iniciar.",
+ "app.userlist.menu.removeConfirmation.desc": "Eviteu que aquest usuari es reincorpori a la sessió.",
"app.userList.menu.muteUserAudio.label": "Silencia usuari/Ã ria",
"app.userList.menu.unmuteUserAudio.label": "Activa el micròfon de l'usuari/à ria",
"app.userList.userAriaLabel": "{0} {1} {2} Estat {3}",
@@ -115,6 +115,7 @@
"app.media.screenshare.start": "Inici de pantalla compartida",
"app.media.screenshare.end": "Fi de la pantalla compartida",
"app.media.screenshare.unavailable": "No es pot compartir pantalla",
+ "app.media.screenshare.notSupported": "L'ús compartit de la pantalla no és compatible en aquest navegador.",
"app.media.screenshare.autoplayBlockedDesc": "Es necessita donar permÃs per mostrar-te la pantalla del presentador",
"app.media.screenshare.autoplayAllowLabel": "Veure pantalla compartida",
"app.screenshare.notAllowed": "Error: No s'ha permés l'accés a la pantalla",
@@ -530,7 +531,7 @@
"app.lock-viewers.ariaTitle": "Bloqueja la configuració de la modalitat del espectadors",
"app.lock-viewers.button.apply": "Aplica",
"app.lock-viewers.button.cancel": "Cancel·la",
- "app.lock-viewers.locked": "Tancat",
+ "app.lock-viewers.locked": "Bloquejat/da",
"app.lock-viewers.unlocked": "Desbloqueja",
"app.recording.startTitle": "Inicia gravació",
"app.recording.stopTitle": "Pausa gravació",
diff --git a/bigbluebutton-html5/private/locales/cs_CZ.json b/bigbluebutton-html5/private/locales/cs_CZ.json
index 77b22c18baee4a11a84754b1aca10225ae1f4cf4..87529d4edadde7600ea217f51cc9f9b4149f555b 100644
--- a/bigbluebutton-html5/private/locales/cs_CZ.json
+++ b/bigbluebutton-html5/private/locales/cs_CZ.json
@@ -74,7 +74,6 @@
"app.userList.menu.clearStatus.label": "Smazat status",
"app.userList.menu.removeUser.label": "Odstranit uživatele",
"app.userList.menu.removeConfirmation.label": "Odebrat uživatele ({0})",
- "app.userlist.menu.removeConfirmation.desc": "Jste si jist(a), že chcete odebrat tohoto uživatele? Jakmile bude odebrán, nebude se schopen znovu přihlásit k relaci.",
"app.userList.menu.muteUserAudio.label": "Ztlumit uživatele",
"app.userList.menu.unmuteUserAudio.label": "Zrušit ztlumenà uživatele",
"app.userList.userAriaLabel": "{0} {1} {2} Status {3}",
diff --git a/bigbluebutton-html5/private/locales/de.json b/bigbluebutton-html5/private/locales/de.json
index 3b46fc6ac778418c56d2976a257e448191f7ae18..b39088e172b7ff49ae4a40cfa2d2d21a0e73d0ff 100644
--- a/bigbluebutton-html5/private/locales/de.json
+++ b/bigbluebutton-html5/private/locales/de.json
@@ -74,7 +74,7 @@
"app.userList.menu.clearStatus.label": "Status zurücksetzen",
"app.userList.menu.removeUser.label": "Teilnehmer entfernen",
"app.userList.menu.removeConfirmation.label": "Teilnehmer entfernen ({0})",
- "app.userlist.menu.removeConfirmation.desc": "Sind Sie sicher, dass Sie diesen Teilnehmer entfernen möchten? Sobald er entfernt wurde, kann er nicht mehr an dieser Konferenz teilnehmen.",
+ "app.userlist.menu.removeConfirmation.desc": "Teilnehmer sperren, sodass eine erneute Teilnahme an dieser Konferenz nicht mehr möglich ist.",
"app.userList.menu.muteUserAudio.label": "Teilnehmer stummschalten",
"app.userList.menu.unmuteUserAudio.label": "Stummschaltung aufheben",
"app.userList.userAriaLabel": "{0} {1} {2} Status {3}",
@@ -651,7 +651,7 @@
"app.createBreakoutRoom.notAssigned": "Nicht zugewiesen ({0})",
"app.createBreakoutRoom.join": "Raum beitreten",
"app.createBreakoutRoom.joinAudio": "Audio starten",
- "app.createBreakoutRoom.returnAudio": "Return audio",
+ "app.createBreakoutRoom.returnAudio": "Audio zurückgeben",
"app.createBreakoutRoom.alreadyConnected": "Bereits im Raum",
"app.createBreakoutRoom.confirm": "Erstellen",
"app.createBreakoutRoom.record": "Aufzeichnen",
@@ -676,7 +676,7 @@
"app.externalVideo.urlInput": "Video-URL hinzufügen",
"app.externalVideo.urlError": "Diese Video-URL wird nicht unterstützt",
"app.externalVideo.close": "Schließen",
- "app.externalVideo.autoPlayWarning": "Video abspielen um Mediensynchronisation zu aktivieren",
+ "app.externalVideo.autoPlayWarning": "Video abspielen, um Mediensynchronisation zu aktivieren",
"app.network.connection.effective.slow": "Es wurden Verbindungsprobleme beobachtet.",
"app.network.connection.effective.slow.help": "Weitere Informationen",
"app.externalVideo.noteLabel": "Hinweis: Geteilte externe Videos werden nicht in der Aufzeichnung enthalten sein. Youtube, Vimeo, Instructure Media, Twitch und Daily Motion URLs werden unterstützt.",
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 31ef683d9da73dd9d9f078efd066779f37e943c0..6457c594cfa6569e39707a0050bfc0056961db27 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -60,7 +60,6 @@
"app.userList.messagesTitle": "Messages",
"app.userList.notesTitle": "Notes",
"app.userList.notesListItem.unreadContent": "New content is available in the shared notes section",
- "app.userList.handAlert": "has raised their hand",
"app.userList.captionsTitle": "Captions",
"app.userList.presenter": "Presenter",
"app.userList.you": "You",
@@ -97,6 +96,8 @@
"app.userList.userOptions.unmuteAllDesc": "Unmutes the meeting",
"app.userList.userOptions.lockViewersLabel": "Lock viewers",
"app.userList.userOptions.lockViewersDesc": "Lock certain functionalities for attendees of the meeting",
+ "app.userList.userOptions.connectionStatusLabel": "Connection status",
+ "app.userList.userOptions.connectionStatusDesc": "View users' connection status",
"app.userList.userOptions.disableCam": "Viewers' webcams are disabled",
"app.userList.userOptions.disableMic": "Viewers' microphones are disabled",
"app.userList.userOptions.disablePrivChat": "Private chat is disabled",
@@ -128,10 +129,13 @@
"app.meeting.meetingTimeRemaining": "Meeting time remaining: {0}",
"app.meeting.meetingTimeHasEnded": "Time ended. Meeting will close soon",
"app.meeting.endedMessage": "You will be forwarded back to the home screen",
- "app.meeting.alertMeetingEndsUnderOneMinute": "Meeting is closing in a minute.",
- "app.meeting.alertBreakoutEndsUnderOneMinute": "Breakout is closing in a minute.",
+ "app.meeting.alertMeetingEndsUnderMinutesSingular": "Meeting is closing in one minute.",
+ "app.meeting.alertMeetingEndsUnderMinutesPlural": "Meeting is closing in {0} minutes.",
+ "app.meeting.alertBreakoutEndsUnderMinutesPlural": "Breakout is closing in {0} minutes.",
+ "app.meeting.alertBreakoutEndsUnderMinutesSingular": "Breakout is closing in one minute.",
"app.presentation.hide": "Hide presentation",
"app.presentation.notificationLabel": "Current presentation",
+ "app.presentation.downloadLabel": "Download",
"app.presentation.slideContent": "Slide Content",
"app.presentation.startSlideContent": "Slide content start",
"app.presentation.endSlideContent": "Slide content end",
@@ -176,6 +180,7 @@
"app.presentationUploder.rejectedError": "The selected file(s) have been rejected. Please check the file type(s).",
"app.presentationUploder.upload.progress": "Uploading ({0}%)",
"app.presentationUploder.upload.413": "File is too large. Please split into multiple files.",
+ "app.presentationUploder.genericError": "Oops, Something went wrong ...",
"app.presentationUploder.upload.408": "Request upload token timeout.",
"app.presentationUploder.upload.404": "404: Invalid upload token",
"app.presentationUploder.upload.401": "Request presentation upload token failed.",
@@ -197,6 +202,13 @@
"app.presentationUploder.tableHeading.filename": "File name",
"app.presentationUploder.tableHeading.options": "Options",
"app.presentationUploder.tableHeading.status": "Status",
+ "app.presentationUploder.uploading": "Uploading {0} {1}",
+ "app.presentationUploder.uploadStatus": "{0} of {1} uploads complete",
+ "app.presentationUploder.completed": "{0} uploads complete",
+ "app.presentationUploder.item" : "item",
+ "app.presentationUploder.itemPlural" : "items",
+ "app.presentationUploder.clearErrors": "Clear errors",
+ "app.presentationUploder.clearErrorsDesc": "Clears failed presentation uploads",
"app.poll.pollPaneTitle": "Polling",
"app.poll.quickPollTitle": "Quick Poll",
"app.poll.hidePollDesc": "Hides the poll menu pane",
@@ -242,6 +254,7 @@
"app.connectingMessage": "Connecting ...",
"app.waitingMessage": "Disconnected. Trying to reconnect in {0} seconds ...",
"app.retryNow": "Retry now",
+ "app.muteWarning.label": "Click {0} to unmute yourself.",
"app.navBar.settingsDropdown.optionsLabel": "Options",
"app.navBar.settingsDropdown.fullscreenLabel": "Make fullscreen",
"app.navBar.settingsDropdown.settingsLabel": "Settings",
@@ -269,7 +282,7 @@
"app.leaveConfirmation.confirmLabel": "Leave",
"app.leaveConfirmation.confirmDesc": "Logs you out of the meeting",
"app.endMeeting.title": "End meeting",
- "app.endMeeting.description": "Are you sure you want to end this session?",
+ "app.endMeeting.description": "Are you sure you want to end this meeting for everyone (all users will be disconnected)?",
"app.endMeeting.yesLabel": "Yes",
"app.endMeeting.noLabel": "No",
"app.about.title": "About",
@@ -326,6 +339,10 @@
"app.settings.dataSavingTab.screenShare": "Enable desktop sharing",
"app.settings.dataSavingTab.description": "To save your bandwidth adjust what's currently being displayed.",
"app.settings.save-notification.label": "Settings have been saved",
+ "app.statusNotifier.lowerHands": "Lower Hands",
+ "app.statusNotifier.raisedHandsTitle": "Raised Hands",
+ "app.statusNotifier.raisedHandDesc": "{0} raised their hand",
+ "app.statusNotifier.and": "and",
"app.switch.onLabel": "ON",
"app.switch.offLabel": "OFF",
"app.talkingIndicator.ariaMuteDesc" : "Select to mute user",
@@ -540,6 +557,12 @@
"app.lock-viewers.button.cancel": "Cancel",
"app.lock-viewers.locked": "Locked",
"app.lock-viewers.unlocked": "Unlocked",
+ "app.connection-status.ariaTitle": "Connection status modal",
+ "app.connection-status.title": "Connection status",
+ "app.connection-status.description": "View users' connection status",
+ "app.connection-status.empty": "There isn't any connectivity issue reported up to now",
+ "app.connection-status.more": "more",
+ "app.connection-status.offline": "offline",
"app.recording.startTitle": "Start recording",
"app.recording.stopTitle": "Pause recording",
"app.recording.resumeTitle": "Resume recording",
@@ -552,6 +575,7 @@
"app.videoPreview.findingWebcamsLabel": "Finding webcams",
"app.videoPreview.startSharingLabel": "Start sharing",
"app.videoPreview.stopSharingLabel": "Stop sharing",
+ "app.videoPreview.stopSharingAllLabel": "Stop all",
"app.videoPreview.sharedCameraLabel": "This camera is already being shared",
"app.videoPreview.webcamOptionLabel": "Choose webcam",
"app.videoPreview.webcamPreviewLabel": "Webcam preview",
@@ -688,7 +712,7 @@
"app.externalVideo.autoPlayWarning": "Play the video to enable media synchronization",
"app.network.connection.effective.slow": "We're noticing connectivity issues.",
"app.network.connection.effective.slow.help": "More information",
- "app.externalVideo.noteLabel": "Note: Shared external videos will not appear in the recording. YouTube, Vimeo, Instructure Media, Twitch and Daily Motion URLs are supported.",
+ "app.externalVideo.noteLabel": "Note: Shared external videos will not appear in the recording. YouTube, Vimeo, Instructure Media, Twitch, Dailymotion and media file URLs (e.g. https://example.com/xy.mp4) are supported.",
"app.actionsBar.actionsDropdown.shareExternalVideo": "Share an external video",
"app.actionsBar.actionsDropdown.stopShareExternalVideo": "Stop sharing external video",
"app.iOSWarning.label": "Please upgrade to iOS 12.2 or higher",
diff --git a/bigbluebutton-html5/private/locales/es.json b/bigbluebutton-html5/private/locales/es.json
index b8cd9d867acc267be9ff076e3ba6184cecb5b3b7..724007d919f998cabcae9f737ecde754c8b7f3f3 100644
--- a/bigbluebutton-html5/private/locales/es.json
+++ b/bigbluebutton-html5/private/locales/es.json
@@ -63,6 +63,7 @@
"app.userList.presenter": "Presentador",
"app.userList.you": "Tu",
"app.userList.locked": "Bloqueado",
+ "app.userList.byModerator": "por (Moderador)",
"app.userList.label": "Lista de usuarios",
"app.userList.toggleCompactView.label": "Cambiar a modo de vista compacta",
"app.userList.guest": "Huesped",
@@ -72,6 +73,8 @@
"app.userList.menu.chat.label": "Iniciar el chat privado",
"app.userList.menu.clearStatus.label": "Borrar estado",
"app.userList.menu.removeUser.label": "Eliminar usuario",
+ "app.userList.menu.removeConfirmation.label": "Remover usuario ({0})",
+ "app.userlist.menu.removeConfirmation.desc": "Evitar que este usuario reingrese a la sesión.",
"app.userList.menu.muteUserAudio.label": "Deshabilitar audio de usuario",
"app.userList.menu.unmuteUserAudio.label": "Habilitar audio de usuario",
"app.userList.userAriaLabel": "{0} {1} {2} estado {3}",
@@ -88,7 +91,7 @@
"app.userList.userOptions.clearAllDesc": "Borrar todos los iconos de estado de usuarios",
"app.userList.userOptions.muteAllExceptPresenterLabel": "Deshabilitar audio a todos los usuarios excepto a presentador",
"app.userList.userOptions.muteAllExceptPresenterDesc": "Deshabilitar audio a todos los usuarios en la sesión excepto a presentador",
- "app.userList.userOptions.unmuteAllLabel": "Desactivar funcion para deshabilitar audio",
+ "app.userList.userOptions.unmuteAllLabel": "Finalizar silenciado para todos los usuarios",
"app.userList.userOptions.unmuteAllDesc": "Habilitar audio en la sesión",
"app.userList.userOptions.lockViewersLabel": "Bloquear espectadores",
"app.userList.userOptions.lockViewersDesc": "Bloquear algunas funciones a espectadores",
@@ -109,9 +112,10 @@
"app.userList.userOptions.enableOnlyModeratorWebcam": "Usted puede habilitar su cámara web ahora. Todos podrán verle",
"app.media.label": "Media",
"app.media.autoplayAlertDesc": "Permitir acceso",
- "app.media.screenshare.start": "Compartir pantalla ha iniciado",
- "app.media.screenshare.end": "Compartir pantalla ha finalizado",
+ "app.media.screenshare.start": "Has comenzado a compartir pantalla",
+ "app.media.screenshare.end": "Has dejado de compartir pantalla",
"app.media.screenshare.unavailable": "Compartir pantalla no disponible",
+ "app.media.screenshare.notSupported": "Compartir pantalla no está habilitado para este navegador.",
"app.media.screenshare.autoplayBlockedDesc": "Necesitamos su permiso para mostrarle la pantalla del presentador",
"app.media.screenshare.autoplayAllowLabel": "Ver pantalla compartida",
"app.screenshare.notAllowed": "Error: No tiene permisos para acceder a la pantalla",
@@ -210,16 +214,16 @@
"app.poll.t": "Verdadero",
"app.poll.f": "Falso",
"app.poll.tf": "Verdadero / Falseo",
- "app.poll.y": "Si",
+ "app.poll.y": "SÃ",
"app.poll.n": "No",
- "app.poll.yn": "Si / No",
+ "app.poll.yn": "SÃ / No",
"app.poll.a2": "A / B",
"app.poll.a3": "A / B / C",
"app.poll.a4": "A / B / C / D",
"app.poll.a5": "A / B / C / D / E",
"app.poll.answer.true": "Verdadero",
"app.poll.answer.false": "Falso",
- "app.poll.answer.yes": "Si",
+ "app.poll.answer.yes": "SÃ",
"app.poll.answer.no": "No",
"app.poll.answer.a": "A",
"app.poll.answer.b": "B",
@@ -264,7 +268,7 @@
"app.leaveConfirmation.confirmDesc": "Te desconecta de la reunión",
"app.endMeeting.title": "Finalizar sesión",
"app.endMeeting.description": "¿Estás seguro de querer finalizar la sesión?",
- "app.endMeeting.yesLabel": "Si",
+ "app.endMeeting.yesLabel": "SÃ",
"app.endMeeting.noLabel": "No",
"app.about.title": "Acerca de",
"app.about.version": "Versión del cliente:",
@@ -301,7 +305,7 @@
"app.submenu.video.title": "Video",
"app.submenu.video.videoSourceLabel": "Fuente del video",
"app.submenu.video.videoOptionLabel": "Escoger ver fuente",
- "app.submenu.video.videoQualityLabel": "Calidad de vÃdeo",
+ "app.submenu.video.videoQualityLabel": "Calidad de video",
"app.submenu.video.qualityOptionLabel": "Escoger calidad del video",
"app.submenu.video.participantsCamLabel": "Viendo webcams de participantes",
"app.settings.applicationTab.label": "Aplicación",
@@ -309,7 +313,7 @@
"app.settings.videoTab.label": "Video",
"app.settings.usersTab.label": "Participantes",
"app.settings.main.label": "Configuración",
- "app.settings.main.cancel.label": "Cancela",
+ "app.settings.main.cancel.label": "Cancelar",
"app.settings.main.cancel.label.description": "Deshecha los cambios y cierra el menú de configuración",
"app.settings.main.save.label": "Guardar",
"app.settings.main.save.label.description": "Gurada cambios y cierra el menú de configuración",
@@ -327,7 +331,7 @@
"app.actionsBar.actionsDropdown.presentationLabel": "Subir una presentación",
"app.actionsBar.actionsDropdown.initPollLabel": "Iniciar una encuesta",
"app.actionsBar.actionsDropdown.desktopShareLabel": "Compartir tu pantalla",
- "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Compartir pantalla esta bloqueada",
+ "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Compartir pantalla está bloqueado",
"app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Dejar de compartir tu pantalla",
"app.actionsBar.actionsDropdown.presentationDesc": "Subir tu presentación",
"app.actionsBar.actionsDropdown.initPollDesc": "Iniciar una encuesta",
@@ -383,7 +387,7 @@
"app.audioNotification.closeLabel": "Cerrar",
"app.audioNotificaion.reconnectingAsListenOnly": "El micrófono ha sido bloqueado para todos los espectadores, tu conexión es en modo \"solo escuchar\"",
"app.breakoutJoinConfirmation.title": "Ingresar a un grupo de trabajo",
- "app.breakoutJoinConfirmation.message": "Quieres unirte",
+ "app.breakoutJoinConfirmation.message": "¿Deseas entrar a la ",
"app.breakoutJoinConfirmation.confirmDesc": "Ingresar a un grupo de trabajo",
"app.breakoutJoinConfirmation.dismissLabel": "Cancelar",
"app.breakoutJoinConfirmation.dismissDesc": "Cierra y rechaza entrada a grupo de trabajo",
@@ -394,18 +398,18 @@
"app.audioModal.ariaTitle": "Unirse en modo audio",
"app.audioModal.microphoneLabel": "Micrófono",
"app.audioModal.listenOnlyLabel": "Solo escuchar",
- "app.audioModal.audioChoiceLabel": "¿Como quieres unirte al audio?",
+ "app.audioModal.audioChoiceLabel": "¿Cómo quieres unirte al audio?",
"app.audioModal.iOSBrowser": "Audio/Video no soportado",
"app.audioModal.iOSErrorDescription": "En este momento el audio y video no son soportados en Chrome para iOS.",
"app.audioModal.iOSErrorRecommendation": "Te recomendamos utilizar Safari OS.",
- "app.audioModal.audioChoiceDesc": "Selecciona como unirse al audio en esta reunión",
+ "app.audioModal.audioChoiceDesc": "Selecciona como quieres unirte al audio en esta reunión",
"app.audioModal.unsupportedBrowserLabel": "Parece que está usando un navegador no totalmente soportado. Por favor, utilice uno de los siguientes {0} ó {1} para una compatibilidad completa. ",
"app.audioModal.closeLabel": "Cerrar",
- "app.audioModal.yes": "Si",
+ "app.audioModal.yes": "SÃ",
"app.audioModal.no": "No",
- "app.audioModal.yes.arialabel" : "Eco es audible",
- "app.audioModal.no.arialabel" : "Eco es inaudible",
- "app.audioModal.echoTestTitle": "Esta es una prueba de eco privada. Dà unas palabras. ¿Escuchaste el audio?",
+ "app.audioModal.yes.arialabel" : "Sonido es audible",
+ "app.audioModal.no.arialabel" : "Sonido es inaudible",
+ "app.audioModal.echoTestTitle": "Esta es una prueba de sonido privada. Dà unas palabras. ¿Escuchaste el audio?",
"app.audioModal.settingsTitle": "Cambia tu configuración de audio",
"app.audioModal.helpTitle": "Ocurrió un error con tus dispositivos de medios",
"app.audioModal.helpText": "¿Autorizaste el uso de tu micrófono? Ten en cuenta que cuando tratas de ingresar al audio, se te debe mostrar una caja de diálogo en la que se solicita tu autorización. Si no ocurrió intenta cambiar los permisos de tu micrófono en el area de configuración de tu navegador.",
@@ -417,25 +421,25 @@
"app.audioModal.autoplayBlockedDesc": "Necesitamos su permiso para reproducir audio.",
"app.audioModal.playAudio": "Reproducir audio",
"app.audioModal.playAudio.arialabel" : "Reproducir audio",
- "app.audioDial.tipIndicator": "Pista",
+ "app.audioDial.tipIndicator": "Sugerencia",
"app.audioDial.tipMessage": "Pulse la tecla '0' en su teléfono para silenciarse/activar el audio a si mismo.",
"app.audioModal.connecting": "Conectándose",
- "app.audioModal.connectingEchoTest": "Conectándose a prueba de eco",
+ "app.audioModal.connectingEchoTest": "Conectándose a prueba de sonido",
"app.audioManager.joinedAudio": "Has ingresado a la conferencia de audio",
- "app.audioManager.joinedEcho": "Has ingresado a la prueba de eco",
+ "app.audioManager.joinedEcho": "Has ingresado a la prueba de sonido",
"app.audioManager.leftAudio": "Has abandonado la conferencia de audio",
"app.audioManager.reconnectingAudio": "Intentando reconectar audio",
- "app.audioManager.genericError": "Error: Ocurrio un error, por favor intentalo de nuevo",
+ "app.audioManager.genericError": "Error: Ocurrió un error, por favor inténtalo de nuevo",
"app.audioManager.connectionError": "Error: Error de conexión",
- "app.audioManager.requestTimeout": "Error: Ocurrio un error de tiempo de espera",
- "app.audioManager.invalidTarget": "Error: Intento hacer una petición a un destino invalido",
+ "app.audioManager.requestTimeout": "Error: Ocurrió un error de tiempo de espera",
+ "app.audioManager.invalidTarget": "Error: Intentó hacer una petición a un destino inválido",
"app.audioManager.mediaError": "Error: Ocurrió un error al obtener los dispositivos de medios",
"app.audio.joinAudio": "Unirse al audio",
"app.audio.leaveAudio": "Abandonar audio",
"app.audio.enterSessionLabel": "Entrar a la sesión",
"app.audio.playSoundLabel": "Reproducir sonido",
"app.audio.backLabel": "Atrás",
- "app.audio.audioSettings.titleLabel": "Seleccionar tu configuración de audio",
+ "app.audio.audioSettings.titleLabel": "Selecciona tu configuración de audio",
"app.audio.audioSettings.descriptionLabel": "Ten en cuenta que aparecerá un cuadro de diálogo en tu navegador, que te pide a aceptar compartir tu micrófono.",
"app.audio.audioSettings.microphoneSourceLabel": "Fuente del micrófono",
"app.audio.audioSettings.speakerSourceLabel": "Fuente de altavoz",
@@ -490,7 +494,7 @@
"app.toast.clearedEmoji.label": "Estado del emoji borrado",
"app.toast.setEmoji.label": "Estado del emoji cambiado a {0}",
"app.toast.meetingMuteOn.label": "Todos los usuarios han sido silenciados",
- "app.toast.meetingMuteOff.label": "Función de silenciar ha sido deshabilitada",
+ "app.toast.meetingMuteOff.label": "Todos los usuarios pueden hablar",
"app.notification.recordingStart": "La sesión está siendo grabada",
"app.notification.recordingStop": "Esta sesión no está siendo grabada",
"app.notification.recordingPaused": "Se ha dejado de grabar la sesión",
@@ -526,7 +530,7 @@
"app.lock-viewers.userListLabel": "Ver otros participantes en la lista de usuarios",
"app.lock-viewers.ariaTitle": "Bloquear a observadores configuración modal",
"app.lock-viewers.button.apply": "Aplicar",
- "app.lock-viewers.button.cancel": "Cancela",
+ "app.lock-viewers.button.cancel": "Cancelar",
"app.lock-viewers.locked": "Bloqueado",
"app.lock-viewers.unlocked": "Desbloqueado",
"app.recording.startTitle": "Iniciar grabación",
@@ -539,7 +543,7 @@
"app.videoPreview.cancelLabel": "Cancelar",
"app.videoPreview.closeLabel": "Cerrar",
"app.videoPreview.findingWebcamsLabel": "Buscando webcams",
- "app.videoPreview.startSharingLabel": "Iniciar compartir",
+ "app.videoPreview.startSharingLabel": "Compartir cámara",
"app.videoPreview.webcamOptionLabel": "Selecciona la webcam",
"app.videoPreview.webcamPreviewLabel": "Vista preliminar de webcam",
"app.videoPreview.webcamSettingsTitle": "Configuración de webcam",
@@ -559,14 +563,14 @@
"app.video.suggestWebcamLock": "¿Aplicar la configuración de bloqueo a las cámaras web de los observadores?",
"app.video.suggestWebcamLockReason": "(esto mejorará la estabilidad de la grabación)",
"app.video.enable": "Activar",
- "app.video.cancel": "Cancela",
+ "app.video.cancel": "Cancelar",
"app.video.swapCam": "Intercambiar",
"app.video.swapCamDesc": "intercambiar la dirección de las webcams",
"app.video.videoLocked": "Compartir cámara web bloqueado",
"app.video.videoButtonDesc": "Compartir webcam",
"app.video.videoMenu": "Menú de video",
"app.video.videoMenuDisabled": "Webcam deshabilitada",
- "app.video.videoMenuDesc": "Abrir el menú de vÃdeo",
+ "app.video.videoMenuDesc": "Abrir el menú de video",
"app.video.chromeExtensionError": "Debes instalar",
"app.video.chromeExtensionErrorLink": "esta extensión de Chrome",
"app.video.stats.title": "EstadÃsticas de conexión",
@@ -577,22 +581,22 @@
"app.video.stats.lostPercentage": "Porcentaje total de perdida",
"app.video.stats.lostRecentPercentage": "Porcentaje de pérdida reciente",
"app.video.stats.dimensions": "Dimensiones",
- "app.video.stats.codec": "Codec",
+ "app.video.stats.codec": "Códec",
"app.video.stats.decodeDelay": "Demora de decodificación",
"app.video.stats.rtt": "RTT",
"app.video.stats.encodeUsagePercent": "Uso de codificador",
"app.video.stats.currentDelay": "Demora actual",
"app.fullscreenButton.label": "Hacer {0} pantalla completa",
"app.deskshare.iceConnectionStateError": "Falló la conexión al compartir pantalla (ICE error 1108)",
- "app.sfu.mediaServerConnectionError2000": "No se pudo conectar al media del servidor (error 2000)",
+ "app.sfu.mediaServerConnectionError2000": "No se pudo conectar al servidor de medios (error 2000)",
"app.sfu.mediaServerOffline2001": "Servidor de medios offline. Por favor, inténtelo de nuevo más tarde (error 2001)",
"app.sfu.mediaServerNoResources2002": "El servidor de medios no tiene recursos disponibles (error 2002)",
"app.sfu.mediaServerRequestTimeout2003": "Se agotó el tiempo de espera para las solicitudes al servidor de medios (error 2003)",
"app.sfu.serverIceGatheringFailed2021": "El servidor de medios no puede reunir candidatos de conexión (ICE error 2021)",
- "app.sfu.serverIceGatheringFailed2022": "Conexión con el servidor de medior fallida (ICE error 2022)",
+ "app.sfu.serverIceGatheringFailed2022": "Conexión con el servidor de medios fallida (ICE error 2022)",
"app.sfu.mediaGenericError2200": "El servidor de medios falló en procesar la petición (error 2200)",
"app.sfu.invalidSdp2202":"El cliente generó una petición de medios inválida (SDP error 2202)",
- "app.sfu.noAvailableCodec2203": "El servidor no pudo encontrar un codec apropiado (error 2203)",
+ "app.sfu.noAvailableCodec2203": "El servidor no pudo encontrar un códec apropiado (error 2203)",
"app.meeting.endNotification.ok.label": "OK",
"app.whiteboard.annotations.poll": "Resultados de la encuesta compartidos",
"app.whiteboard.toolbar.tools": "Herramientas",
@@ -626,14 +630,14 @@
"app.whiteboard.toolbar.fontSize": "Lista de tamaño de letras",
"app.feedback.title": "Has salido de la conferencia",
"app.feedback.subtitle": "Nos encantarÃa saber cual fué tu experiencia con BigBlueButton (opcional)",
- "app.feedback.textarea": "¿Como podemos mejorar BigBlueButton?",
+ "app.feedback.textarea": "¿Cómo podemos mejorar BigBlueButton?",
"app.feedback.sendFeedback": "Enviar retroalimentación",
"app.feedback.sendFeedbackDesc": "Enviar retroalimentación y dejar la sesión",
"app.videoDock.webcamFocusLabel": "Enfocar",
"app.videoDock.webcamFocusDesc": "Enfocar la webcam seleccionada",
"app.videoDock.webcamUnfocusLabel": "Desenfocar",
"app.videoDock.webcamUnfocusDesc": "Desenfocar la camara seleccionada",
- "app.videoDock.autoplayBlockedDesc": "Necesitamos su permiso para mostrarle las webcams de otros usuarios.",
+ "app.videoDock.autoplayBlockedDesc": "Necesitamos tu permiso para mostrarle las webcams de otros usuarios.",
"app.videoDock.autoplayAllowLabel": "Ver webcams",
"app.invitation.title": "Invitación a grupo de trabajo",
"app.invitation.confirm": "Invitar",
@@ -653,7 +657,7 @@
"app.createBreakoutRoom.record": "Grabar",
"app.createBreakoutRoom.numberOfRooms": "Número de salas",
"app.createBreakoutRoom.durationInMinutes": "Duración (minutos)",
- "app.createBreakoutRoom.randomlyAssign": "Asignado aleatóriamente",
+ "app.createBreakoutRoom.randomlyAssign": "Asignado aleatoriamente",
"app.createBreakoutRoom.endAllBreakouts": "Finalizar todos los grupos de trabajo",
"app.createBreakoutRoom.roomName": "{0} (Sala - {1})",
"app.createBreakoutRoom.doneLabel": "Finalizado",
@@ -666,22 +670,22 @@
"app.createBreakoutRoom.modalDesc": "Consejo: Puede arrastrar-y-soltar un nombre de usuario para asignarlo a un grupo de trabajo especÃfico.",
"app.createBreakoutRoom.roomTime": "{0} minutos",
"app.createBreakoutRoom.numberOfRoomsError": "El número de salas es invalido.",
- "app.externalVideo.start": "Compartir un nuevo vÃdeo",
- "app.externalVideo.title": "Compartir un vÃdeo externo",
- "app.externalVideo.input": "URL de vÃdeo externo",
- "app.externalVideo.urlInput": "Añadir URL de vÃdeo",
- "app.externalVideo.urlError": "Esta URL de vÃdeo no está soportada",
+ "app.externalVideo.start": "Compartir un nuevo video",
+ "app.externalVideo.title": "Compartir un video externo",
+ "app.externalVideo.input": "URL de video externo",
+ "app.externalVideo.urlInput": "Añadir URL de video",
+ "app.externalVideo.urlError": "Esta URL de video no está soportada",
"app.externalVideo.close": "Cerrar",
- "app.externalVideo.autoPlayWarning": "Reproduzca el vÃdeo para activar la sincronización de medios",
+ "app.externalVideo.autoPlayWarning": "Reproduzca el video para activar la sincronización de medios",
"app.network.connection.effective.slow": "Estamos detectando problemas de conectividad.",
"app.network.connection.effective.slow.help": "Más información",
- "app.externalVideo.noteLabel": "Nota: Los vÃdeos externos compartidos no aparecerán en la grabación. Se admiten URLs de YouTube, Vimeo, Intructure Media, Twitch y Daily Motion.",
- "app.actionsBar.actionsDropdown.shareExternalVideo": "Compartir un vÃdeo externo",
- "app.actionsBar.actionsDropdown.stopShareExternalVideo": "Detener compartir vÃdeo externo",
+ "app.externalVideo.noteLabel": "Nota: Los videos externos compartidos no aparecerán en la grabación. Se admiten URLs de YouTube, Vimeo, Instructure Media, Twitch y Daily Motion.",
+ "app.actionsBar.actionsDropdown.shareExternalVideo": "Compartir un video externo",
+ "app.actionsBar.actionsDropdown.stopShareExternalVideo": "Dejar de compartir video externo",
"app.iOSWarning.label": "Por favor, actualice a iOS 12.2 o superior",
"app.legacy.unsupportedBrowser": "Parece que está usando un navegador no totalmente soportado. Por favor, utilice uno de los siguientes {0} ó {1} para una compatibilidad completa.",
"app.legacy.upgradeBrowser": "Parece que está usando una versión antigua del navegador. Por favor, actualice su navegador para una compatibilidad completa.",
- "app.legacy.criosBrowser": "Utilice Safari en iOS para contar con completo soporte."
+ "app.legacy.criosBrowser": "Utilice Safari en iOS para contar con soporte completo."
}
diff --git a/bigbluebutton-html5/private/locales/et.json b/bigbluebutton-html5/private/locales/et.json
index 4de1e5ca34b678b8614eafcc0080c5c3a5d8fde6..6ca8ecc11f2e66c6f0b85bae0c6d4fbc20b28777 100644
--- a/bigbluebutton-html5/private/locales/et.json
+++ b/bigbluebutton-html5/private/locales/et.json
@@ -72,6 +72,8 @@
"app.userList.menu.chat.label": "Alusta privaatset sõnumivahetust",
"app.userList.menu.clearStatus.label": "Tühista staatus",
"app.userList.menu.removeUser.label": "Eemalda kasutaja",
+ "app.userList.menu.removeConfirmation.label": "Eemalda kasutaja ({0})",
+ "app.userlist.menu.removeConfirmation.desc": "Takista kasutaja sessiooniga taasliitumine.",
"app.userList.menu.muteUserAudio.label": "Vaigista kasutaja",
"app.userList.menu.unmuteUserAudio.label": "Eemalda kasutaja vaigistus",
"app.userList.userAriaLabel": "{0} {1} {2} staatus {3}",
@@ -111,6 +113,8 @@
"app.media.autoplayAlertDesc": "Luba juurdepääs",
"app.media.screenshare.start": "Ekraanijagamine algas",
"app.media.screenshare.end": "Ekraanijagamine lõppes",
+ "app.media.screenshare.unavailable": "Ekraanijagamine pole saadaval",
+ "app.media.screenshare.notSupported": "Ekraanijagamine pole selles brauseris toetatud.",
"app.media.screenshare.autoplayBlockedDesc": "Vajame sinu luba, et näidata sulle esitleja ekraani.",
"app.media.screenshare.autoplayAllowLabel": "Vaata jagatud ekraani",
"app.screenshare.notAllowed": "Viga: Ekraanijagamiseks ei antud luba",
diff --git a/bigbluebutton-html5/private/locales/eu.json b/bigbluebutton-html5/private/locales/eu.json
index cab695213f7707c0570cc488e767a1d21094db2b..35f5a2ac2b4f1781e1d9f51367d24f2955efab7b 100644
--- a/bigbluebutton-html5/private/locales/eu.json
+++ b/bigbluebutton-html5/private/locales/eu.json
@@ -5,7 +5,7 @@
"app.chat.disconnected": "Deskonektatuta zaude, mezuak ezin dira bidali",
"app.chat.locked": "Txata blokeatuta dago, mezuak ezin dira bidali",
"app.chat.inputLabel": "Txatean {0} mezu sartu dira",
- "app.chat.inputPlaceholder": "Bidali mezua {0}-(r)i",
+ "app.chat.inputPlaceholder": "Bidali mezua {0}n",
"app.chat.titlePublic": "Txat publikoa",
"app.chat.titlePrivate": "Txat pribatua {0}-(r)ekin",
"app.chat.partnerDisconnected": "{0}-(e)k bilera utzi du",
@@ -63,6 +63,7 @@
"app.userList.presenter": "Aurkezlea",
"app.userList.you": "Zu",
"app.userList.locked": "Blokeatua",
+ "app.userList.byModerator": "egilea (Moderatzailea)",
"app.userList.label": "Erabiltzaileen zerrenda",
"app.userList.toggleCompactView.label": "Aldatu ikuspegi trinko modura",
"app.userList.guest": "Gonbidatua",
@@ -72,6 +73,8 @@
"app.userList.menu.chat.label": "Hasi txat pribatu bat",
"app.userList.menu.clearStatus.label": "Garbitu egoera",
"app.userList.menu.removeUser.label": "Kendu erabiltzailea",
+ "app.userList.menu.removeConfirmation.label": "Kendu erabiltzailea ({0})",
+ "app.userlist.menu.removeConfirmation.desc": "Ekidin erabiltzaile hau berriz saiora sartzea.",
"app.userList.menu.muteUserAudio.label": "Isilarazi erabiltzailea",
"app.userList.menu.unmuteUserAudio.label": "Hitza eman erabiltzaileari",
"app.userList.userAriaLabel": "{0} {1} {2} egoera {3}",
@@ -112,6 +115,7 @@
"app.media.screenshare.start": "Pantaila partekatzea hasi da",
"app.media.screenshare.end": "Pantaila partekatzea bukatu da",
"app.media.screenshare.unavailable": "Pantaila partekatzea ez dago eskuragarri",
+ "app.media.screenshare.notSupported": "Nabigatzaile honek ez du pantaila-partekatzea onartzen.",
"app.media.screenshare.autoplayBlockedDesc": "Zure baimena behar dugu aurkezlearen pantaila zuri erakusteko.",
"app.media.screenshare.autoplayAllowLabel": "Ikusi partekatutako pantaila",
"app.screenshare.notAllowed": "Errorea: Pantailan sartzeko baimena ez da eman.",
diff --git a/bigbluebutton-html5/private/locales/fa_IR.json b/bigbluebutton-html5/private/locales/fa_IR.json
index 814a4f19c3b4dc94c8abb449adba9c27ed51c4bf..0247ed5ed0c3c72829765ec9a28d812081683067 100644
--- a/bigbluebutton-html5/private/locales/fa_IR.json
+++ b/bigbluebutton-html5/private/locales/fa_IR.json
@@ -57,12 +57,13 @@
"app.userList.usersTitle": "کاربران",
"app.userList.participantsTitle": "شرکت کنندگان",
"app.userList.messagesTitle": "پیام ها",
- "app.userList.notesTitle": "یاددادشت ها",
+ "app.userList.notesTitle": "یادداشت ها",
"app.userList.notesListItem.unreadContent": "Ù…Øتوای جدید در بخش یادداشت های اشتراکی وجود دارد.",
"app.userList.captionsTitle": "عناوین",
"app.userList.presenter": "ارائه دهنده",
"app.userList.you": "شما",
"app.userList.locked": "Ù‚ÙÙ„ شده",
+ "app.userList.byModerator": "توسط (Moderator)",
"app.userList.label": "لیست کاربر",
"app.userList.toggleCompactView.label": "تغییر در Øالت نمایه Ùشرده",
"app.userList.guest": "مهمان",
@@ -72,6 +73,8 @@
"app.userList.menu.chat.label": "شروع Ú¯Ùتگوی خصوصی",
"app.userList.menu.clearStatus.label": "پاک کردن وضعیت",
"app.userList.menu.removeUser.label": "Øذ٠کاربر",
+ "app.userList.menu.removeConfirmation.label": "Øذ٠کاربر ({0})",
+ "app.userlist.menu.removeConfirmation.desc": "از ورود دوباره کاربر به این جلسه جلوگیری کن.",
"app.userList.menu.muteUserAudio.label": "بستن صدای کاربر",
"app.userList.menu.unmuteUserAudio.label": "Ùعال سازی صدای کاربر",
"app.userList.userAriaLabel": "{0} {1} {2} وضعیت {3}",
@@ -112,6 +115,7 @@
"app.media.screenshare.start": "اشتراک صÙØÙ‡ نمایش شروع شد",
"app.media.screenshare.end": "اشتراک صÙØÙ‡ نمایش به پایان رسید.",
"app.media.screenshare.unavailable": "اشتراک صÙØÙ‡ در دسترس نیست",
+ "app.media.screenshare.notSupported": "اشتراک صÙØÙ‡ نمایش توسط مرورگر شما پشتیبانی نمی شود",
"app.media.screenshare.autoplayBlockedDesc": "ما به مجوز شما برای نشان دادن شما به ارائه دهندگان نیاز داریم",
"app.media.screenshare.autoplayAllowLabel": "مشاهده صÙØÙ‡ اشتراکی",
"app.screenshare.notAllowed": "خطا : دسترسی برای نمایش صÙØÙ‡ ØŒ ایجاد نشد",
@@ -394,7 +398,7 @@
"app.audioModal.ariaTitle": "ملØÙ‚ شدن به مدال صدا",
"app.audioModal.microphoneLabel": "میکروÙون",
"app.audioModal.listenOnlyLabel": "تنها شنونده",
- "app.audioModal.audioChoiceLabel": "مایلید با چه روشی به بخش صدا وارید شوید؟",
+ "app.audioModal.audioChoiceLabel": "چنانچه مایل هستید تا از امکانات صوتی ذیل استÙاده کنید، روی آن کلیک نمایید.",
"app.audioModal.iOSBrowser": "صدا/تصویر پیشتیبانی نمیشود",
"app.audioModal.iOSErrorDescription": "در Øال Øاضر صدا Ùˆ تصویر در مرورگر کروم iOS پشتیبانی نمیشود",
"app.audioModal.iOSErrorRecommendation": "پیشنهاد ما استÙاده از ساÙاری در IOS است",
diff --git a/bigbluebutton-html5/private/locales/fi.json b/bigbluebutton-html5/private/locales/fi.json
index 200273c2f8792f85f99008107b5b537d8ce325c1..2a7b80f831b3ef9ef8baa364717bd19efe91d69e 100644
--- a/bigbluebutton-html5/private/locales/fi.json
+++ b/bigbluebutton-html5/private/locales/fi.json
@@ -567,9 +567,11 @@
"app.createBreakoutRoom.leastOneWarnBreakout": "Sinun täytyy asettaa vähintää yksi käyttäjä breakout-huoneeseen.",
"app.createBreakoutRoom.roomTime": "{0} minuuttia",
"app.externalVideo.start": "Jaa uusi video",
+ "app.externalVideo.title": "Jaa ulkoinen video",
"app.externalVideo.close": "Sulje",
"app.network.connection.effective.slow": "Havaitsemme internetyhteydessä ongelmia.",
"app.network.connection.effective.slow.help": "Lisätietoja",
+ "app.actionsBar.actionsDropdown.shareExternalVideo": "Jaa ulkoinen video",
"app.iOSWarning.label": "Ole hyvä ja päivitä käyttöjärjestelmäsi iOS 12.2 tai uudempaan versioon.",
"app.legacy.unsupportedBrowser": "Näyttää siltä että käytät selainta jota ei tueta. Ole hyvä ja käytä {0} tai {1} selainta.",
"app.legacy.upgradeBrowser": "Näyttää siltä että käytät tuetun selaimen vanhaa versiota. Ole hyvä ja päivitä selaimesi uusimpaan mahdolliseen versioon.",
diff --git a/bigbluebutton-html5/private/locales/fr.json b/bigbluebutton-html5/private/locales/fr.json
index df0ab51259bf3be07f13aa07d4949aafa380dfb1..4b3555d1957ecc782d8df6ade51c574c8b2feaa5 100644
--- a/bigbluebutton-html5/private/locales/fr.json
+++ b/bigbluebutton-html5/private/locales/fr.json
@@ -74,7 +74,7 @@
"app.userList.menu.clearStatus.label": "Effacer le statut",
"app.userList.menu.removeUser.label": "Retirer l'utilisateur",
"app.userList.menu.removeConfirmation.label": "Supprimer utilisateur ({0})",
- "app.userlist.menu.removeConfirmation.desc": "Voulez-vous vraiment supprimer cet utilisateur ?\nUne fois supprimé, il ne pourra pas rejoindre cette session.",
+ "app.userlist.menu.removeConfirmation.desc": "Empêcher cet utilisateur de joindre de nouveau la session.",
"app.userList.menu.muteUserAudio.label": "Rendre Muet",
"app.userList.menu.unmuteUserAudio.label": "Autoriser à parler",
"app.userList.userAriaLabel": "{0} {1} {2} État {3}",
@@ -115,6 +115,7 @@
"app.media.screenshare.start": "Le Partage d'écran a commencé",
"app.media.screenshare.end": "Le Partage d'écran s'est terminé",
"app.media.screenshare.unavailable": "Partage d'écran indisponible",
+ "app.media.screenshare.notSupported": "Le partage d'écran n'est pas supporté dans ce navigateur.",
"app.media.screenshare.autoplayBlockedDesc": "Nous avons besoin de votre permission pour vous montrer l'écran du présentateur.",
"app.media.screenshare.autoplayAllowLabel": "Afficher l'écran partagé",
"app.screenshare.notAllowed": "Erreur : l'autorisation d'accès à l'écran n'a pas été accordée.",
diff --git a/bigbluebutton-html5/private/locales/gl.json b/bigbluebutton-html5/private/locales/gl.json
index 4a7128801b506fbc3006189b4c8282aa127183ef..a37af171bc8b226567a4063b88d6f95b0730e97b 100644
--- a/bigbluebutton-html5/private/locales/gl.json
+++ b/bigbluebutton-html5/private/locales/gl.json
@@ -8,7 +8,7 @@
"app.chat.inputPlaceholder": "Enviar mensaxe a {0}.",
"app.chat.titlePublic": "Conversa pública",
"app.chat.titlePrivate": "Conversa privada con {0}.",
- "app.chat.partnerDisconnected": "{0} abandonou a xuntanza",
+ "app.chat.partnerDisconnected": "{0} saÃu da xuntanza",
"app.chat.closeChatLabel": "Pechar {0}",
"app.chat.hideChatLabel": "Agochar {0}",
"app.chat.moreMessages": "Máis mensaxes a seguir",
@@ -17,31 +17,31 @@
"app.chat.dropdown.copy": "Copiar",
"app.chat.dropdown.save": "Gardar",
"app.chat.label": "Conversa",
- "app.chat.offline": "Desconectado",
+ "app.chat.offline": "Sen conexión",
"app.chat.emptyLogLabel": "Rexistro da conversa baleiro",
"app.chat.clearPublicChatMessage": "A conversa publica foi retirada por un moderador",
"app.chat.multi.typing": "Varios usuarios están a escribir",
"app.chat.one.typing": "{0} está a escribir",
"app.chat.two.typing": "{0} e {1} están a escribir",
- "app.captions.label": "SubtÃtulos",
+ "app.captions.label": "Lendas",
"app.captions.menu.close": "Pechar",
"app.captions.menu.start": "Iniciar",
- "app.captions.menu.ariaStart": "Comezar a escribir subtÃtulos",
- "app.captions.menu.ariaStartDesc": "Abre o editor de subtÃtulos e pecha a xanela modal",
+ "app.captions.menu.ariaStart": "Comezar a escribir lendas",
+ "app.captions.menu.ariaStartDesc": "Abre o editor de lendas e pecha a xanela modal",
"app.captions.menu.select": "Seleccione idiomas dispoñÃbeis",
- "app.captions.menu.ariaSelect": "Idioma dos subtÃtulos",
- "app.captions.menu.subtitle": "Seleccione o idioma e estilos para subtÃtulos a utilizar na súa sesión.",
- "app.captions.menu.title": "SubtÃtulos",
+ "app.captions.menu.ariaSelect": "Idioma das lendas",
+ "app.captions.menu.subtitle": "Seleccione o idioma e estilos para as lendas a utilizar na súa sesión.",
+ "app.captions.menu.title": "Lendas pechadas",
"app.captions.menu.fontSize": "Tamaño",
- "app.captions.menu.fontColor": "Cor de texto",
+ "app.captions.menu.fontColor": "Cor do texto",
"app.captions.menu.fontFamily": "Tipo de letra",
- "app.captions.menu.backgroundColor": "Cor de fondo",
+ "app.captions.menu.backgroundColor": "Cor do fondo",
"app.captions.menu.previewLabel": "Vista previa",
"app.captions.menu.cancelLabel": "Cancelar",
- "app.captions.pad.hide": "Agochar os subtÃtulos",
+ "app.captions.pad.hide": "Agochar as lendas pechadas",
"app.captions.pad.tip": "Prema Esc para enfocar a barra de ferramentas do editor",
"app.captions.pad.ownership": "Tomar o control",
- "app.captions.pad.ownershipTooltip": "Vai ser asignado coma propietario de {0} subtÃtulos",
+ "app.captions.pad.ownershipTooltip": "Vai ser asignado coma propietario de {0} lendas",
"app.captions.pad.interimResult": "Resultados provisionais",
"app.captions.pad.dictationStart": "Iniciar ditado",
"app.captions.pad.dictationStop": "Deter ditado",
@@ -59,7 +59,7 @@
"app.userList.messagesTitle": "Mensaxes",
"app.userList.notesTitle": "Notas",
"app.userList.notesListItem.unreadContent": "Contido novo dispoñÃbel na sección de notas compartidas",
- "app.userList.captionsTitle": "SubtÃtulos",
+ "app.userList.captionsTitle": "Lendas",
"app.userList.presenter": "Presentador",
"app.userList.you": "Vostede",
"app.userList.locked": "Bloqueado",
@@ -74,12 +74,12 @@
"app.userList.menu.clearStatus.label": "Limpar o estado",
"app.userList.menu.removeUser.label": "Retirar o usuario",
"app.userList.menu.removeConfirmation.label": "Retirar o usuario ({0})",
- "app.userlist.menu.removeConfirmation.desc": "Confirma que quere retirar este usuario? Unha vez retirado non poderá volver entrar nesta sesión.",
+ "app.userlist.menu.removeConfirmation.desc": " Impedir que este usuario se reincorpore á sesión.",
"app.userList.menu.muteUserAudio.label": "Desactivar o son do usuario",
"app.userList.menu.unmuteUserAudio.label": "Activar o son do usuario",
"app.userList.userAriaLabel": "{0} {1} {2} estado {3}",
"app.userList.menu.promoteUser.label": "Promover a moderador",
- "app.userList.menu.demoteUser.label": "Degradar a espectador",
+ "app.userList.menu.demoteUser.label": "Relegado a espectador",
"app.userList.menu.unlockUser.label": "Desbloquear {0}",
"app.userList.menu.lockUser.label": "Bloquear {0}",
"app.userList.menu.directoryLookup.label": "Atopar directorio",
@@ -101,7 +101,7 @@
"app.userList.userOptions.disablePubChat": "A conversa pública está desactivada",
"app.userList.userOptions.disableNote": "As notas compartidas están bloqueadas",
"app.userList.userOptions.hideUserList": "A lista de usuarios agora está agochada para os espectadores",
- "app.userList.userOptions.webcamsOnlyForModerator": "Só os moderadores poden ver as cámaras web dos invitados (debido á configuración de bloqueo)",
+ "app.userList.userOptions.webcamsOnlyForModerator": "Só os moderadores poden ver as cámaras web dos convidados (por mor da configuración de bloqueo)",
"app.userList.content.participants.options.clearedStatus": "Limparonse todos os estados de usuario",
"app.userList.userOptions.enableCam": "As cámaras web dos espectadores están activadas",
"app.userList.userOptions.enableMic": "Os micrófonos dos espectadores están activados",
@@ -238,7 +238,7 @@
"app.failedMessage": "Desculpas, hai problemas para conectar co servidor.",
"app.downloadPresentationButton.label": "Descargar a presentación orixinal",
"app.connectingMessage": "Conectandose…",
- "app.waitingMessage": "Desconectado Tentando volver conectar en {0} segundos…",
+ "app.waitingMessage": "Desconectado. Tentando volver conectar en {0} segundos…",
"app.retryNow": "Volver tentalo agora",
"app.navBar.settingsDropdown.optionsLabel": "Opcións",
"app.navBar.settingsDropdown.fullscreenLabel": "Poñer a pantalla completa",
@@ -283,7 +283,7 @@
"app.actionsBar.camOffLabel": "Cámara apagada",
"app.actionsBar.raiseLabel": "Erguer",
"app.actionsBar.label": "Barra de accións",
- "app.actionsBar.actionsDropdown.restorePresentationLabel": "Reaurar a presentación",
+ "app.actionsBar.actionsDropdown.restorePresentationLabel": "Restaurar a presentación",
"app.actionsBar.actionsDropdown.restorePresentationDesc": "Botón para restaurar a presentación após ter sido pechada",
"app.screenshare.screenShareLabel" : "Compartir pantalla",
"app.submenu.application.applicationSectionTitle": "Aplicación",
@@ -320,7 +320,7 @@
"app.settings.dataSavingTab.label": "Aforro de datos",
"app.settings.dataSavingTab.webcam": "Activar as cámaras web",
"app.settings.dataSavingTab.screenShare": "Activar o escritorio compartido",
- "app.settings.dataSavingTab.description": "Para aforrar largo de banda axustar o que se se está a amosar",
+ "app.settings.dataSavingTab.description": "Para aforrar largo de banda axuste o que se se está a amosar",
"app.settings.save-notification.label": "Gardáronse os axustes",
"app.switch.onLabel": "Aceso",
"app.switch.offLabel": "Apagado",
@@ -342,8 +342,8 @@
"app.actionsBar.actionsDropdown.saveUserNames": "Gardar os nomes de usuario",
"app.actionsBar.actionsDropdown.createBreakoutRoom": "Crear salas parciais",
"app.actionsBar.actionsDropdown.createBreakoutRoomDesc": "crear salas parciais para dividir a xuntanza actual",
- "app.actionsBar.actionsDropdown.captionsLabel": "Escribir subtÃtulos",
- "app.actionsBar.actionsDropdown.captionsDesc": "Alternar o panel de subtÃtulos",
+ "app.actionsBar.actionsDropdown.captionsLabel": "Escribir lendas",
+ "app.actionsBar.actionsDropdown.captionsDesc": "Alternar o panel de lendas",
"app.actionsBar.actionsDropdown.takePresenter": "Tomar o rol de presentador",
"app.actionsBar.actionsDropdown.takePresenterDesc": "Asignarse a un mesmo como novo presentador",
"app.actionsBar.emojiMenu.statusTriggerLabel": "Estabelecer o estado",
@@ -368,8 +368,8 @@
"app.actionsBar.emojiMenu.thumbsDownLabel": "Sinal de desaprobación",
"app.actionsBar.emojiMenu.thumbsDownDesc": "Cambia o seu estado a sinal de desaprobación",
"app.actionsBar.currentStatusDesc": "estado actual {0}",
- "app.actionsBar.captions.start": "Comezar a ver subtÃtulos",
- "app.actionsBar.captions.stop": "Deixar de ver subtÃtulos",
+ "app.actionsBar.captions.start": "Comezar a ver lendas pechadas",
+ "app.actionsBar.captions.stop": "Deixar de ver lendas pechadas",
"app.audioNotification.audioFailedError1001": "WebSocket desconectado (error 1001)",
"app.audioNotification.audioFailedError1002": "Non foi posÃbel facer unha conexión WebSocket (erro 1002)",
"app.audioNotification.audioFailedError1003": "A versión do navegador non é compatÃbel (erro 1003)",
@@ -386,23 +386,23 @@
"app.audioNotification.mediaFailedMessage": "Produciuse un fallo en getUserMicMedia xa que só se permiten as orixes seguras",
"app.audioNotification.closeLabel": "Pechar",
"app.audioNotificaion.reconnectingAsListenOnly": "O micrófono bloqueouse para os espectadores, vostede está conectado só como oÃnte",
- "app.breakoutJoinConfirmation.title": "Entrar na sala parcial",
- "app.breakoutJoinConfirmation.message": "Quere entrar?",
- "app.breakoutJoinConfirmation.confirmDesc": "Entrar nunha sala parcial",
+ "app.breakoutJoinConfirmation.title": "Unirse á sala parcial",
+ "app.breakoutJoinConfirmation.message": "Quere unirse?",
+ "app.breakoutJoinConfirmation.confirmDesc": "Unirse a unha sala parcial",
"app.breakoutJoinConfirmation.dismissLabel": "Cancelar",
- "app.breakoutJoinConfirmation.dismissDesc": "Pechar e rexeitar a entrada na sala parcial",
- "app.breakoutJoinConfirmation.freeJoinMessage": "Seleccionar a sala parcial na que entrar",
+ "app.breakoutJoinConfirmation.dismissDesc": "Pechar e rexeitar a incorporación á sala parcial",
+ "app.breakoutJoinConfirmation.freeJoinMessage": "Seleccionar a sala parcial na que incorporarse",
"app.breakoutTimeRemainingMessage": "Tempo restante da sala parcial: {0}",
"app.breakoutWillCloseMessage": "Rematou o tempo. A sala parcial pecharase en breve.",
"app.calculatingBreakoutTimeRemaining": "Calculando tempo restante…",
- "app.audioModal.ariaTitle": " Xanela modal para entrar ao son",
+ "app.audioModal.ariaTitle": " Xanela modal para unirse ao son",
"app.audioModal.microphoneLabel": "Micrófono",
"app.audioModal.listenOnlyLabel": "Só escoitar",
- "app.audioModal.audioChoiceLabel": "GustarÃalle entrar ao son?",
+ "app.audioModal.audioChoiceLabel": "GustarÃalle unirse ao son?",
"app.audioModal.iOSBrowser": "Son/vÃdeo non compatÃbel",
"app.audioModal.iOSErrorDescription": "Neste momento o son e o vÃdeo non son compatÃbeis co Chrome para iOS.",
"app.audioModal.iOSErrorRecommendation": "Recomendámoslle empregar Safari iOS.",
- "app.audioModal.audioChoiceDesc": "Seleccionar como entrar ao son nesta xuntanza",
+ "app.audioModal.audioChoiceDesc": "Seleccionar como unirse ao son nesta xuntanza",
"app.audioModal.unsupportedBrowserLabel": "Parece que estás a usar un navegador que non é totalmente compatÃbel. Utilice {0} ou {1} para obter unha compatibilidade completa.",
"app.audioModal.closeLabel": "Pechar",
"app.audioModal.yes": "Si",
@@ -412,10 +412,10 @@
"app.audioModal.echoTestTitle": "Esta é unha proba de eco privada. Diga unhas palabras. Escoitou o son?",
"app.audioModal.settingsTitle": "Cambiar a súa configuración de son",
"app.audioModal.helpTitle": "Houbo un problema cos seus dispositivos multimedia",
- "app.audioModal.helpText": "Deu permiso para acceder ao seu micrófono? Teña en conta que deberÃa aparecer un diálogo cando tente unir o son, solicitando os permisos do seu dispositivo multimedia, acépteos para entrar na conferencia de son. Se non é asÃ, tente cambiar os permisos do micrófono na configuración do seu navegador.",
+ "app.audioModal.helpText": "Deu permiso para acceder ao seu micrófono? Teña en conta que deberÃa aparecer un diálogo cando tente unirse ao son, solicitando os permisos do seu dispositivo multimedia, acépteos para unirse a conferencia de son. Se non é asÃ, tente cambiar os permisos do micrófono na configuración do seu navegador.",
"app.audioModal.help.noSSL": "Esta páxina non é segura. Para poder acceder ao micrófono a páxina ten que ser servida mediante HTTPS. Contacte co administrador do servidor.",
"app.audioModal.help.macNotAllowed": "Parece que as preferencias do teu sistema Mac están a bloquear o acceso ao mÃcrofono. Abra Preferencias do sistema > Seguridade e privacidade > Privacidade > Micrófono, e verifique que o navegador que está a usar está marcado.",
- "app.audioModal.audioDialTitle": "Entre usando o seu teléfono",
+ "app.audioModal.audioDialTitle": "Unirse usando o seu teléfono",
"app.audioDial.audioDialDescription": "Marcar",
"app.audioDial.audioDialConfrenceText": "e introduza o número de PIN da conferencia:",
"app.audioModal.autoplayBlockedDesc": "Necesitamos o seu permiso para reproducir son.",
@@ -425,8 +425,8 @@
"app.audioDial.tipMessage": "Prema a tecla «0» no seu teléfono para silenciar/activar o seu propio son.",
"app.audioModal.connecting": "Conectando",
"app.audioModal.connectingEchoTest": "Conectando coa proba de eco",
- "app.audioManager.joinedAudio": "Vostede entrou na conferencia de son",
- "app.audioManager.joinedEcho": "Vostede entrou na proba de eco",
+ "app.audioManager.joinedAudio": "Vostede uniuse á conferencia de son",
+ "app.audioManager.joinedEcho": "Vostede uniuse á proba de eco",
"app.audioManager.leftAudio": "Vostede abandonou á conferencia de son",
"app.audioManager.reconnectingAudio": "Tentando volver conectar o son",
"app.audioManager.genericError": "Erro: produciuse un erro, tenteo de novo",
@@ -434,7 +434,7 @@
"app.audioManager.requestTimeout": "Erro: habÃa un tempo de espera na solicitude",
"app.audioManager.invalidTarget": "Erro: tentouse solicitar algo a un destino non válido",
"app.audioManager.mediaError": "Erro: produciuse un problema ao recibir os seus dispositivos multimedia",
- "app.audio.joinAudio": "Entrar ao son",
+ "app.audio.joinAudio": "Unirse ao son",
"app.audio.leaveAudio": "Abandonar o son",
"app.audio.enterSessionLabel": "Entrar na sesión",
"app.audio.playSoundLabel": "Reproducir son",
@@ -448,10 +448,10 @@
"app.audio.listenOnly.backLabel": "Atrás",
"app.audio.listenOnly.closeLabel": "Pechar",
"app.audio.permissionsOverlay.title": "Permitir o acceso ao seu micrófono",
- "app.audio.permissionsOverlay.hint": "Necesitamos que nos permita usar os seus dispositivos multimedia para introducilo na conferencia de voz :)",
+ "app.audio.permissionsOverlay.hint": "Necesitamos que nos permita usar os seus dispositivos multimedia para unilo á conferencia de voz :)",
"app.error.removed": "Vostede foi retirado/a da conferencia",
"app.error.meeting.ended": "Vostede desconectouse da conferencia",
- "app.meeting.logout.duplicateUserEjectReason": "Usuario duplicado tentando entrar na xuntanza",
+ "app.meeting.logout.duplicateUserEjectReason": "Usuario duplicado tentando unirse á xuntanza",
"app.meeting.logout.permissionEjectReason": "Expulsado por violación de permiso",
"app.meeting.logout.ejectedFromMeeting": "Vostede foi retirado/a da xuntanza",
"app.meeting.logout.validateTokenFailedEjectReason": "Produciuse un erro ao validar a testemuña de autorización",
@@ -474,7 +474,7 @@
"app.error.fallback.presentation.title": "Produciuse un erro",
"app.error.fallback.presentation.description": "Accedeu. Tente volver cargar a páxina.",
"app.error.fallback.presentation.reloadButton": "Recargar",
- "app.guest.waiting": "Agardando a aprobación para entrar",
+ "app.guest.waiting": "Agardando a aprobación para unirse",
"app.userList.guest.waitingUsers": "Usuarios agardando",
"app.userList.guest.waitingUsersTitle": "Xestión de usuarios",
"app.userList.guest.optionTitle": "Revisar os usuarios pendentes",
@@ -484,10 +484,10 @@
"app.userList.guest.denyEveryone": "Denegar a todos",
"app.userList.guest.pendingUsers": "{0} usuarios pendentes",
"app.userList.guest.pendingGuestUsers": "{0} convidados pendentes",
- "app.userList.guest.pendingGuestAlert": "Entrou na sesión e está agardando a súa aprobación.",
+ "app.userList.guest.pendingGuestAlert": "Uniuse á sesión e está agardando a súa aprobación.",
"app.userList.guest.rememberChoice": "Lembrar a escolla",
"app.user-info.title": "Atopar directorio",
- "app.toast.breakoutRoomEnded": "A sala parcial rematou. Volva entrar ao son.",
+ "app.toast.breakoutRoomEnded": "A sala parcial rematou. Volva incorporarse ao son.",
"app.toast.chat.public": "Nova mensaxe na conversa pública",
"app.toast.chat.private": "Nova mensaxe na conversa privada",
"app.toast.chat.system": "Sistema",
@@ -499,7 +499,7 @@
"app.notification.recordingStop": "Esta sesión non está a ser gravada",
"app.notification.recordingPaused": "Xa non se está a gravar esta sesión",
"app.notification.recordingAriaLabel": "Tempo de gravación",
- "app.notification.userJoinPushAlert": "{0} entrou na sesión",
+ "app.notification.userJoinPushAlert": "{0} incorporouse á sesión",
"app.shortcut-help.title": "Atallos de teclado",
"app.shortcut-help.accessKeyNotAvailable": "Teclas de acceso non dispoñÃbeis",
"app.shortcut-help.comboLabel": "Combinación",
@@ -649,8 +649,8 @@
"app.createBreakoutRoom.duration": "Duración {0}",
"app.createBreakoutRoom.room": "Sala {0}",
"app.createBreakoutRoom.notAssigned": "Sen asignar ({0})",
- "app.createBreakoutRoom.join": "Entrar na sala",
- "app.createBreakoutRoom.joinAudio": "Entrar ao son",
+ "app.createBreakoutRoom.join": "Unirse á sala",
+ "app.createBreakoutRoom.joinAudio": "Unirse ao son",
"app.createBreakoutRoom.returnAudio": "Regresar ao son",
"app.createBreakoutRoom.alreadyConnected": "Xa está na sala",
"app.createBreakoutRoom.confirm": "Crear",
@@ -665,7 +665,7 @@
"app.createBreakoutRoom.minusRoomTime": "DiminuÃr o tempo da sala parcial",
"app.createBreakoutRoom.addRoomTime": "Incrementar o tempo da sala parcial",
"app.createBreakoutRoom.addParticipantLabel": "+ Engadir participante",
- "app.createBreakoutRoom.freeJoin": "Permitirlle aos usuarios escoller a sala parcial na que entrar",
+ "app.createBreakoutRoom.freeJoin": "Permitirlle aos usuarios escoller a sala parcial á que incorporarse",
"app.createBreakoutRoom.leastOneWarnBreakout": "Debe poñer polo menos un usuario nunha sala parcial",
"app.createBreakoutRoom.modalDesc": "Consello: pode arrastrar e soltar o nome dun usuario para asignalo a unha sala parcial especÃfica.",
"app.createBreakoutRoom.roomTime": "{0} minutos",
diff --git a/bigbluebutton-html5/private/locales/hi_IN.json b/bigbluebutton-html5/private/locales/hi_IN.json
index eb0eb9aaf0ddcfb9dd6a016304fb5ae12a974171..fd2dd983862dac36ddf332b5d85f3794707a62cd 100644
--- a/bigbluebutton-html5/private/locales/hi_IN.json
+++ b/bigbluebutton-html5/private/locales/hi_IN.json
@@ -2,7 +2,10 @@
"app.home.greeting": "आपकी पà¥à¤°à¤¸à¥à¤¤à¥à¤¤à¤¿ शीघà¥à¤° ही शà¥à¤°à¥‚ होगी ...",
"app.chat.submitLabel": "मेसेज à¤à¥‡à¤œà¥‡à¤‚",
"app.chat.errorMaxMessageLength": "संदेश बहà¥à¤¤ लंबा है {0} अकà¥à¤·à¤°()",
+ "app.chat.disconnected": "आप डिसà¥à¤•à¤¨à¥‡à¤•à¥à¤Ÿ हो गठहैं, संदेश नहीं à¤à¥‡à¤œà¥‡ जा सकते हैं",
+ "app.chat.locked": "चैट बंद है, संदेश नहीं à¤à¥‡à¤œà¥‡ जा सकते",
"app.chat.inputLabel": "चैट के लिठसंदेश इनपà¥à¤Ÿ {0}",
+ "app.chat.inputPlaceholder": "{0} को संदेश à¤à¥‡à¤œà¥‡à¤‚",
"app.chat.titlePublic": "सारà¥à¤µà¤œà¤¨à¤¿à¤• चैट",
"app.chat.titlePrivate": "{0} के साथ निजी चैट",
"app.chat.partnerDisconnected": "{0} ने बैठक छोड़ दी है",
@@ -14,14 +17,35 @@
"app.chat.dropdown.copy": "पà¥à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¤¿",
"app.chat.dropdown.save": "बचाना",
"app.chat.label": "बातचीत",
+ "app.chat.offline": "ऑफलाइन",
"app.chat.emptyLogLabel": "चैट लॉग खाली है",
"app.chat.clearPublicChatMessage": "सारà¥à¤µà¤œà¤¨à¤¿à¤• चैट इतिहास à¤à¤• मॉडरेटर दà¥à¤µà¤¾à¤°à¤¾ साफ़ किया गया था",
+ "app.chat.multi.typing": "कई उपयोगकरà¥à¤¤à¤¾ टाइप कर रहे हैं",
+ "app.chat.one.typing": "{0} टाइपिंग कर रहा है",
+ "app.chat.two.typing": "{0} और {1} टाइप कर रहे हैं",
+ "app.captions.label": "कैपà¥à¤¶à¤¨",
"app.captions.menu.close": "बंद करे",
+ "app.captions.menu.start": "शà¥à¤°à¥‚",
+ "app.captions.menu.ariaStart": "कैपà¥à¤¶à¤¨ लिखना शà¥à¤°à¥‚ करें",
+ "app.captions.menu.ariaStartDesc": "कैपà¥à¤¶à¤¨ संपादक को खोलता है और मोडल को बंद कर देता है",
+ "app.captions.menu.select": "उपलबà¥à¤§ à¤à¤¾à¤·à¤¾ का चयन करें",
+ "app.captions.menu.ariaSelect": "कैपà¥à¤¶à¤¨ à¤à¤¾à¤·à¤¾",
+ "app.captions.menu.subtitle": "कृपया अपने सतà¥à¤° के à¤à¥€à¤¤à¤° बंद कैपà¥à¤¶à¤¨ के लिठà¤à¤• à¤à¤¾à¤·à¤¾ और शैलियों का चयन करें।",
"app.captions.menu.title": "बंद शीरà¥à¤·à¤•",
+ "app.captions.menu.fontSize": "आकार",
+ "app.captions.menu.fontColor": "लिपि का रंग",
+ "app.captions.menu.fontFamily": "फ़ॉनà¥à¤Ÿ",
"app.captions.menu.backgroundColor": "पीछे का रंग",
+ "app.captions.menu.previewLabel": "पूरà¥à¤µà¤¾à¤µà¤²à¥‹à¤•à¤¨",
"app.captions.menu.cancelLabel": "रदà¥à¤¦ करना",
"app.captions.pad.hide": "my name is hari",
"app.captions.pad.tip": "संपादक टूलबार पर धà¥à¤¯à¤¾à¤¨ केंदà¥à¤°à¤¿à¤¤ करने के लिठEsc दबाà¤à¤‚",
+ "app.captions.pad.ownership": "सà¥à¤µà¤¾à¤®à¤¿à¤¤à¥à¤µ लेने",
+ "app.captions.pad.ownershipTooltip": "आपको {0} कैपà¥à¤¶à¤¨ के सà¥à¤µà¤¾à¤®à¥€ के रूप में असाइन किया जाà¤à¤—ा",
+ "app.captions.pad.interimResult": "अंतरिम परिणाम",
+ "app.captions.pad.dictationStart": "शà¥à¤°à¥à¤¤à¤œà¥à¤žà¤¾à¤¨ पà¥à¤°à¤¾à¤°à¤‚ठकरें",
+ "app.captions.pad.dictationStop": "शà¥à¤°à¥à¤¤à¤œà¥à¤žà¤¾à¤¨ बंद करो",
+ "app.captions.pad.dictationOnDesc": "à¤à¤¾à¤·à¤£ मानà¥à¤¯à¤¤à¤¾ को चालू करता है",
"app.note.title": "साà¤à¤¾ किठगठनोटà¥à¤¸",
"app.note.label": "धà¥à¤¯à¤¾à¤¨ दें",
"app.note.hideNoteLabel": "नोट छिपाà¤à¤‚",
@@ -33,6 +57,7 @@
"app.userList.participantsTitle": "पà¥à¤°à¤¤à¤¿à¤à¤¾à¤—ियों",
"app.userList.messagesTitle": "संदेश",
"app.userList.notesTitle": "टिपà¥à¤ªà¤£à¤¿à¤¯à¤¾à¤",
+ "app.userList.captionsTitle": "कैपà¥à¤¶à¤¨",
"app.userList.presenter": "पà¥à¤°à¤¸à¥à¤¤à¥à¤¤à¤•à¤°à¥à¤¤à¤¾",
"app.userList.you": "आप",
"app.userList.locked": "बंद",
diff --git a/bigbluebutton-html5/private/locales/hr.json b/bigbluebutton-html5/private/locales/hr.json
index 4dce4c2c50116afc735d1387882b04ce938a1967..512948e7ad4d1f281cf7bf66bb8f066a7067f3df 100644
--- a/bigbluebutton-html5/private/locales/hr.json
+++ b/bigbluebutton-html5/private/locales/hr.json
@@ -7,36 +7,292 @@
"app.chat.partnerDisconnected": "{0} je napustio sastanak",
"app.chat.closeChatLabel": "Zatvori {0}",
"app.chat.hideChatLabel": "Sakrij {0}",
+ "app.chat.moreMessages": "Više poruka dolje",
"app.chat.dropdown.options": "Opcije chata",
"app.chat.dropdown.clear": "OÄisti",
"app.chat.dropdown.copy": "Kopiraj",
"app.chat.dropdown.save": "Spremi",
"app.chat.label": "Chat",
+ "app.chat.offline": "Offline",
+ "app.chat.emptyLogLabel": "Chat zapis je prazan",
+ "app.chat.clearPublicChatMessage": "Moderator je obrisao povijest javnog chata",
+ "app.chat.multi.typing": "Više sudionika tipka odjednom",
"app.chat.one.typing": "{0} tipka",
"app.chat.two.typing": "{0} i {1} tipkaju",
+ "app.captions.label": "Titlovi",
"app.captions.menu.close": "Zatvori",
+ "app.captions.menu.start": "Pokreni",
"app.captions.menu.fontSize": "VeliÄina",
+ "app.captions.menu.fontColor": "Boja teksta",
"app.captions.menu.fontFamily": "Font",
+ "app.captions.menu.backgroundColor": "Boja pozadine",
"app.captions.menu.previewLabel": "Pregled",
+ "app.captions.menu.cancelLabel": "Odustani",
+ "app.captions.pad.ownership": "Preuzmi",
+ "app.captions.pad.dictationStart": "ZapoÄni diktat",
+ "app.captions.pad.dictationStop": "Zaustavi diktat",
+ "app.captions.pad.dictationOnDesc": "UkljuÄi prepoznavanje govora",
+ "app.captions.pad.dictationOffDesc": "IskljuÄi prepoznavanje govora",
+ "app.note.title": "Dijeljene bilješke",
"app.note.label": "Bilješka",
"app.note.hideNoteLabel": "Sakrij bilješku",
+ "app.user.activityCheck": "Provjera aktivnosti sudionika",
"app.user.activityCheck.check": "Provjeri",
"app.userList.usersTitle": "Korisnici",
+ "app.userList.participantsTitle": "Sudionici",
+ "app.userList.messagesTitle": "Poruke",
"app.userList.notesTitle": "Bilješke",
+ "app.userList.captionsTitle": "Titlovi",
"app.userList.presenter": "Prezenter",
"app.userList.you": "Vi",
+ "app.userList.locked": "ZakljuÄano",
+ "app.userList.byModerator": "moderator (Moderator)",
+ "app.userList.label": "Popis sudionika",
"app.userList.guest": "Gost",
+ "app.userList.menuTitleContext": "Dostupne postavke",
+ "app.userList.menu.chat.label": "Pokreni privatni chat",
+ "app.userList.menu.clearStatus.label": "Ukloni status",
+ "app.userList.menu.removeUser.label": "Ukloni sudionika",
+ "app.userList.menu.removeConfirmation.label": "Ukloni sudionika ({0}) ",
+ "app.userList.menu.muteUserAudio.label": "Stišaj sudionika",
+ "app.userList.menu.promoteUser.label": "Postavi za moderatora",
+ "app.userList.menu.demoteUser.label": "Vrati u ulogu gledatelja",
+ "app.userList.menu.makePresenter.label": "Postavi za prezentera",
+ "app.userList.userOptions.manageUsersLabel": "Upravljanje korisnicima",
+ "app.userList.userOptions.muteAllLabel": "Stišaj sve korisnike",
+ "app.userList.userOptions.muteAllDesc": "Stišava sve korisnike u sesiji",
+ "app.userList.userOptions.clearAllLabel": "Ukloni ikone statusa svima",
+ "app.userList.userOptions.clearAllDesc": "Uklanja ikone statusa svim sudionicima",
+ "app.userList.userOptions.lockViewersLabel": "ZakljuÄaj gledatelje",
+ "app.userList.userOptions.disableCam": "Kamere gledatelja su onemogućene",
+ "app.userList.userOptions.disableMic": "Mikrofoni gledatelja su onemogućeni",
+ "app.userList.userOptions.disablePubChat": "Javni chat je onemogućen",
+ "app.userList.userOptions.disableNote": "Dijeljene biljeÅ¡ke su sada zakljuÄane",
+ "app.userList.userOptions.hideUserList": "Popis sudionika je sada skriven za gledatelje",
+ "app.userList.userOptions.enableCam": "Kamere gledatelja su omogućene",
+ "app.userList.userOptions.enableMic": "Mikrofoni gledatelja su omogućeni",
+ "app.userList.userOptions.enablePrivChat": "Privatni chat je omogućen",
+ "app.userList.userOptions.enablePubChat": "Javni chat je omogućen",
+ "app.userList.userOptions.enableNote": "Dijeljene bilješke su sada omogućene",
+ "app.userList.userOptions.showUserList": "Popis sudionika je sada vidljiv gledateljima",
+ "app.userList.userOptions.enableOnlyModeratorWebcam": "Sada možete ukljuÄiti svoju web-kameru, svi će vas moći vidjeti",
+ "app.media.autoplayAlertDesc": "Dozvoli pristup",
+ "app.media.screenshare.start": "Pokrenuto je dijeljenje zaslona",
+ "app.media.screenshare.end": "Zaustavljeno je dijeljenje zaslona",
+ "app.media.screenshare.unavailable": "Dijeljenje zaslona nije dostupno",
+ "app.media.screenshare.notSupported": "Dijeljenje zaslona nije dostupno u ovom pregledniku.",
+ "app.media.screenshare.autoplayBlockedDesc": "Trebamo vašu dozvolu kako bi vam podijelili zaslon prezentera.",
+ "app.media.screenshare.autoplayAllowLabel": "Prikaži dijeljeni zaslon",
+ "app.meeting.ended": "Ova sesija je završila",
+ "app.meeting.alertMeetingEndsUnderOneMinute": "Sesija se zatvara za minutu.",
+ "app.presentation.hide": "Skrij prezentaciju",
+ "app.presentation.notificationLabel": "TrenutaÄna prezentacija",
+ "app.presentation.slideContent": "Sadržaj slajda",
+ "app.presentation.presentationToolbar.noNextSlideDesc": "Kraj prezentacije",
+ "app.presentation.presentationToolbar.noPrevSlideDesc": "PoÄetak prezentacije",
+ "app.presentationUploder.uploadLabel": "Postavljanje (upload)",
+ "app.presentationUploder.confirmLabel": "Potvrda",
+ "app.presentationUploder.dismissLabel": "Odustani",
+ "app.presentationUploder.dropzoneLabel": "Ovdje prenesite datoteke za postavljanje na poslužitelj",
+ "app.presentationUploder.dropzoneImagesLabel": "Ovdje prenesite slike za prijenos na poslužitelj",
+ "app.presentationUploder.browseFilesLabel": "ili potražite datoteke na svom raÄunalu",
+ "app.presentationUploder.browseImagesLabel": "ili potražite slike na svom raÄunalu",
+ "app.presentationUploder.fileToUpload": "Bit će postavljeno ...",
+ "app.presentationUploder.currentBadge": "TrenutaÄno",
+ "app.presentationUploder.upload.progress": "Postavljanje ({0}%)",
+ "app.presentationUploder.upload.413": "Datoteka je prevelika. Podijelite ju u više manjih datoteka.",
+ "app.presentationUploder.conversion.genericConversionStatus": "Konverzija datoteke ...",
+ "app.presentationUploder.removePresentationLabel": "Uklonite prezentaciju",
+ "app.presentationUploder.tableHeading.filename": "Datoteka",
+ "app.presentationUploder.tableHeading.options": "Postavke",
+ "app.presentationUploder.tableHeading.status": "Status",
+ "app.poll.pollPaneTitle": "Anketa",
+ "app.poll.quickPollTitle": "Brza anketa",
+ "app.poll.customPollLabel": "Prilagođena anketa",
"app.poll.closeLabel": "Zatvori",
+ "app.poll.clickHereToSelect": "Kliknite ovdje za odabir",
+ "app.poll.t": "ToÄno",
+ "app.poll.f": "NetoÄno",
+ "app.poll.tf": "ToÄno / NetoÄno",
+ "app.poll.y": "Da",
+ "app.poll.n": "Ne",
+ "app.poll.yn": "Da / Ne",
+ "app.poll.a2": "A / B",
+ "app.poll.a3": "A / B / C",
+ "app.poll.a4": "A / B / C / D",
+ "app.poll.a5": "A / B / C / D / E",
+ "app.poll.answer.true": "ToÄno",
+ "app.poll.answer.false": "NetoÄno",
+ "app.poll.answer.yes": "Da",
+ "app.poll.answer.no": "Ne",
+ "app.poll.answer.a": "A",
+ "app.poll.answer.b": "B",
+ "app.poll.answer.c": "C",
+ "app.poll.answer.d": "D",
+ "app.poll.answer.e": "E",
"app.poll.liveResult.usersTitle": "Korisnici",
+ "app.poll.liveResult.responsesTitle": "Odgovor",
+ "app.polling.pollingTitle": "Postavke ankete",
+ "app.connectingMessage": "Spajanje ...",
+ "app.retryNow": "Pokušajte ponovno",
+ "app.navBar.settingsDropdown.optionsLabel": "Postavke",
+ "app.navBar.settingsDropdown.fullscreenLabel": "Prikaži preko cijelog zaslona",
+ "app.navBar.settingsDropdown.settingsLabel": "Postavke",
+ "app.navBar.settingsDropdown.leaveSessionLabel": "Odjava",
+ "app.navBar.settingsDropdown.exitFullscreenLabel": "Zatvori prikaz preko cijelog zaslona",
+ "app.navBar.settingsDropdown.leaveSessionDesc": "Napusti sesiju",
+ "app.navBar.settingsDropdown.exitFullscreenDesc": "Zatvori prikaz preko cijelog zaslona",
+ "app.navBar.settingsDropdown.hotkeysLabel": "TipkovniÄke kratice",
+ "app.navBar.settingsDropdown.helpLabel": "Pomoć",
+ "app.navBar.settingsDropdown.endMeetingDesc": "ZavrÅ¡ava trenutaÄnu sesiju za sve sudionike",
+ "app.navBar.settingsDropdown.endMeetingLabel": "Završi sesiju",
+ "app.navBar.recording": "Ova sesija se snima",
+ "app.navBar.recording.on": "Snimanje",
+ "app.navBar.recording.off": "Bez snimanja",
+ "app.leaveConfirmation.confirmLabel": "Napusti",
+ "app.endMeeting.title": "Završi sesiju",
+ "app.endMeeting.description": "Jeste li sigurni da želite završiti ovu sesiju?",
+ "app.endMeeting.yesLabel": "Da",
+ "app.endMeeting.noLabel": "Ne",
+ "app.about.confirmLabel": "U redu",
+ "app.about.confirmDesc": "U redu",
+ "app.about.dismissLabel": "Odustani",
+ "app.actionsBar.changeStatusLabel": "Promijeni status",
+ "app.actionsBar.camOffLabel": "Kamera iskljuÄena",
+ "app.actionsBar.raiseLabel": "Digni ruku",
+ "app.actionsBar.actionsDropdown.restorePresentationLabel": "Vrati prezentaciju",
+ "app.screenshare.screenShareLabel" : "Dijeljenje ekrana",
+ "app.submenu.application.applicationSectionTitle": "Aplikacija",
+ "app.submenu.application.animationsLabel": "Animacije",
+ "app.submenu.application.fontSizeControlLabel": "VeliÄina fonta",
+ "app.submenu.application.languageLabel": "Jezik aplikacije",
+ "app.submenu.application.languageOptionLabel": "Odaberi jezik",
+ "app.submenu.audio.micSourceLabel": "Izvor mikrofona",
+ "app.submenu.video.title": "Video",
+ "app.submenu.video.videoQualityLabel": "Kvaliteta videa",
+ "app.settings.applicationTab.label": "Aplikacija",
+ "app.settings.audioTab.label": "Zvuk",
+ "app.settings.videoTab.label": "Video",
+ "app.settings.usersTab.label": "Sudionici",
+ "app.settings.main.label": "Postavke",
+ "app.settings.main.cancel.label": "Odustani",
"app.settings.main.save.label": "Spremi",
+ "app.settings.dataSavingTab.webcam": "Omogući web-kamere",
+ "app.settings.dataSavingTab.screenShare": "Omogući dijeljenje zaslona",
+ "app.switch.onLabel": "UKLJUÄŒI",
+ "app.switch.offLabel": "ISKLJUÄŒI",
+ "app.actionsBar.actionsDropdown.actionsLabel": "Operacije",
+ "app.actionsBar.actionsDropdown.presentationLabel": "Postavi prezentaciju",
+ "app.actionsBar.actionsDropdown.initPollLabel": "Pokreni anketu",
+ "app.actionsBar.actionsDropdown.desktopShareLabel": "Podijeli zaslon",
+ "app.actionsBar.actionsDropdown.initPollDesc": "Pokreni anketu",
+ "app.actionsBar.actionsDropdown.takePresenter": "Preuzmi ulogu prezentera",
+ "app.actionsBar.emojiMenu.statusTriggerLabel": "Zadaj status",
+ "app.actionsBar.emojiMenu.awayLabel": "Odsutan",
+ "app.actionsBar.emojiMenu.raiseHandLabel": "Digni ruku",
+ "app.actionsBar.emojiMenu.neutralLabel": "Suzdržan",
+ "app.actionsBar.emojiMenu.confusedLabel": "Zbunjen",
+ "app.actionsBar.emojiMenu.sadLabel": "Tužan",
+ "app.actionsBar.emojiMenu.happyLabel": "Sretan",
+ "app.actionsBar.emojiMenu.noneLabel": "Ukloni status",
+ "app.actionsBar.emojiMenu.applauseLabel": "Pljesak",
+ "app.actionsBar.emojiMenu.thumbsUpLabel": "Palac gore",
+ "app.actionsBar.emojiMenu.thumbsDownLabel": "Palac dolje",
"app.audioNotification.closeLabel": "Zatvori",
+ "app.breakoutJoinConfirmation.dismissLabel": "Odustani",
+ "app.audioModal.microphoneLabel": "Mikrofon",
+ "app.audioModal.listenOnlyLabel": "Samo slušanje",
+ "app.audioModal.audioChoiceLabel": "Kako se želite spojiti na zvuÄni dio sesije?",
+ "app.audioModal.audioChoiceDesc": "Odaberite kako se želite spojiti na zvuÄni dio ove sesije",
"app.audioModal.closeLabel": "Zatvori",
+ "app.audioModal.yes": "Da",
+ "app.audioModal.no": "Ne",
+ "app.audioModal.yes.arialabel" : "Jeka je Äujna",
+ "app.audioModal.no.arialabel" : "Jeka nije Äujna",
+ "app.audioModal.echoTestTitle": "Ovo je privatni test jeke. Recite par rijeÄi. Jeste li Äuli zvuk?",
+ "app.audioModal.settingsTitle": "Promijenite svoje postavke zvuka",
+ "app.audioModal.audioDialTitle": "PrikljuÄite se koriÅ¡tenjem vaÅ¡eg telefona",
+ "app.audioDial.audioDialDescription": "Zovi",
+ "app.audioModal.playAudio": "Pusti zvuk",
+ "app.audioModal.playAudio.arialabel" : "Pusti zvuk",
+ "app.audioDial.tipIndicator": "Savjet",
+ "app.audioModal.connecting": "Spajanje",
+ "app.audioModal.connectingEchoTest": "Spajanje na test jeke",
+ "app.audioManager.joinedEcho": "Spojili ste se na test jeke",
+ "app.audio.audioSettings.microphoneSourceLabel": "Izvor mikrofona",
"app.audio.listenOnly.closeLabel": "Zatvori",
"app.modal.close": "Zatvori",
+ "app.modal.confirm": "Gotovo",
"app.dropdown.close": "Zatvori",
+ "app.shortcut-help.title": "TipkovniÄke kratice",
"app.shortcut-help.closeLabel": "Zatvori",
+ "app.lock-viewers.title": "ZakljuÄaj gledatelje",
+ "app.lock-viewers.lockStatusLabel": "Status",
+ "app.lock-viewers.webcamLabel": "Podijeli web-kameru",
+ "app.lock-viewers.button.cancel": "Odustani",
+ "app.lock-viewers.locked": "ZakljuÄano",
+ "app.videoPreview.cameraLabel": "Kamera",
+ "app.videoPreview.profileLabel": "Kvaliteta",
+ "app.videoPreview.cancelLabel": "Odustani",
"app.videoPreview.closeLabel": "Zatvori",
- "app.externalVideo.close": "Zatvori"
+ "app.videoPreview.findingWebcamsLabel": "Pronalaženje web-kamera",
+ "app.videoPreview.startSharingLabel": "Pokreni dijeljenje",
+ "app.videoPreview.webcamOptionLabel": "Odaberite web-kameru",
+ "app.videoPreview.webcamPreviewLabel": "Pret-pregled slike s kamere",
+ "app.videoPreview.webcamSettingsTitle": "Postavke web-kamere",
+ "app.videoPreview.webcamNotFoundLabel": "Web-kamera nije pronađena",
+ "app.video.joinVideo": "Podijeli web-kameru",
+ "app.video.leaveVideo": "Zaustavi dijeljenje web-kamere",
+ "app.video.sharingError": "Pogreška pri dijeljenju web-kamere",
+ "app.video.enable": "Omogući",
+ "app.video.cancel": "Odustani",
+ "app.video.swapCam": "Zamijeni",
+ "app.video.videoButtonDesc": "Podijeli web-kameru",
+ "app.video.videoMenu": "Video izbornik",
+ "app.video.chromeExtensionError": "Morate instalirati",
+ "app.video.stats.dimensions": "Dimenzije",
+ "app.video.stats.codec": "Kodek",
+ "app.video.stats.rtt": "RTT",
+ "app.meeting.endNotification.ok.label": "U redu",
+ "app.whiteboard.toolbar.tools": "Alati",
+ "app.whiteboard.toolbar.tools.pencil": "Olovka",
+ "app.whiteboard.toolbar.tools.rectangle": "Pravokutnik",
+ "app.whiteboard.toolbar.tools.triangle": "Trokut",
+ "app.whiteboard.toolbar.tools.ellipse": "Kružnica",
+ "app.whiteboard.toolbar.tools.line": "Linija",
+ "app.whiteboard.toolbar.tools.text": "Tekst",
+ "app.whiteboard.toolbar.thickness": "Debljina linije",
+ "app.whiteboard.toolbar.color": "Boje",
+ "app.whiteboard.toolbar.color.black": "Crna",
+ "app.whiteboard.toolbar.color.white": "Bijela",
+ "app.whiteboard.toolbar.color.red": "Crvena",
+ "app.whiteboard.toolbar.color.orange": "NaranÄasta",
+ "app.whiteboard.toolbar.color.blue": "Plava",
+ "app.whiteboard.toolbar.color.silver": "Srebrna",
+ "app.feedback.sendFeedback": "Pošalji povratnu informaciju",
+ "app.videoDock.webcamFocusLabel": "Fokus",
+ "app.invitation.confirm": "Pozovi",
+ "app.createBreakoutRoom.generatingURL": "Stvaranje URL",
+ "app.createBreakoutRoom.generatedURL": "Stvoreno",
+ "app.createBreakoutRoom.duration": "Trajanje {0}",
+ "app.createBreakoutRoom.room": "Soba {0}",
+ "app.createBreakoutRoom.confirm": "Stvori",
+ "app.createBreakoutRoom.record": "Snimaj",
+ "app.createBreakoutRoom.numberOfRooms": "Broj soba",
+ "app.createBreakoutRoom.durationInMinutes": "Trajanje (minute)",
+ "app.createBreakoutRoom.doneLabel": "Gotovo",
+ "app.createBreakoutRoom.nextLabel": "Sljedeća",
+ "app.createBreakoutRoom.addParticipantLabel": "+ Dodaj sudionika",
+ "app.createBreakoutRoom.numberOfRoomsError": "Broj soba nije valjan.",
+ "app.externalVideo.start": "Podijeli novi video",
+ "app.externalVideo.title": "Podijeli vanjski video",
+ "app.externalVideo.input": "URL vanjskog videa",
+ "app.externalVideo.urlInput": "Dodaj URL videa",
+ "app.externalVideo.urlError": "Video URL nije dozvoljen",
+ "app.externalVideo.close": "Zatvori",
+ "app.network.connection.effective.slow.help": "Više informacija",
+ "app.actionsBar.actionsDropdown.shareExternalVideo": "Podijeli vanjski video",
+ "app.actionsBar.actionsDropdown.stopShareExternalVideo": "Zaustavi dijeljenje vanjskog videa"
}
diff --git a/bigbluebutton-html5/private/locales/hu_HU.json b/bigbluebutton-html5/private/locales/hu_HU.json
index 6aa1a09555b3a26ee1ba39e7f033ab6e77f8b69a..7036d814344eba524c988598cb49b3dec2881f52 100644
--- a/bigbluebutton-html5/private/locales/hu_HU.json
+++ b/bigbluebutton-html5/private/locales/hu_HU.json
@@ -63,6 +63,7 @@
"app.userList.presenter": "Előadó",
"app.userList.you": "Én",
"app.userList.locked": "Zárolt",
+ "app.userList.byModerator": "(Moderátor)",
"app.userList.label": "Felhasználók",
"app.userList.toggleCompactView.label": "Kompakt nézet be-, kikapcsolása",
"app.userList.guest": "Vendég",
@@ -72,6 +73,8 @@
"app.userList.menu.chat.label": "Privát üzenetek indÃtása",
"app.userList.menu.clearStatus.label": "Ãllapot törlése",
"app.userList.menu.removeUser.label": "Felhasználó eltávolÃtása",
+ "app.userList.menu.removeConfirmation.label": "({0}) felhasználó eltávolÃtása",
+ "app.userlist.menu.removeConfirmation.desc": "A felhasználó újracsatlakozásának megakadályozása.",
"app.userList.menu.muteUserAudio.label": "Felhasználó némÃtása",
"app.userList.menu.unmuteUserAudio.label": "Felhasználó hangosÃtása",
"app.userList.userAriaLabel": "{0} {1} {2} állapot {3}",
@@ -111,6 +114,8 @@
"app.media.autoplayAlertDesc": "Hozzáférés engedélyezése",
"app.media.screenshare.start": "A képernyőmegosztás elindult",
"app.media.screenshare.end": "A képernyőmegosztás befejeződött",
+ "app.media.screenshare.unavailable": "A képernyőmegosztás nem érhető el",
+ "app.media.screenshare.notSupported": "Ez a böngésző nem támogatja a képernyőmegosztást.",
"app.media.screenshare.autoplayBlockedDesc": "Az elÅ‘adó képernyÅ‘jének megjelenÃtéséhez az engedélyedre van szükségünk.",
"app.media.screenshare.autoplayAllowLabel": "Megosztott képernyÅ‘ megjelenÃtése",
"app.screenshare.notAllowed": "Hiba: A képernyő hozzáféréséhez az engedélyét nem adták meg.",
@@ -169,6 +174,9 @@
"app.presentationUploder.rejectedError": "A kiválasztott fájl(oka)t visszautasÃtottuk. Kérjük, ellenÅ‘rizd a fájl(ok) tÃpusát.",
"app.presentationUploder.upload.progress": "({0}%) feltöltve",
"app.presentationUploder.upload.413": "A fájl túl nagy. Kérjük, szedd szét több darabra.",
+ "app.presentationUploder.upload.408": "Feltöltési token kérés időtúllépése.",
+ "app.presentationUploder.upload.404": "404: Érvénytelen feltöltési token ",
+ "app.presentationUploder.upload.401": "A prezentáció feltöltési tokenjének kérése sikertelen.",
"app.presentationUploder.conversion.conversionProcessingSlides": "{0} / {1} oldal folyamatban",
"app.presentationUploder.conversion.genericConversionStatus": "Fájl átalakÃtása ...",
"app.presentationUploder.conversion.generatingThumbnail": "Miniatűrök létrehozása ...",
diff --git a/bigbluebutton-html5/private/locales/id.json b/bigbluebutton-html5/private/locales/id.json
index c2cca225358b66c087341864333565450b13bca0..0bf995e19c54911d2c340ea52ee34d4600b677af 100644
--- a/bigbluebutton-html5/private/locales/id.json
+++ b/bigbluebutton-html5/private/locales/id.json
@@ -74,7 +74,7 @@
"app.userList.menu.clearStatus.label": "Bersihkan status",
"app.userList.menu.removeUser.label": "Hapus pengguna",
"app.userList.menu.removeConfirmation.label": "Hapus pengguna ({0})",
- "app.userlist.menu.removeConfirmation.desc": "Anda yakin hendak menghapus pengguna ini? Sekali dihapus mereka tidak akan bisa bergabung lagi ke sesi ini.",
+ "app.userlist.menu.removeConfirmation.desc": "Cegah pengguna ini untuk bergabung kembali ke sesi.",
"app.userList.menu.muteUserAudio.label": "Bisukan pengguna",
"app.userList.menu.unmuteUserAudio.label": "Bolehkan bicara pengguna",
"app.userList.userAriaLabel": "{0} {1} {2} Status {3}",
@@ -115,6 +115,7 @@
"app.media.screenshare.start": "Berbagi layar sudah dimulai",
"app.media.screenshare.end": "Berbagi layar sudah berakhir",
"app.media.screenshare.unavailable": "Berbagi Layar Tidak Tersedia",
+ "app.media.screenshare.notSupported": "Berbagi layar tidak didukung dalam peramban ini.",
"app.media.screenshare.autoplayBlockedDesc": "Kami perlu izin Anda untuk menunjukkan layar penyaji.",
"app.media.screenshare.autoplayAllowLabel": "Lihat layar bersama",
"app.screenshare.notAllowed": "Galat: Izin untuk mengakses layar tak diberikan.",
diff --git a/bigbluebutton-html5/private/locales/ja.json b/bigbluebutton-html5/private/locales/ja.json
index 690d443ee4942c7a9b30ba741eb69d566533775e..441f1c68c8844a4e84b93501ed2f74be7c57016b 100644
--- a/bigbluebutton-html5/private/locales/ja.json
+++ b/bigbluebutton-html5/private/locales/ja.json
@@ -74,7 +74,7 @@
"app.userList.menu.clearStatus.label": "ステータスを消去ã™ã‚‹",
"app.userList.menu.removeUser.label": "ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’退室ã•ã›ã‚‹",
"app.userList.menu.removeConfirmation.label": "ユーザー({0})ã®é€€å®¤",
- "app.userlist.menu.removeConfirmation.desc": "ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã‚‚ã†ã“ã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ã¯æˆ»ã‚Œãªããªã‚Šã¾ã™ãŒã€æ§‹ã„ã¾ã›ã‚“ã‹ï¼Ÿ",
+ "app.userlist.menu.removeConfirmation.desc": "ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’二度ã¨ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«å‚åŠ ã•ã›ãªã„",
"app.userList.menu.muteUserAudio.label": "ユーザーをミュートã™ã‚‹",
"app.userList.menu.unmuteUserAudio.label": "ユーザーã®ãƒŸãƒ¥ãƒ¼ãƒˆã‚’外ã™",
"app.userList.userAriaLabel": "{0} {1} {2} ステータス {3}",
@@ -243,7 +243,7 @@
"app.navBar.settingsDropdown.optionsLabel": "オプション",
"app.navBar.settingsDropdown.fullscreenLabel": "全画é¢è¡¨ç¤ºã«åˆ‡æ›¿",
"app.navBar.settingsDropdown.settingsLabel": "è¨å®šã‚’é–‹ã",
- "app.navBar.settingsDropdown.aboutLabel": "ã‚¢ãƒã‚¦ãƒˆ",
+ "app.navBar.settingsDropdown.aboutLabel": "製å“æƒ…å ±",
"app.navBar.settingsDropdown.leaveSessionLabel": "退室",
"app.navBar.settingsDropdown.exitFullscreenLabel": "全画é¢è¡¨ç¤ºè§£é™¤",
"app.navBar.settingsDropdown.fullscreenDesc": "è¨å®šãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’全画é¢è¡¨ç¤º",
@@ -270,8 +270,8 @@
"app.endMeeting.description": "ã“ã®ä¼šè°ã‚’終了ã—ã¾ã™ã‹ï¼Ÿ",
"app.endMeeting.yesLabel": "ã¯ã„",
"app.endMeeting.noLabel": "ã„ã„ãˆ",
- "app.about.title": "ã‚¢ãƒã‚¦ãƒˆ",
- "app.about.version": "クライアントãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š",
+ "app.about.title": "製å“æƒ…å ±",
+ "app.about.version": "クライアントビルド：",
"app.about.copyright": "Copyright:",
"app.about.confirmLabel": "OK",
"app.about.confirmDesc": "OK",
@@ -435,7 +435,7 @@
"app.audioManager.invalidTarget": "エラー：リクエスト先ãŒã„ã¾ã›ã‚“ã§ã—ãŸ",
"app.audioManager.mediaError": "エラー：デãƒã‚¤ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
"app.audio.joinAudio": "音声ã§å‚åŠ ",
- "app.audio.leaveAudio": "音声をやã‚ã‚‹",
+ "app.audio.leaveAudio": "音声をåœæ¢",
"app.audio.enterSessionLabel": "セッションã«å‚åŠ ",
"app.audio.playSoundLabel": "音声をå†ç”Ÿ",
"app.audio.backLabel": "戻る",
diff --git a/bigbluebutton-html5/private/locales/ja_JP.json b/bigbluebutton-html5/private/locales/ja_JP.json
index b5d54fbe53910402c197117c01a6707332c16f46..98faea372fc8a574e6a6e4eeafe557584494c283 100644
--- a/bigbluebutton-html5/private/locales/ja_JP.json
+++ b/bigbluebutton-html5/private/locales/ja_JP.json
@@ -74,7 +74,7 @@
"app.userList.menu.clearStatus.label": "ステータスを消去ã™ã‚‹",
"app.userList.menu.removeUser.label": "ユーザーを退室ã•ã›ã‚‹",
"app.userList.menu.removeConfirmation.label": "ユーザー({0})ã®é€€å®¤",
- "app.userlist.menu.removeConfirmation.desc": "ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã‚‚ã†ã“ã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ã¯æˆ»ã‚Œãªããªã‚Šã¾ã™ãŒã€æ§‹ã„ã¾ã›ã‚“ã‹ï¼Ÿ",
+ "app.userlist.menu.removeConfirmation.desc": "ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’二度ã¨ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«å‚åŠ ã•ã›ãªã„",
"app.userList.menu.muteUserAudio.label": "ユーザーをミュートã™ã‚‹",
"app.userList.menu.unmuteUserAudio.label": "ユーザーã®ãƒŸãƒ¥ãƒ¼ãƒˆã‚’外ã™",
"app.userList.userAriaLabel": "{0} {1} {2} ステータス {3}",
@@ -271,7 +271,7 @@
"app.endMeeting.yesLabel": "ã¯ã„",
"app.endMeeting.noLabel": "ã„ã„ãˆ",
"app.about.title": "製å“æƒ…å ±",
- "app.about.version": "クライアントãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š",
+ "app.about.version": "クライアントビルド：",
"app.about.copyright": "Copyright：",
"app.about.confirmLabel": "OK",
"app.about.confirmDesc": "OK",
@@ -435,7 +435,7 @@
"app.audioManager.invalidTarget": "エラー：リクエスト先ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
"app.audioManager.mediaError": "エラー：デãƒã‚¤ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
"app.audio.joinAudio": "音声ã§å‚åŠ ",
- "app.audio.leaveAudio": "音声をやã‚ã‚‹",
+ "app.audio.leaveAudio": "音声をåœæ¢",
"app.audio.enterSessionLabel": "セッションã«å‚åŠ ",
"app.audio.playSoundLabel": "音声をå†ç”Ÿ",
"app.audio.backLabel": "戻る",
diff --git a/bigbluebutton-html5/private/locales/lt_LT.json b/bigbluebutton-html5/private/locales/lt_LT.json
index 9e2cba431ae29ff9684ab2a5816442f52504423f..0beb49c7dcb5ef2e1830e042719aa2e2087fa651 100644
--- a/bigbluebutton-html5/private/locales/lt_LT.json
+++ b/bigbluebutton-html5/private/locales/lt_LT.json
@@ -72,29 +72,155 @@
"app.userList.menu.chat.label": "Pradėti privatų susirašinėjimą",
"app.userList.menu.clearStatus.label": "Išvalyti būseną",
"app.userList.menu.removeUser.label": "Pašalinti vartotoją",
+ "app.userList.menu.removeConfirmation.label": "Pašalinti naudotoją ({0})",
"app.userList.menu.muteUserAudio.label": "Nutildyti vartotojÄ…",
"app.userList.menu.unmuteUserAudio.label": "Atitildyti vartotojÄ…",
+ "app.userList.userAriaLabel": "{0} {1} {2} Statusas {3}",
"app.userList.menu.promoteUser.label": "Paaukštinti iki moderatoriaus",
"app.userList.menu.demoteUser.label": "Nužeminti iki žiūrovo",
+ "app.userList.menu.unlockUser.label": "Atrakinti {0}",
+ "app.userList.menu.lockUser.label": "Užrakinti {0}",
+ "app.userList.menu.makePresenter.label": "Padaryti pranešėju",
+ "app.userList.userOptions.manageUsersLabel": "Tvarkyti naudotojus ",
+ "app.userList.userOptions.muteAllLabel": "Nutildyti visus naudotojus",
+ "app.userList.userOptions.muteAllDesc": "Nutildyti visus naudotojus susitikime. ",
+ "app.userList.userOptions.enablePubChat": "Viešasis susirašinėjimas yra įjungtas",
+ "app.media.label": "Medija",
+ "app.media.screenshare.start": "Ekrano dalinimasis prasidÄ—jo ",
+ "app.meeting.ended": "Sesija pasibaigÄ—",
+ "app.meeting.alertMeetingEndsUnderOneMinute": "Susitikimas uždaromas minutės bėgyje. ",
+ "app.presentation.hide": "SlÄ—pti prezentacija",
+ "app.presentation.slideContent": "SkaidrÄ—s turinys",
+ "app.presentation.presentationToolbar.noNextSlideDesc": "Prezentacijos pabaiga",
+ "app.presentation.presentationToolbar.noPrevSlideDesc": "Prezentacijos pradžia",
+ "app.presentation.presentationToolbar.selectLabel": "Pažymėti skaidrę",
+ "app.presentation.presentationToolbar.prevSlideLabel": "AnkstesnÄ— skaidrÄ—",
+ "app.presentation.presentationToolbar.nextSlideLabel": "Sekanti skaidrÄ—",
+ "app.presentation.presentationToolbar.skipSlideLabel": "Praleisti skaidrÄ™",
+ "app.presentation.presentationToolbar.zoomInLabel": "Priartinti ",
+ "app.presentation.presentationToolbar.zoomInDesc": "Priartinti prezentacijÄ…",
+ "app.presentation.presentationToolbar.zoomOutLabel": "Patolinti",
+ "app.presentation.presentationToolbar.goToSlide": "SkaidrÄ— {0}",
+ "app.presentationUploder.title": "Prezentacija",
+ "app.presentationUploder.confirmLabel": "Patvirtinti",
"app.presentationUploder.dismissLabel": "Atšaukti",
+ "app.presentationUploder.dropzoneLabel": "Mesti failus Äia, kad siųsti",
+ "app.presentationUploder.currentBadge": "DabartinÄ—",
+ "app.presentationUploder.conversion.genericConversionStatus": "Konvertuojamas failas... ",
+ "app.presentationUploder.removePresentationLabel": "Pašalinti prezentaciją",
+ "app.presentationUploder.tableHeading.filename": "Failo pavadinimas",
+ "app.presentationUploder.tableHeading.options": "Nuostatos",
+ "app.presentationUploder.tableHeading.status": "Statusas",
"app.poll.closeLabel": "Uždaryti",
+ "app.poll.waitingLabel": "Laukiama atsakymų ({0}/{1})",
+ "app.poll.noPresentationSelected": "Nėra pažymėtų prezentacijų! Prašome pažymėti vieną. ",
+ "app.poll.clickHereToSelect": "SpragtelÄ—ti Äia, kad pažymÄ—ti",
+ "app.poll.t": "Tiesa",
+ "app.poll.f": "Netiesa",
+ "app.poll.tf": "Tiesa/Netiesa",
+ "app.poll.y": "Taip",
+ "app.poll.n": "Ne",
+ "app.poll.yn": "Taip/Ne",
+ "app.poll.a2": "A / B",
+ "app.poll.a3": "A / B / C",
+ "app.poll.a4": "A / B / C / D",
+ "app.poll.a5": "A / B / C / D / E",
+ "app.poll.answer.true": "Tiesa",
+ "app.poll.answer.false": "Netiesa",
+ "app.poll.answer.yes": "Taip",
+ "app.poll.answer.no": "Ne",
+ "app.poll.answer.a": "A",
+ "app.poll.answer.b": "B",
+ "app.poll.answer.c": "C",
+ "app.poll.answer.d": "D",
+ "app.poll.answer.e": "E",
"app.poll.liveResult.usersTitle": "Vartotojai",
+ "app.connectingMessage": "Jungiamasi... ",
+ "app.retryNow": "Bandyti dar kartÄ… dabar",
+ "app.navBar.settingsDropdown.optionsLabel": "Nuostatos",
+ "app.navBar.settingsDropdown.fullscreenLabel": "Padaryti per visÄ… ekranÄ…",
+ "app.navBar.settingsDropdown.settingsLabel": "Nuostatos ",
+ "app.navBar.settingsDropdown.aboutLabel": "Apie",
+ "app.navBar.settingsDropdown.leaveSessionLabel": "Atsijungti",
+ "app.navBar.settingsDropdown.exitFullscreenLabel": "Išeiti iš viso ekrano",
+ "app.navBar.settingsDropdown.leaveSessionDesc": "Palikti susitikimÄ… ",
+ "app.navBar.settingsDropdown.hotkeysLabel": "Klaviatūros greitieji klavišai ",
+ "app.navBar.settingsDropdown.helpLabel": "Pagalba",
+ "app.navBar.settingsDropdown.endMeetingLabel": "Baigti susitikimÄ… ",
+ "app.navBar.recording.on": "Įrašas ",
+ "app.navBar.recording.off": "Neįrašinėjama",
+ "app.endMeeting.title": "Baigti susitikimÄ… ",
+ "app.endMeeting.yesLabel": "Taip",
+ "app.endMeeting.noLabel": "Ne",
+ "app.about.title": "Apie",
"app.about.dismissLabel": "Atšaukti",
+ "app.actionsBar.muteLabel": "Nutildyti",
+ "app.actionsBar.raiseLabel": "Kelti",
+ "app.submenu.application.animationsLabel": "Animacijos ",
+ "app.submenu.application.fontSizeControlLabel": "Å rifto dydis ",
+ "app.submenu.application.languageOptionLabel": "Pasirinkti kalbÄ…",
"app.settings.usersTab.label": "Dalyviai",
+ "app.settings.main.label": "Nuostatos ",
"app.settings.main.cancel.label": "Atšaukti",
"app.settings.main.save.label": "IÅ¡saugoti",
+ "app.actionsBar.actionsDropdown.saveUserNames": "Išsaugoti naudotojų vardus",
+ "app.actionsBar.emojiMenu.raiseHandLabel": "Kelti",
+ "app.actionsBar.emojiMenu.sadLabel": "Liūdnas",
+ "app.actionsBar.emojiMenu.happyLabel": "Laimingas",
"app.audioNotification.closeLabel": "Uždaryti",
"app.breakoutJoinConfirmation.dismissLabel": "Atšaukti",
+ "app.audioModal.microphoneLabel": "Mikrofonas",
+ "app.audioModal.listenOnlyLabel": "Tik klausyti",
"app.audioModal.closeLabel": "Uždaryti",
+ "app.audioModal.yes": "Taip",
+ "app.audioModal.no": "Ne",
+ "app.audioModal.connecting": "Jungiamasi",
+ "app.audio.playSoundLabel": "Groti garsÄ…",
+ "app.audio.backLabel": "Atgal",
+ "app.audio.audioSettings.retryLabel": "Kartoti ",
+ "app.audio.listenOnly.backLabel": "Atgal",
"app.audio.listenOnly.closeLabel": "Uždaryti",
"app.modal.close": "Uždaryti",
"app.dropdown.close": "Uždaryti",
+ "app.error.404": "Nerasta",
+ "app.error.410": "Susitikimas baigÄ—si",
+ "app.error.leaveLabel": "Prisijungti dar kartÄ… ",
+ "app.userList.guest.waitingUsers": "Laukiama naudotojų",
+ "app.shortcut-help.title": "Klaviatūros greitieji klavišai ",
"app.shortcut-help.closeLabel": "Uždaryti",
+ "app.lock-viewers.lockStatusLabel": "Statusas",
+ "app.lock-viewers.webcamLabel": "Dalintis kamera",
"app.lock-viewers.button.cancel": "Atšaukti",
"app.lock-viewers.locked": "Užrakinta",
+ "app.videoPreview.cameraLabel": "Kamera",
"app.videoPreview.cancelLabel": "Atšaukti",
"app.videoPreview.closeLabel": "Uždaryti",
+ "app.videoPreview.webcamNotFoundLabel": "Kamera nerasta",
+ "app.video.joinVideo": "Dalintis kamera",
"app.video.cancel": "Atšaukti",
+ "app.video.videoButtonDesc": "Dalintis kamera",
+ "app.whiteboard.toolbar.tools": "Įrankiai",
+ "app.whiteboard.toolbar.tools.pencil": "Pieštukas ",
+ "app.whiteboard.toolbar.tools.triangle": "Trikampis ",
+ "app.whiteboard.toolbar.tools.ellipse": "ElipsÄ—",
+ "app.whiteboard.toolbar.tools.line": "Linija",
+ "app.whiteboard.toolbar.tools.text": "Tekstas",
+ "app.whiteboard.toolbar.color": "Spalvos ",
+ "app.whiteboard.toolbar.colorDisabled": "Spalvos yra išjungtos",
+ "app.whiteboard.toolbar.color.black": "Juoda",
+ "app.whiteboard.toolbar.color.white": "Balta",
+ "app.whiteboard.toolbar.color.red": "Raudona",
+ "app.whiteboard.toolbar.color.orange": "Oranžinė ",
+ "app.whiteboard.toolbar.color.blue": "MÄ—lyna",
+ "app.whiteboard.toolbar.color.violet": "VioletinÄ—",
+ "app.whiteboard.toolbar.color.silver": "SidabrinÄ—",
+ "app.whiteboard.toolbar.fontSize": "Šrifto dydžių sąrašas ",
+ "app.invitation.confirm": "Pakviesti",
+ "app.createBreakoutRoom.room": "Kambarys {0}",
+ "app.createBreakoutRoom.join": "Prisijungti prie kambario ",
+ "app.createBreakoutRoom.numberOfRooms": "Kambarių skaiÄius ",
+ "app.createBreakoutRoom.roomTime": "{0} minutÄ—s",
+ "app.externalVideo.start": "Dalintis nauju vaizdo įrašu",
"app.externalVideo.close": "Uždaryti"
}
diff --git a/bigbluebutton-html5/private/locales/nb_NO.json b/bigbluebutton-html5/private/locales/nb_NO.json
index 560b64d9d1e0265d6cbf978baf58c4a1f9a2778a..58bdfd9de76113d002cfa5617a9b6c32733dad6c 100644
--- a/bigbluebutton-html5/private/locales/nb_NO.json
+++ b/bigbluebutton-html5/private/locales/nb_NO.json
@@ -74,7 +74,6 @@
"app.userList.menu.clearStatus.label": "Tilbakestill status",
"app.userList.menu.removeUser.label": "Fjern bruker",
"app.userList.menu.removeConfirmation.label": "Fjern bruker ({0})",
- "app.userlist.menu.removeConfirmation.desc": "Er du sikker på at du vil fjerne brukeren? Brukeren vil ikke kunne bli med i webinaret igjen. ",
"app.userList.menu.muteUserAudio.label": "Mute brukeren",
"app.userList.menu.unmuteUserAudio.label": "Unmute brukeren",
"app.userList.userAriaLabel": "{0} {1} {2} Status {3}",
diff --git a/bigbluebutton-html5/private/locales/nl.json b/bigbluebutton-html5/private/locales/nl.json
index 0fad87b7da580fdf68813aec7047194565e8c25a..9fe621ff71ee71e9dddc245a551295b7e99cf835 100644
--- a/bigbluebutton-html5/private/locales/nl.json
+++ b/bigbluebutton-html5/private/locales/nl.json
@@ -74,7 +74,7 @@
"app.userList.menu.clearStatus.label": "Status wissen",
"app.userList.menu.removeUser.label": "Gebruiker verwijderen",
"app.userList.menu.removeConfirmation.label": "Verwijder gebruiker ({0})",
- "app.userlist.menu.removeConfirmation.desc": "Bent u zeker dat u deze gebruiker wilt verwijderen? Eenmaal verwijderd, kunnen ze niet meer deelnemen aan deze sessie.",
+ "app.userlist.menu.removeConfirmation.desc": "Voorkom dat deze gebruiker opnieuw deelneemt aan de sessie.",
"app.userList.menu.muteUserAudio.label": "Gebruiker dempen",
"app.userList.menu.unmuteUserAudio.label": "Gebruiker dempen ongedaan maken",
"app.userList.userAriaLabel": "{0} {1} {2} Status {3}",
diff --git a/bigbluebutton-html5/private/locales/pt.json b/bigbluebutton-html5/private/locales/pt.json
index a071badfa43a76fab43eb5cd2012d22285609fee..ccb57fb8436806a6bb952e1ae9ef947b2cf97a0e 100644
--- a/bigbluebutton-html5/private/locales/pt.json
+++ b/bigbluebutton-html5/private/locales/pt.json
@@ -74,7 +74,7 @@
"app.userList.menu.clearStatus.label": "Limpar estado",
"app.userList.menu.removeUser.label": "Remover utilizador",
"app.userList.menu.removeConfirmation.label": "Remover utilizador ({0})",
- "app.userlist.menu.removeConfirmation.desc": "Deseja remover este utilizador? Depois de removido, o mesmo não será capaz de entrar novamente nesta sessão.",
+ "app.userlist.menu.removeConfirmation.desc": "Impedir este utilizador de entrar novamente na sessão.",
"app.userList.menu.muteUserAudio.label": "Silenciar utilizador",
"app.userList.menu.unmuteUserAudio.label": "Ativar microfone do utilizador",
"app.userList.userAriaLabel": "{0} {1} {2} Estado {3}",
@@ -115,6 +115,7 @@
"app.media.screenshare.start": "A partilha do ecrã iniciou",
"app.media.screenshare.end": "A partilha do ecrã terminou",
"app.media.screenshare.unavailable": "Partilha de ecrã indisponÃvel",
+ "app.media.screenshare.notSupported": "A partilha de ecrã não é suportada neste browser.",
"app.media.screenshare.autoplayBlockedDesc": "Necessitamos da sua permissão para lhe mostrar o ecrã do apresentador",
"app.media.screenshare.autoplayAllowLabel": "Ver ecrã partilhado",
"app.screenshare.notAllowed": "Erro: Permissão para aceder ao ecrã não for fornecida",
diff --git a/bigbluebutton-html5/private/locales/pt_BR.json b/bigbluebutton-html5/private/locales/pt_BR.json
index 4efa51fb7ea2791d6e3e8092ffefb49bd9ceed57..eae53e7a252a1c6babdf1053012c3ad0b92b38d3 100644
--- a/bigbluebutton-html5/private/locales/pt_BR.json
+++ b/bigbluebutton-html5/private/locales/pt_BR.json
@@ -74,7 +74,7 @@
"app.userList.menu.clearStatus.label": "Limpar status",
"app.userList.menu.removeUser.label": "Remover usuário",
"app.userList.menu.removeConfirmation.label": "Remover usuário ({0})",
- "app.userlist.menu.removeConfirmation.desc": "Você tem certeza que deseja remover este usuário? Uma vez removido, o usuário não conseguirá entrar novamente nesta sessão.",
+ "app.userlist.menu.removeConfirmation.desc": "Impedir que este usuário volte à sessão.",
"app.userList.menu.muteUserAudio.label": "Silenciar usuário",
"app.userList.menu.unmuteUserAudio.label": "Desbloquear microfone do usuário",
"app.userList.userAriaLabel": "{0} {1} {2} Status {3}",
@@ -115,6 +115,7 @@
"app.media.screenshare.start": "O compartilhamento de tela foi iniciado",
"app.media.screenshare.end": "O compartilhamento de tela foi encerrado",
"app.media.screenshare.unavailable": "Compartilhamento de tela indisponÃvel",
+ "app.media.screenshare.notSupported": "Compartilhamento de tela não suportado neste navegador.",
"app.media.screenshare.autoplayBlockedDesc": "Precisamos da sua permissão para mostrar a tela do apresentador.",
"app.media.screenshare.autoplayAllowLabel": "Ver tela compartilhada",
"app.screenshare.notAllowed": "Erro: Permissão para acessar a tela não foi concedida.",
diff --git a/bigbluebutton-html5/private/locales/ru.json b/bigbluebutton-html5/private/locales/ru.json
index eb4c490192b7b8b77f43edfe12eae53ae8d54e61..748be1e5e6640b1a273985c6042562d811f84760 100644
--- a/bigbluebutton-html5/private/locales/ru.json
+++ b/bigbluebutton-html5/private/locales/ru.json
@@ -72,6 +72,8 @@
"app.userList.menu.chat.label": "Ðачать приватный чат",
"app.userList.menu.clearStatus.label": "ОчиÑтить ÑтатуÑ",
"app.userList.menu.removeUser.label": "ИÑключить пользователÑ",
+ "app.userList.menu.removeConfirmation.label": "ИÑключить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ({0})",
+ "app.userlist.menu.removeConfirmation.desc": "Запретить пользователю повторно приÑоединÑÑ‚ÑŒÑÑ Ðº ÑеÑÑии",
"app.userList.menu.muteUserAudio.label": "Выключить микрофон пользователÑ",
"app.userList.menu.unmuteUserAudio.label": "Включить микрофон пользователÑ",
"app.userList.userAriaLabel": "{0} {1} {2} Ð¡Ñ‚Ð°Ñ‚ÑƒÑ {3}",
@@ -111,6 +113,8 @@
"app.media.autoplayAlertDesc": "Разрешить доÑтуп",
"app.media.screenshare.start": "ДемонÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñкрана началаÑÑŒ",
"app.media.screenshare.end": "ДемонÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñкрана закончилаÑÑŒ",
+ "app.media.screenshare.unavailable": "ДемонÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñкрана недоÑтупна",
+ "app.media.screenshare.notSupported": "ДемонÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñкрана не поддерживаетÑÑ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð¾Ð¼",
"app.media.screenshare.autoplayBlockedDesc": "Ðам требуетÑÑ Ð²Ð°ÑˆÐµ разрешение, чтобы показать вам Ñкран ведущего.",
"app.media.screenshare.autoplayAllowLabel": "Показать демонÑтрируемый Ñкран",
"app.screenshare.notAllowed": "Ошибка:разрешение на доÑтуп к Ñкрану не было предоÑтавлено",
@@ -169,6 +173,7 @@
"app.presentationUploder.rejectedError": "Загрузка выбранных файлов была отклонена. ПожалуйÑта проверьте тип файла (файлов)",
"app.presentationUploder.upload.progress": "Загрузка ({0}%)",
"app.presentationUploder.upload.413": "Файл Ñлишком большой. ПожалуйÑта, разделите его на неÑколько файлов меньшего размера.",
+ "app.presentationUploder.upload.404": "404: Ðеправильный токен загрузки",
"app.presentationUploder.conversion.conversionProcessingSlides": "Обработка Ñтраницы {0} из {1}",
"app.presentationUploder.conversion.genericConversionStatus": "Файл конвертируетÑÑ...",
"app.presentationUploder.conversion.generatingThumbnail": "СоздаютÑÑ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð²Ð°Ñ€Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ проÑмотра...",
@@ -677,7 +682,7 @@
"app.iOSWarning.label": "ПожалуйÑта, обновитеÑÑŒ до iOS 12.2 или более новой верÑии",
"app.legacy.unsupportedBrowser": "Похоже, вы иÑпользуете браузер, который не полноÑтью подедрживаетÑÑ. ПожалуйÑта, иÑпользуйте {0} или {1} Ð´Ð»Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð¹ поддержки.",
"app.legacy.upgradeBrowser": "Похоже, вы иÑпользуете более Ñтарую верÑию подерживаемого браузера. ПожалуйÑта, уÑтановите новую верÑию Ð´Ð»Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð¹ поддержки.",
- "app.legacy.criosBrowser": "Ðа iOS пожалуйÑта, иÑпользуйте браузер Safari Ð´Ð»Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð¹ поддержки"
+ "app.legacy.criosBrowser": "Ðа iOS, пожалуйÑта, иÑпользуйте браузер Safari Ð´Ð»Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð¹ поддержки"
}
diff --git a/bigbluebutton-html5/private/locales/ru_RU.json b/bigbluebutton-html5/private/locales/ru_RU.json
index b714ffc18b825f2ac6548d47a2de17c84af7f650..0515dab5ebda7563f6ed650634d85660cb4b5e56 100644
--- a/bigbluebutton-html5/private/locales/ru_RU.json
+++ b/bigbluebutton-html5/private/locales/ru_RU.json
@@ -72,6 +72,7 @@
"app.userList.menu.chat.label": "Ðачать приватный чат",
"app.userList.menu.clearStatus.label": "ОчиÑтить ÑтатуÑ",
"app.userList.menu.removeUser.label": "ИÑключить пользователÑ",
+ "app.userList.menu.removeConfirmation.label": "Удалить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ({0})",
"app.userList.menu.muteUserAudio.label": "Выключить микрофон пользователÑ",
"app.userList.menu.unmuteUserAudio.label": "Включить микрофон пользователÑ",
"app.userList.userAriaLabel": "{0} {1} {2} Ð¡Ñ‚Ð°Ñ‚ÑƒÑ {3}",
@@ -371,6 +372,8 @@
"app.audioNotification.audioFailedError1007": "Ошибка ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ (ICE ошибка 1007)",
"app.audioNotification.audioFailedError1008": "Ошибка транÑфера (ошибка 1008)",
"app.audioNotification.audioFailedError1009": "Ðе доÑтупна Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾ STUN/TURN Ñерверу (ошибка 1009)",
+ "app.audioNotification.audioFailedError1011": "Тайм-аут ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ (ошибка ICE 1011)",
+ "app.audioNotification.audioFailedError1012": "Соединение закрыто (ошибка ICE 1012)",
"app.audioNotification.audioFailedMessage": "Ðе удалоÑÑŒ уÑтановить аудио-Ñоединение",
"app.audioNotification.mediaFailedMessage": "Ошибка getUserMicMedia, разрешены только безопаÑные иÑточники",
"app.audioNotification.closeLabel": "Закрыть",
@@ -541,6 +544,7 @@
"app.video.joinVideo": "ТранÑлировать веб-камеру",
"app.video.leaveVideo": "Прекратить транÑлировать вÑбкамеру",
"app.video.iceCandidateError": "Ошибка Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ICE кандидата",
+ "app.video.iceConnectionStateError": "Ошибка Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ (ошибка ICE 1107)",
"app.video.permissionError": "Ошибка. Проверьте разрешение на доÑтуп к веб-камере.",
"app.video.sharingError": "Ошибка транÑлÑции веб-камеры",
"app.video.notFoundError": "Ðевозможно найти веб-камеру. ПожалуйÑта, проверте приÑоединена ли она",
diff --git a/bigbluebutton-html5/private/locales/sl.json b/bigbluebutton-html5/private/locales/sl.json
index 87353ead00aed3aebdc8a11e0ca561cc0ce4362e..478b07989eac67e4e1658fbd24951bc9a28710f8 100644
--- a/bigbluebutton-html5/private/locales/sl.json
+++ b/bigbluebutton-html5/private/locales/sl.json
@@ -74,7 +74,7 @@
"app.userList.menu.clearStatus.label": "PoÄisti stanje",
"app.userList.menu.removeUser.label": "Odstrani udeleženca",
"app.userList.menu.removeConfirmation.label": "Odstrani osebo ({0})",
- "app.userlist.menu.removeConfirmation.desc": "Ali ste prepriÄani, da želite odstraniti to osebo? Ko je enkrat odstranjena, se to sejo ne more veÄ povezati.",
+ "app.userlist.menu.removeConfirmation.desc": "PrepreÄi uporabniku ponovno povezavo s sejo",
"app.userList.menu.muteUserAudio.label": "Utišaj udeleženca",
"app.userList.menu.unmuteUserAudio.label": "Povrni zvok udeleženca",
"app.userList.userAriaLabel": "{0} {1} {2} Stanje {3}",
@@ -115,6 +115,7 @@
"app.media.screenshare.start": "Souporaba zaslona je omogoÄena",
"app.media.screenshare.end": "Souporaba zaslona je onemogoÄena",
"app.media.screenshare.unavailable": "Souporaba zaslona ni na voljo",
+ "app.media.screenshare.notSupported": "Možnost prikaza zaslona v tem brskalniku ni podprta",
"app.media.screenshare.autoplayBlockedDesc": "Zahtevana je odobritev za prikaz govornikovega zaslona.",
"app.media.screenshare.autoplayAllowLabel": "Pokaži zaslon v souporabi",
"app.screenshare.notAllowed": "Napaka: dovoljenje za dostop do zaslona ni odobreno",
diff --git a/bigbluebutton-html5/private/locales/sv_SE.json b/bigbluebutton-html5/private/locales/sv_SE.json
index b5e39521039836c325c8ebed838f69807695c59b..3aeb59bd7e6c509910f07bfd806eb94a5d550637 100644
--- a/bigbluebutton-html5/private/locales/sv_SE.json
+++ b/bigbluebutton-html5/private/locales/sv_SE.json
@@ -87,7 +87,7 @@
"app.userList.userOptions.muteAllExceptPresenterDesc": "Dämpar alla användare i mötet utom presentatören",
"app.userList.userOptions.unmuteAllLabel": "Stäng av mötesdämpning",
"app.userList.userOptions.unmuteAllDesc": "Dämpa ej mötet",
- "app.userList.userOptions.lockViewersLabel": "¨Lås åhörare",
+ "app.userList.userOptions.lockViewersLabel": "Lås åhörare",
"app.userList.userOptions.lockViewersDesc": "Lås vissa funktioner för mötesdeltagare",
"app.userList.userOptions.disableCam": "Åskådarnas webbkameror är inaktiverade",
"app.userList.userOptions.disableMic": "Åskådarnas mikrofoner är inaktiverade",
@@ -177,7 +177,7 @@
"app.presentationUploder.tableHeading.filename": "Filnamn",
"app.presentationUploder.tableHeading.options": "Valmöjligheter",
"app.presentationUploder.tableHeading.status": "Status",
- "app.poll.pollPaneTitle": "Omsröstning",
+ "app.poll.pollPaneTitle": "Omröstning",
"app.poll.quickPollTitle": "Snabb undersökning",
"app.poll.hidePollDesc": "Döljer enkät menyfönstret",
"app.poll.customPollInstruction": "För att skapa en anpassad enkät väljer du knappen nedan och anger dina alternativ.",
@@ -477,7 +477,7 @@
"app.shortcut-help.togglePan": "Akrivera panverktyg (presentatör)",
"app.shortcut-help.nextSlideDesc": "Nästa bild (presentatör)",
"app.shortcut-help.previousSlideDesc": "Förgående bild (presentatör)",
- "app.lock-viewers.title": "¨Lås åhörare",
+ "app.lock-viewers.title": "Lås åhörare",
"app.lock-viewers.featuresLable": "Funktion",
"app.lock-viewers.lockStatusLabel": "Status",
"app.lock-viewers.webcamLabel": "Dela webbkamera",
diff --git a/bigbluebutton-html5/private/locales/tr.json b/bigbluebutton-html5/private/locales/tr.json
index 5df09d1edd8060f5516172160bec6e7637edf892..b8a84389bc0f4fcbf88927c3374be58799a98ced 100644
--- a/bigbluebutton-html5/private/locales/tr.json
+++ b/bigbluebutton-html5/private/locales/tr.json
@@ -30,7 +30,7 @@
"app.captions.menu.ariaStartDesc": "Alt yazı düzenleyicisini açar ve üste açılan pencereyi kapatır",
"app.captions.menu.select": "Kullanılacak dili seçin",
"app.captions.menu.ariaSelect": "Alt yazı dili",
- "app.captions.menu.subtitle": " Lütfen oturumunuzdaki alt yazılar için bir dil ve biçem seçin.",
+ "app.captions.menu.subtitle": " Lütfen oturumunuzdaki alt yazıların dilini ve biçemini seçin.",
"app.captions.menu.title": "Alt yazılar",
"app.captions.menu.fontSize": "Boyut",
"app.captions.menu.fontColor": "Metin rengi",
@@ -74,7 +74,7 @@
"app.userList.menu.clearStatus.label": "Durumu temizle",
"app.userList.menu.removeUser.label": "Kullanıcıyı sil",
"app.userList.menu.removeConfirmation.label": "({0}) kullanıcısını sil",
- "app.userlist.menu.removeConfirmation.desc": "Bu kullanıcıyı silmek istediğinize emin misiniz? Silinen kullanıcılar görüşmeye yeniden katılamaz.",
+ "app.userlist.menu.removeConfirmation.desc": "Bu kullanıcının oturuma yeniden katılmasını engeller.",
"app.userList.menu.muteUserAudio.label": "Kullanıcının sesini kapat",
"app.userList.menu.unmuteUserAudio.label": "Kullanıcının sesini aç",
"app.userList.userAriaLabel": "{0} {1} {2} Durum {3}",
@@ -127,7 +127,7 @@
"app.meeting.meetingTimeHasEnded": "Zaman doldu. Toplantı birazdan bitirilecek",
"app.meeting.endedMessage": "Açılış ekranına geri döneceksiniz",
"app.meeting.alertMeetingEndsUnderOneMinute": "Toplantı bir dakika içinde bitirilecek.",
- "app.meeting.alertBreakoutEndsUnderOneMinute": "Ara bir dakika içinde sone erecek.",
+ "app.meeting.alertBreakoutEndsUnderOneMinute": "Grup çalışması bir dakika içinde sone erecek.",
"app.presentation.hide": "Sunumu gizle",
"app.presentation.notificationLabel": "Geçerli sunum",
"app.presentation.slideContent": "Slayt İçeriği",
@@ -244,7 +244,7 @@
"app.navBar.settingsDropdown.fullscreenLabel": "Tam ekrana geç",
"app.navBar.settingsDropdown.settingsLabel": "Ayarlar",
"app.navBar.settingsDropdown.aboutLabel": "Hakkında",
- "app.navBar.settingsDropdown.leaveSessionLabel": "Oturumu kapat",
+ "app.navBar.settingsDropdown.leaveSessionLabel": "Çıkış",
"app.navBar.settingsDropdown.exitFullscreenLabel": "Tam ekrandan çık",
"app.navBar.settingsDropdown.fullscreenDesc": "Ayarlar menüsünü tam ekran yap",
"app.navBar.settingsDropdown.settingsDesc": "Genel ayarları değiştir",
@@ -265,9 +265,9 @@
"app.navBar.recording.off": "Kaydedilmiyor",
"app.navBar.emptyAudioBrdige": "Etkin bir mikrofon yok. Bu kayıda ses eklemek için mikrofonunuzu paylaşın.",
"app.leaveConfirmation.confirmLabel": "Ayrıl",
- "app.leaveConfirmation.confirmDesc": "Toplantı oturumunuzu kapatır",
+ "app.leaveConfirmation.confirmDesc": "Sizi görüşmeden çıkarır",
"app.endMeeting.title": "Toplantıyı bitir",
- "app.endMeeting.description": "Bu oturumu bitirmek istediÄŸinize emin misiniz?",
+ "app.endMeeting.description": "Bu oturumu sonlandırmak istediğinize emin misiniz?",
"app.endMeeting.yesLabel": "Evet",
"app.endMeeting.noLabel": "Hayır",
"app.about.title": "Hakkında",
@@ -304,7 +304,7 @@
"app.submenu.audio.streamVolumeLabel": "Sesinizin düzeyi",
"app.submenu.video.title": "Görüntü",
"app.submenu.video.videoSourceLabel": "Görüntü kaynağı",
- "app.submenu.video.videoOptionLabel": "Görüntü kaynağını seç",
+ "app.submenu.video.videoOptionLabel": "Görüntü kaynağını seçin",
"app.submenu.video.videoQualityLabel": "Görüntü kalitesi",
"app.submenu.video.qualityOptionLabel": "Görüntü kalitesini seçin",
"app.submenu.video.participantsCamLabel": "İzleyicilerin kameraları görüntüleniyor",
@@ -320,7 +320,7 @@
"app.settings.dataSavingTab.label": "Veri tasarrufu",
"app.settings.dataSavingTab.webcam": "Kameraları aç",
"app.settings.dataSavingTab.screenShare": "Masaüstü paylaşılabilsin",
- "app.settings.dataSavingTab.description": "Bant genişliğinden tasarruf etmek için mevcut gösterimi ayarlayın.",
+ "app.settings.dataSavingTab.description": "Bant genişliğinden tasarruf etmek için nelerin görüntüleneceğini ayarlayın.",
"app.settings.save-notification.label": "Ayarlar kaydedildi",
"app.switch.onLabel": "AÇIK",
"app.switch.offLabel": "KAPALI",
@@ -340,8 +340,8 @@
"app.actionsBar.actionsDropdown.pollBtnLabel": "Oylama baÅŸlat",
"app.actionsBar.actionsDropdown.pollBtnDesc": "Anket bölmesini açar ya da kapatır",
"app.actionsBar.actionsDropdown.saveUserNames": "Kullanıcı adlarını kaydet",
- "app.actionsBar.actionsDropdown.createBreakoutRoom": "Çalışma odaları oluştur",
- "app.actionsBar.actionsDropdown.createBreakoutRoomDesc": "geçerli toplantıyı bölmek için aralar oluştur",
+ "app.actionsBar.actionsDropdown.createBreakoutRoom": "Grup odaları oluştur",
+ "app.actionsBar.actionsDropdown.createBreakoutRoomDesc": "geçerli toplantıyı bölmek için gruplar oluştur",
"app.actionsBar.actionsDropdown.captionsLabel": "Alt yazıları yaz",
"app.actionsBar.actionsDropdown.captionsDesc": "Alt yazı bölmesini açar ya da kapatır",
"app.actionsBar.actionsDropdown.takePresenter": "Sunucu ol",
@@ -362,182 +362,182 @@
"app.actionsBar.emojiMenu.noneLabel": "Durumu Temizle",
"app.actionsBar.emojiMenu.noneDesc": "Durumunuzu temizler",
"app.actionsBar.emojiMenu.applauseLabel": "Alkış",
- "app.actionsBar.emojiMenu.applauseDesc": "Durumunu alkış yap",
+ "app.actionsBar.emojiMenu.applauseDesc": "Durumunuzu alkış yapar",
"app.actionsBar.emojiMenu.thumbsUpLabel": "BeÄŸendim",
- "app.actionsBar.emojiMenu.thumbsUpDesc": "Durumunu beÄŸendi yap",
+ "app.actionsBar.emojiMenu.thumbsUpDesc": "Durumunuzu beÄŸendim yapar",
"app.actionsBar.emojiMenu.thumbsDownLabel": "BeÄŸenmedim",
- "app.actionsBar.emojiMenu.thumbsDownDesc": "Durumunu beÄŸenmedi yap",
- "app.actionsBar.currentStatusDesc": "ÅŸimdiki durum {0}",
- "app.actionsBar.captions.start": "Kapalı başlıkları görüntülemeye başla",
- "app.actionsBar.captions.stop": "Altyazıları görüntülemeyi durdur",
- "app.audioNotification.audioFailedError1001": "WebSocket bağlantısı koptu (hata 1001)",
- "app.audioNotification.audioFailedError1002": "WebSocket bağlantısı oluşturulamadı (hata 1002)",
- "app.audioNotification.audioFailedError1003": "Tarayıcı sürümü desteklenmiyor (hata 1003)",
- "app.audioNotification.audioFailedError1004": "Arama sırasında hata oluştu (neden={0}) (hata 1004)",
- "app.audioNotification.audioFailedError1005": "Çağrı beklenmedik bir şekilde sonlandırıldı (hata 1005)",
+ "app.actionsBar.emojiMenu.thumbsDownDesc": "Durumunuzu beÄŸenmedim yapar",
+ "app.actionsBar.currentStatusDesc": "ÅŸu andaki durum {0}",
+ "app.actionsBar.captions.start": "Alt yazıları görüntülemeye başla",
+ "app.actionsBar.captions.stop": "Alt yazıları görüntülemeyi durdur",
+ "app.audioNotification.audioFailedError1001": "WebSocket bağlantısı kesildi (hata 1001)",
+ "app.audioNotification.audioFailedError1002": "WebSocket bağlantısı kurulamadı (hata 1002)",
+ "app.audioNotification.audioFailedError1003": "Web tarayıcı sürümü desteklenmiyor (hata 1003)",
+ "app.audioNotification.audioFailedError1004": "Çağrı sırasında sorun çıktı (neden={0}) (hata 1004)",
+ "app.audioNotification.audioFailedError1005": "Çağrı beklenmedik bir şekilde sona erdi (hata 1005)",
"app.audioNotification.audioFailedError1006": "Çağrı zaman aşımına uğradı (hata 1006)",
- "app.audioNotification.audioFailedError1007": "Bağlantı hatası (ICE hatası 1007)",
- "app.audioNotification.audioFailedError1008": "Transfer başarısız (hata 1008)",
- "app.audioNotification.audioFailedError1009": "STUN/TURN sunucu bilgisi alınamıyor (hata 1009)",
- "app.audioNotification.audioFailedError1010": "Bağlantı elsıkışması zaman aşımına uğradı (ICE hatası 1010)",
- "app.audioNotification.audioFailedError1011": "Bağlantı zaman aşımı (ICE 1011 hatası)",
+ "app.audioNotification.audioFailedError1007": "Bağlantı kurulamadı (ICE hatası 1007)",
+ "app.audioNotification.audioFailedError1008": "Aktarım tamamlanamadı (hata 1008)",
+ "app.audioNotification.audioFailedError1009": "STUN/TURN sunucusunun bilgileri alınamadı (hata 1009)",
+ "app.audioNotification.audioFailedError1010": "Bağlantı iletişimi zaman aşımına uğradı (ICE hatası 1010)",
+ "app.audioNotification.audioFailedError1011": "Bağlantı zaman aşımına uğradı (ICE 1011 hatası)",
"app.audioNotification.audioFailedError1012": "Bağlantı sona erdildi (ICE 1012 hatası)",
- "app.audioNotification.audioFailedMessage": "Ses bağlantınız sağlanamadı",
- "app.audioNotification.mediaFailedMessage": "Yalnızca güvenli kaynaklara izin verildiğinden getUserMicMedia başarısız oldu",
+ "app.audioNotification.audioFailedMessage": "Ses bağlantınız kurulamadı",
+ "app.audioNotification.mediaFailedMessage": "Yalnızca güvenli kaynaklara izin verildiğinden getUserMicMedia tamamlanamadı",
"app.audioNotification.closeLabel": "Kapat",
- "app.audioNotificaion.reconnectingAsListenOnly": "Mikrofon katılımcılar için kilitlendi, oturuma dinleyici olarak devam edebilirsiniz",
- "app.breakoutJoinConfirmation.title": "Çalışma odasına katıl",
+ "app.audioNotificaion.reconnectingAsListenOnly": "Katılımcıların mikrofon kullanımı kilitlenmiş. Yalnız dinleyici olarak bağlanıyorsunuz",
+ "app.breakoutJoinConfirmation.title": "Grup odasına katıl",
"app.breakoutJoinConfirmation.message": "Katılmak istiyor musunuz?",
- "app.breakoutJoinConfirmation.confirmDesc": "Çalışma odasına gir",
+ "app.breakoutJoinConfirmation.confirmDesc": "Grup odasına katıl",
"app.breakoutJoinConfirmation.dismissLabel": "Vazgeç",
- "app.breakoutJoinConfirmation.dismissDesc": "Çalışma odasına katılmayı reddeder ve kapatır",
- "app.breakoutJoinConfirmation.freeJoinMessage": "Katılmak için bir çalışma odası seçin",
- "app.breakoutTimeRemainingMessage": "Çalışma odası için kalan zaman: {0}",
- "app.breakoutWillCloseMessage": "Süre bitti. Çalışma odası birazdan kapanacak",
+ "app.breakoutJoinConfirmation.dismissDesc": "Grup odasına katılmayı reddeder ve kapatır",
+ "app.breakoutJoinConfirmation.freeJoinMessage": "Katılacağınız bir grup odası seçin",
+ "app.breakoutTimeRemainingMessage": "Grup odasının kalan zamanı: {0}",
+ "app.breakoutWillCloseMessage": "Süre bitti. Grup odası birazdan kapanacak",
"app.calculatingBreakoutTimeRemaining": "Kalan süre hesaplanıyor...",
"app.audioModal.ariaTitle": "Ses modunda katılın",
"app.audioModal.microphoneLabel": "Mikrofon",
- "app.audioModal.listenOnlyLabel": "Sadece dinleyici",
+ "app.audioModal.listenOnlyLabel": "Yalnız dinleme",
"app.audioModal.audioChoiceLabel": "Sesli katılımınızı nasıl yapmak istersiniz?",
- "app.audioModal.iOSBrowser": "Ses / Video desteklenmiyor",
- "app.audioModal.iOSErrorDescription": "Şu anda iOS için Chrome'da ses ve video desteklenmemektedir.",
- "app.audioModal.iOSErrorRecommendation": "Safari iOS kullanmanızı tavsiye ederiz.",
+ "app.audioModal.iOSBrowser": "Ses/Görüntü desteklenmiyor",
+ "app.audioModal.iOSErrorDescription": "Şu anda iOS için Chrome üzerinde ses ve görüntü desteklenmiyor.",
+ "app.audioModal.iOSErrorRecommendation": "iOS için Safari kullanmanız önerilir.",
"app.audioModal.audioChoiceDesc": "Bu toplantıya katılacağınız ses ayarını seçin",
- "app.audioModal.unsupportedBrowserLabel": "Tam olarak desteklenmeyen bir tarayıcı kullanıyorsunuz. Lütfen tam destek için {0} veya {1} kullanın.",
+ "app.audioModal.unsupportedBrowserLabel": "Tam olarak desteklenmeyen bir tarayıcı kullanıyorsunuz. Lütfen tam destek almak için {0} ya da {1} kullanın.",
"app.audioModal.closeLabel": "Kapat",
"app.audioModal.yes": "Evet",
"app.audioModal.no": "Hayır",
- "app.audioModal.yes.arialabel" : "Yankı duyulur",
- "app.audioModal.no.arialabel" : "Yankı duyulmaz",
- "app.audioModal.echoTestTitle": "Bu özel bir yankı testidir. Birkaç kelime konuşun. Ses duydunuz mu?",
+ "app.audioModal.yes.arialabel" : "Yankı duyuluyor",
+ "app.audioModal.no.arialabel" : "Yankı duyulmuyor",
+ "app.audioModal.echoTestTitle": "Bu size özel bir yankı testidir. Biraz konuşun. Ses duydunuz mu?",
"app.audioModal.settingsTitle": "Ses ayarlarınızı değiştirin",
- "app.audioModal.helpTitle": "Medya cihazlarınızla ilgili bir problemi oluştu",
- "app.audioModal.helpText": "Sistemin mikrofonunuza erişim talebini onayladınız mı? Sesli görüşmeye katılmak istediğinizde, medya cihazlarınıza erişim izniyle ilgili bir iletişim kutusu görünecektir, sesli görüşmeye katılabilmek için onay vermeniz gerekir. Eğer onay iletişim kutusu görünmediyse, web tarayıcınızın ayarlarındaki mikrofon izinlerini değiştirmeyi deneyin.",
- "app.audioModal.help.noSSL": "Bu sayfa güvenli değil. Mikrofon erişimine izin verilebilmesi için sayfa HTTPS üzerinden sunulmalıdır. Lütfen sunucu yöneticisine başvurun.",
+ "app.audioModal.helpTitle": "Ortam aygıtlarınızla ilgili bir sorun çıktı",
+ "app.audioModal.helpText": "Mikrofonunuza erişme izni verdiniz mi? Görüşmeye sesinizle katılmak istediğinizde, ortam aygıtlarınıza erişme izni vermeniz için bir pencere görüntülenir. Sesli görüşmeye katılabilmek için onay vermeniz gerekir. İzin penceresi görüntülenmediyse, web tarayıcınızın ayarlarından mikrofon izinlerini değiştirmeyi deneyin.",
+ "app.audioModal.help.noSSL": "Bu sayfa güvenli bağlantı kullanmıyor. Mikrofon erişimine izin verilebilmesi için sayfa bağlantısı HTTPS . ile kurulmalıdır. Lütfen sunucu yöneticisi ile görüşün.",
"app.audioModal.help.macNotAllowed": " Mac Sistem Tercihleriniz mikrofonunuza erişimi engelliyor gibi görünüyor. Sistem Tercihleri > ​​Güvenlik ve Gizlilik > Gizlilik > Mikrofon açın ve kullandığınız tarayıcının kontrol edildiğini doğrulayın.",
- "app.audioModal.audioDialTitle": "Telefon numarası ile katıl",
+ "app.audioModal.audioDialTitle": "Telefonunuz ile katılın",
"app.audioDial.audioDialDescription": "Ara",
- "app.audioDial.audioDialConfrenceText": "ve oturuma katılmak için PIN numarasını gir:",
- "app.audioModal.autoplayBlockedDesc": "Sesli katılım için izninize ihtiyacımız var.",
- "app.audioModal.playAudio": "Ses çal",
- "app.audioModal.playAudio.arialabel" : "Ses çal",
+ "app.audioDial.audioDialConfrenceText": "ve görüşmeye katılmak için PIN numarasını yazın:",
+ "app.audioModal.autoplayBlockedDesc": "Sesi oynatmak için izniniz gerekiyor.",
+ "app.audioModal.playAudio": "Sesi oynat",
+ "app.audioModal.playAudio.arialabel" : "Sesi oynat",
"app.audioDial.tipIndicator": "Ä°pucu",
- "app.audioDial.tipMessage": "Sesli katılımı kapatmak / açmak için '0' tuşuna basın.",
- "app.audioModal.connecting": "Bağlanıyor",
- "app.audioModal.connectingEchoTest": "Ses testine bağlanılıyor",
+ "app.audioDial.tipMessage": "Kendi sesinizi açmak ya da kapatmak için telefonunuzda '0' tuşuna basın.",
+ "app.audioModal.connecting": "Bağlantı kuruluyor",
+ "app.audioModal.connectingEchoTest": "Yankı testi ile bağlantı kuruluyor",
"app.audioManager.joinedAudio": "Sesli görüşmeye katıldınız",
- "app.audioManager.joinedEcho": "Ses yankı testine katıldınız",
+ "app.audioManager.joinedEcho": "Yankı testine katıldınız",
"app.audioManager.leftAudio": "Sesli görüşmeden ayrıldınız",
- "app.audioManager.reconnectingAudio": "Sesi yeniden bağlamaya çalışıyor",
- "app.audioManager.genericError": "Hata: Bir hata oluştu, lütfen tekrar deneyin",
- "app.audioManager.connectionError": "Hata: Bağlantı hatası",
+ "app.audioManager.reconnectingAudio": "Ses bağlantısı yeniden kurulmaya çalışılıyor",
+ "app.audioManager.genericError": "Hata: Bir sorun çıktı. Lütfen yeniden deneyin",
+ "app.audioManager.connectionError": "Hata: Bağlantı sorunu",
"app.audioManager.requestTimeout": "Hata: İstek zaman aşımına uğradı",
"app.audioManager.invalidTarget": "Hata: Geçersiz hedeften talep denemesi hatası",
- "app.audioManager.mediaError": "Hata: Medya cihazlarınıza erişim problemi oluştu",
- "app.audio.joinAudio": "Sesli Katıl",
+ "app.audioManager.mediaError": "Hata: Ortam aygıtlarınıza erişilirken bir sorun çıktı",
+ "app.audio.joinAudio": "Sesli katıl",
"app.audio.leaveAudio": "Sesli Katılımı Kapat",
- "app.audio.enterSessionLabel": "Oturuma Katıl",
- "app.audio.playSoundLabel": "Ses çal",
+ "app.audio.enterSessionLabel": "Oturuma katıl",
+ "app.audio.playSoundLabel": "Sesi oynat",
"app.audio.backLabel": "Geri",
"app.audio.audioSettings.titleLabel": "Ses ayarlarınızı seçin",
- "app.audio.audioSettings.descriptionLabel": "Web tarayıcınızda mikrofon paylaşımıyla ilgili iletişim kutusu görünecektir, onaylamayı unutmayınız.",
+ "app.audio.audioSettings.descriptionLabel": "Lütfen web tarayıcınızda mikrofonunuzu paylaşmanızı isteyen bir pencere görüntüleneceğini unutmayın.",
"app.audio.audioSettings.microphoneSourceLabel": "Mikrofon kaynağı",
"app.audio.audioSettings.speakerSourceLabel": "Hoparlör kaynağı",
- "app.audio.audioSettings.microphoneStreamLabel": "Sesinizin seviyesi",
- "app.audio.audioSettings.retryLabel": "Yeniden Dene",
+ "app.audio.audioSettings.microphoneStreamLabel": "Ses düzeyiniz",
+ "app.audio.audioSettings.retryLabel": "Yeniden dene",
"app.audio.listenOnly.backLabel": "Geri",
"app.audio.listenOnly.closeLabel": "Kapat",
- "app.audio.permissionsOverlay.title": "BigBlueButton'un mikrofonunuzu kullanmasına izin verin",
- "app.audio.permissionsOverlay.hint": "Sesli oturuma katılmak için medya cihazlarınızı kullanmamıza izin vermeniz gerekiyor :)",
- "app.error.removed": "Konferanstan uzaklaştırıldınız",
- "app.error.meeting.ended": "Konferanstan ayrıldınız",
+ "app.audio.permissionsOverlay.title": "Mikrofonunuza eriÅŸim izni verin",
+ "app.audio.permissionsOverlay.hint": "Sesli görüşmeye katılabilmek için ortam aygıtlarınızı kullanmamıza izin vermelisiniz :)",
+ "app.error.removed": "Görüşmeden çıkarıldınız",
+ "app.error.meeting.ended": "Görüşmeden ayrıldınız",
"app.meeting.logout.duplicateUserEjectReason": "Aynı kullanıcı toplantıya ikinci kez katılmaya çalışıyor",
"app.meeting.logout.permissionEjectReason": "İzin ihlali nedeniyle çıkarıldı",
"app.meeting.logout.ejectedFromMeeting": "Toplantıdan çıkarıldınız",
"app.meeting.logout.validateTokenFailedEjectReason": "Yetkilendirme belirteci/token doğrulanamadı",
- "app.meeting.logout.userInactivityEjectReason": "Kullanıcı uzun süredir aktif değil",
- "app.meeting-ended.rating.legendLabel": "Geribildirim oylaması",
+ "app.meeting.logout.userInactivityEjectReason": "Kullanıcı uzun süredir etkin değil",
+ "app.meeting-ended.rating.legendLabel": "Geri bildirim deÄŸerlendirmesi",
"app.meeting-ended.rating.starLabel": "Yıldız",
"app.modal.close": "Kapat",
- "app.modal.close.description": "Değişiklikleri göz ardı eder ve modunu kapatır",
+ "app.modal.close.description": "Değişiklikleri yok sayar ve üste açılan pencereyi kapatır",
"app.modal.confirm": "Tamamlandı",
- "app.modal.newTab": "(yeni sekmeyi açar)",
- "app.modal.confirm.description": "Değişiklikleri kaydeder ve modunu kapatır",
+ "app.modal.newTab": "(yeni sekme açar)",
+ "app.modal.confirm.description": "Değişiklikleri kaydeder ve üste açılan pencereyi kapatır",
"app.dropdown.close": "Kapat",
- "app.error.400": "Geçersiz istek",
+ "app.error.400": "İstek Hatalı",
"app.error.401": "Yetkisiz",
"app.error.403": "Toplantıdan çıkarıldınız",
"app.error.404": "Bulunamadı",
"app.error.410": "Toplantı bitti",
- "app.error.500": "Hops, birÅŸeyler ters gitti",
- "app.error.leaveLabel": "Tekrar giriÅŸ yap",
- "app.error.fallback.presentation.title": "Bir hata oluÅŸtu",
+ "app.error.500": "Maalesef, bir ÅŸeyler ters gitti",
+ "app.error.leaveLabel": "Yeniden gir",
+ "app.error.fallback.presentation.title": "Bir sorun çıktı",
"app.error.fallback.presentation.description": "Giriş yapıldı. Lütfen sayfayı yeniden yüklemeyi deneyin.",
- "app.error.fallback.presentation.reloadButton": "Tekrar yükle",
- "app.guest.waiting": "Katılım onayı bekleniyor",
- "app.userList.guest.waitingUsers": "Kullanıcılar bekleniyor",
- "app.userList.guest.waitingUsersTitle": "Kullanıcı yönetimi",
- "app.userList.guest.optionTitle": "Bekleyen Kullanıcıları İnceleyin",
- "app.userList.guest.allowAllAuthenticated": "Doğrulanmış tüm kullanıcılara izin ver",
- "app.userList.guest.allowAllGuests": "Tüm misafir kullanıcılara izin ver",
+ "app.error.fallback.presentation.reloadButton": "Yeniden yükle",
+ "app.guest.waiting": "Katılma onayı bekleniyor",
+ "app.userList.guest.waitingUsers": "Kullanıcılar Bekleniyor",
+ "app.userList.guest.waitingUsersTitle": "Kullanıcı Yönetimi",
+ "app.userList.guest.optionTitle": "Bekleyen Kullanıcılara Bakın",
+ "app.userList.guest.allowAllAuthenticated": "Doğrulanmış kullanıcılara izin ver",
+ "app.userList.guest.allowAllGuests": "Tüm konuklara izin ver",
"app.userList.guest.allowEveryone": "Herkese izin ver",
"app.userList.guest.denyEveryone": "Herkesi reddet",
- "app.userList.guest.pendingUsers": "{0} Bekleyen Kullanıcı",
- "app.userList.guest.pendingGuestUsers": "{0} Bekleyen Misafir Kullanıcı",
+ "app.userList.guest.pendingUsers": "{0} Kullanıcı Bekliyor",
+ "app.userList.guest.pendingGuestUsers": "{0} Konuk Kullanıcı Bekliyor",
"app.userList.guest.pendingGuestAlert": "Oturuma katıldı ve onayınızı bekliyor.",
- "app.userList.guest.rememberChoice": "Seçimi hatırla",
+ "app.userList.guest.rememberChoice": "Seçim hatırlansın",
"app.user-info.title": "Dizinde Arama",
- "app.toast.breakoutRoomEnded": "Çalışma odası sonlandı. Lütfen sesli görüşmeye yeniden katılın.",
- "app.toast.chat.public": "Yeni Genel Sohbet mesajı",
- "app.toast.chat.private": "Yeni Özel Sohbet mesajı",
+ "app.toast.breakoutRoomEnded": "Grup odası kapatıldı. Lütfen yeniden sesli görüşmeye katılın.",
+ "app.toast.chat.public": "Yeni Genel Sohbet iletisi",
+ "app.toast.chat.private": "Yeni Özel Sohbet iletisi",
"app.toast.chat.system": "Sistem",
"app.toast.clearedEmoji.label": "Emoji durumu temizlendi",
"app.toast.setEmoji.label": "Emoji durumu {0} olarak ayarlandı",
- "app.toast.meetingMuteOn.label": "Tüm kullanıcılar için ses kapatıldı",
+ "app.toast.meetingMuteOn.label": "Tüm kullanıcıların sesi kapatıldı",
"app.toast.meetingMuteOff.label": "Toplantının sesi açıldı",
"app.notification.recordingStart": "Bu oturum ÅŸu anda kaydediliyor",
- "app.notification.recordingStop": "Bu oturum ÅŸu anda kaydediliyor",
+ "app.notification.recordingStop": "Bu oturum kaydedilmiyor",
"app.notification.recordingPaused": "Bu oturum artık kaydedilmiyor",
"app.notification.recordingAriaLabel": "Kaydedilen süre",
"app.notification.userJoinPushAlert": "{0} oturuma katıldı",
- "app.shortcut-help.title": "Klavye kısayolları",
- "app.shortcut-help.accessKeyNotAvailable": "Erişim tuşları mevcut değil",
+ "app.shortcut-help.title": "Tuş takımı kısayolları",
+ "app.shortcut-help.accessKeyNotAvailable": "Erişim tuşları kullanılamıyor",
"app.shortcut-help.comboLabel": "Açılan Kutu",
- "app.shortcut-help.functionLabel": "Fonksiyon",
+ "app.shortcut-help.functionLabel": "Ä°ÅŸlev",
"app.shortcut-help.closeLabel": "Kapat",
- "app.shortcut-help.closeDesc": "Klavye kısayolları modunu kapatır",
- "app.shortcut-help.openOptions": "Seçenekleri Aç",
- "app.shortcut-help.toggleUserList": "Kullanıcı Listesine Geç",
- "app.shortcut-help.toggleMute": "Sustur / KonuÅŸtur",
- "app.shortcut-help.togglePublicChat": "Genel Sohbeti değiştir (Kullanıcı listesi açık olmalıdır)",
- "app.shortcut-help.hidePrivateChat": "Özel mesajı gizle",
- "app.shortcut-help.closePrivateChat": "Özel mesajı kapat",
+ "app.shortcut-help.closeDesc": "Üste açılan tuş takımı kısayolları penceresini kapatır",
+ "app.shortcut-help.openOptions": "Ayarları Aç",
+ "app.shortcut-help.toggleUserList": "Kullanıcı Listesini Aç/Kapat",
+ "app.shortcut-help.toggleMute": "Sesi Kapat/Aç",
+ "app.shortcut-help.togglePublicChat": "Herkese Açık Sohbete Geç (Kullanıcı listesi açık olmalıdır)",
+ "app.shortcut-help.hidePrivateChat": "Özel sohbeti gizle",
+ "app.shortcut-help.closePrivateChat": "Özel sohbeti kapat",
"app.shortcut-help.openActions": " Eylemler menüsünü aç",
"app.shortcut-help.openStatus": "Durum menüsünü aç",
"app.shortcut-help.togglePan": "Sunum araçlarını etkinleştir (Eğitimci)",
- "app.shortcut-help.nextSlideDesc": "Sonraki Slayt (EÄŸitimci)",
- "app.shortcut-help.previousSlideDesc": "Önceki Slayt (Eğitimci)",
+ "app.shortcut-help.nextSlideDesc": "Sonraki slayt (Sunucu)",
+ "app.shortcut-help.previousSlideDesc": "Önceki slayt (Sunucu)",
"app.lock-viewers.title": "Katılımcıları kilitle",
"app.lock-viewers.description": "Bu seçenekler, izleyicilerin belirli özellikleri kullanmasını kısıtlamanıza olanak tanır.",
"app.lock-viewers.featuresLable": "Özellik",
"app.lock-viewers.lockStatusLabel": "Durum",
"app.lock-viewers.webcamLabel": "Kamerayı paylaş",
"app.lock-viewers.otherViewersWebcamLabel": "Diğer izleyicilerin kameralarına bakın",
- "app.lock-viewers.microphoneLable": "Mikrofon paylaÅŸ",
- "app.lock-viewers.PublicChatLabel": "Genel Sohbet mesajı gönder",
- "app.lock-viewers.PrivateChatLable": "Özel mesaj gönder",
+ "app.lock-viewers.microphoneLable": "Mikrofonu paylaÅŸ",
+ "app.lock-viewers.PublicChatLabel": "Herkese açık sohbet iletileri gönder",
+ "app.lock-viewers.PrivateChatLable": "Özel sohbet iletileri gönder",
"app.lock-viewers.notesLabel": "Paylaşılan Notları düzenle",
"app.lock-viewers.userListLabel": "Kullanıcılar listesindeki diğer katılımcılara bakın",
"app.lock-viewers.ariaTitle": "Katılımcıların modal ayarlarını kilitle",
"app.lock-viewers.button.apply": "Uygula",
"app.lock-viewers.button.cancel": "Vazgeç",
"app.lock-viewers.locked": "Kilitli",
- "app.lock-viewers.unlocked": "Açık",
- "app.recording.startTitle": "Kayda baÅŸla",
+ "app.lock-viewers.unlocked": "Kilidi açık",
+ "app.recording.startTitle": "Kaydı başlat",
"app.recording.stopTitle": "Kaydı durdur",
- "app.recording.resumeTitle": "Kayda devam et",
- "app.recording.startDescription": "Kaydı duraklatmak için kayıt düğmesini daha sonra tekrar kullanabilirsiniz.",
- "app.recording.stopDescription": "Kaydı duraklatmak istediğinizden emin misiniz? Kayıt düğmesine tekrar basarak devam edebilirsiniz.",
+ "app.recording.resumeTitle": "Kaydı sürdür",
+ "app.recording.startDescription": "Daha sonra kaydı duraklatmak için yeniden kayıt düğmesini kullanabilirsiniz",
+ "app.recording.stopDescription": "Kaydı duraklatmak istediğinize emin misiniz? Kayıt düğmesine yeniden basarak kaydı sürdürebilirsiniz.",
"app.videoPreview.cameraLabel": "Kamera",
"app.videoPreview.profileLabel": "Kalite",
"app.videoPreview.cancelLabel": "Vazgeç",
@@ -552,14 +552,14 @@
"app.video.joinVideo": "Kamerayı paylaş",
"app.video.leaveVideo": "Kamerası paylaşımını durdur",
"app.video.iceCandidateError": "ICE adayı ekleme hatası",
- "app.video.iceConnectionStateError": "Bağlantı başarısız (ICE 1107 hatası)",
+ "app.video.iceConnectionStateError": "Bağlantı kurulamadı (ICE 1107 hatası)",
"app.video.permissionError": "Kamera paylaşılırken sorun çıktı. Lütfen izinleri denetleyin",
"app.video.sharingError": "Kamera paylaşılırken sorun çıktı",
"app.video.notFoundError": "Kamera bulunamadı. Lütfen bağlı olduğunu denetleyin",
"app.video.notAllowed": "Kamera paylaşma izni verilmemiş, lütfen web tarayıcı izinlerini verdiğinizden emin olun",
"app.video.notSupportedError": "Kamera görüntüsü yalnız güvenli kaynaklar ile paylaşabilir, SSL sertifikanızın geçerli olduğundan emin olun",
"app.video.notReadableError": "Kamera görüntüsü alınamadı. Lütfen kamerayı başka bir uygulamanın kullanmadığından emin olun",
- "app.video.mediaFlowTimeout1020": "Medya, sunucuya ulaşamıyor (hata 1020)",
+ "app.video.mediaFlowTimeout1020": "Ortam sunucuya ulaşamadı (hata 1020)",
"app.video.suggestWebcamLock": "İzleyicilerin kameraları kilitlenmeye zorlansın mı?",
"app.video.suggestWebcamLockReason": "(bu, toplantının kararlılığını artıracak)",
"app.video.enable": "EtkinleÅŸtir",
@@ -568,24 +568,24 @@
"app.video.swapCamDesc": "kameraların yönünü değiştir",
"app.video.videoLocked": "Kamera paylaşımı kilitli",
"app.video.videoButtonDesc": "Kamerayı paylaş",
- "app.video.videoMenu": "Video menüsü",
+ "app.video.videoMenu": "Görüntü menüsü",
"app.video.videoMenuDisabled": "Video menüsü Web kamerası ayarlarında devre dışı",
- "app.video.videoMenuDesc": "Video menüsünü liste olarak aç",
- "app.video.chromeExtensionError": "Yüklemeniz gerekiyor",
- "app.video.chromeExtensionErrorLink": "bu Chrome uzantısı",
+ "app.video.videoMenuDesc": "Görüntü menüsü listesini aç",
+ "app.video.chromeExtensionError": "Şunu kurmalısınız:",
+ "app.video.chromeExtensionErrorLink": "Chrome eklentisi",
"app.video.stats.title": "Bağlantı İstatistikleri",
- "app.video.stats.packetsReceived": "Gelen paketler",
- "app.video.stats.packetsSent": "Giden paketler",
- "app.video.stats.packetsLost": "Kayıp paketler",
+ "app.video.stats.packetsReceived": "Gelen paket",
+ "app.video.stats.packetsSent": "Giden paket",
+ "app.video.stats.packetsLost": "Kayıp paket",
"app.video.stats.bitrate": "Bit hızı",
"app.video.stats.lostPercentage": "Toplam kayıp yüzdesi",
"app.video.stats.lostRecentPercentage": "Son kayıp yüzdesi",
"app.video.stats.dimensions": "Boyutlar",
- "app.video.stats.codec": "Kodek",
+ "app.video.stats.codec": "Kodlayıcı/çözücü",
"app.video.stats.decodeDelay": "Kod çözme gecikmesi",
"app.video.stats.rtt": "RTT",
- "app.video.stats.encodeUsagePercent": "Çözümleme kullanımı",
- "app.video.stats.currentDelay": "Mevcut gecikme",
+ "app.video.stats.encodeUsagePercent": "Kodlama kullanımı",
+ "app.video.stats.currentDelay": "Åžu andaki gecikme",
"app.fullscreenButton.label": "{0} tam ekran yap",
"app.deskshare.iceConnectionStateError": "Ekran paylaşımı sırasında bağlantı hatası (ICE hatası 1108)",
"app.sfu.mediaServerConnectionError2000": "Medya sunucusuna ulaşılamıyor (hata 2000)",
@@ -598,7 +598,7 @@
"app.sfu.invalidSdp2202":"İstemci geçersiz medya isteği talebi oluşturdu (SDP hatası 2202)",
"app.sfu.noAvailableCodec2203": "Sunucu uygun medya kodlaması bulamadı (hata 2203)",
"app.meeting.endNotification.ok.label": "Tamam",
- "app.whiteboard.annotations.poll": "Anket sonuçları yayınlandı",
+ "app.whiteboard.annotations.poll": "Oylama sonuçları yayınlandı",
"app.whiteboard.toolbar.tools": "Araçlar",
"app.whiteboard.toolbar.tools.hand": "Sunum araçları",
"app.whiteboard.toolbar.tools.pencil": "Kalem",
@@ -607,17 +607,17 @@
"app.whiteboard.toolbar.tools.ellipse": "Elips",
"app.whiteboard.toolbar.tools.line": "Çizgi",
"app.whiteboard.toolbar.tools.text": "Metin",
- "app.whiteboard.toolbar.thickness": "Çizim kalınlığı",
- "app.whiteboard.toolbar.thicknessDisabled": "Çizim kalınlığı devre dışı",
+ "app.whiteboard.toolbar.thickness": "Çizgi kalınlığı",
+ "app.whiteboard.toolbar.thicknessDisabled": "Çizgi kalınlığı kullanılmıyor",
"app.whiteboard.toolbar.color": "Renkler",
- "app.whiteboard.toolbar.colorDisabled": "Renkler devre dışı",
+ "app.whiteboard.toolbar.colorDisabled": "Renkler kullanılmıyor",
"app.whiteboard.toolbar.color.black": "Siyah",
"app.whiteboard.toolbar.color.white": "Beyaz",
"app.whiteboard.toolbar.color.red": "Kırmızı",
"app.whiteboard.toolbar.color.orange": "Turuncu",
"app.whiteboard.toolbar.color.eletricLime": "Parlak yeÅŸil",
- "app.whiteboard.toolbar.color.lime": "Açık Yeşil",
- "app.whiteboard.toolbar.color.cyan": "Cam Göbeği",
+ "app.whiteboard.toolbar.color.lime": "Açık yeşil",
+ "app.whiteboard.toolbar.color.cyan": "Cam göbeği",
"app.whiteboard.toolbar.color.dodgerBlue": "Kirli mavi",
"app.whiteboard.toolbar.color.blue": "Mavi",
"app.whiteboard.toolbar.color.violet": "MenekÅŸe",
@@ -628,10 +628,10 @@
"app.whiteboard.toolbar.multiUserOn": "Çoklu kullanıcı modunu aç",
"app.whiteboard.toolbar.multiUserOff": "Çoklu kullanıcı modunu kapat",
"app.whiteboard.toolbar.fontSize": "Yazı tipi boyutu listesi",
- "app.feedback.title": "Konferanstan ayrıldınız",
+ "app.feedback.title": "Görüşmeden çıktınız",
"app.feedback.subtitle": "BigBlueButton deneyiminizi bizimle paylaşın (zorunlu değil)",
"app.feedback.textarea": "BigBlueButton'ı nasıl daha iyi yapabiliriz?",
- "app.feedback.sendFeedback": "Geri bildirim yap",
+ "app.feedback.sendFeedback": "Geri Bildirim Gönder",
"app.feedback.sendFeedbackDesc": "Bir geri bildirim gönderip toplantıdan çıkın",
"app.videoDock.webcamFocusLabel": "Odakla",
"app.videoDock.webcamFocusDesc": "Seçilmiş kameraya odaklan",
@@ -639,53 +639,53 @@
"app.videoDock.webcamUnfocusDesc": "Seçilmiş kameradan uzaklaş",
"app.videoDock.autoplayBlockedDesc": "Size diğer kullanıcıların web kameralarını göstermek için izninize ihtiyacımız var.",
"app.videoDock.autoplayAllowLabel": "Kameraları görüntüle",
- "app.invitation.title": "Çalışma odası davetiyesi",
- "app.invitation.confirm": "Davet et",
- "app.createBreakoutRoom.title": "Çalışma Odaları",
- "app.createBreakoutRoom.ariaTitle": "Çalışma Odalarını Gizle",
- "app.createBreakoutRoom.breakoutRoomLabel": "Çalışma Odası {0}",
- "app.createBreakoutRoom.generatingURL": "URL oluÅŸturuluyor",
+ "app.invitation.title": "Grup odası davetiyesi",
+ "app.invitation.confirm": "Çağır",
+ "app.createBreakoutRoom.title": "Grup Odaları",
+ "app.createBreakoutRoom.ariaTitle": "Grup Odalarını Gizle",
+ "app.createBreakoutRoom.breakoutRoomLabel": "Grup Odaları {0}",
+ "app.createBreakoutRoom.generatingURL": "Adres oluÅŸturuluyor",
"app.createBreakoutRoom.generatedURL": "OluÅŸturuldu",
"app.createBreakoutRoom.duration": "Süre {0}",
"app.createBreakoutRoom.room": "Oda {0}",
"app.createBreakoutRoom.notAssigned": "Atanmamış ({0})",
"app.createBreakoutRoom.join": "Odaya katıl",
- "app.createBreakoutRoom.joinAudio": "Sesli Katıl",
+ "app.createBreakoutRoom.joinAudio": "Sesle katıl",
"app.createBreakoutRoom.returnAudio": "Dönüş sesi",
"app.createBreakoutRoom.alreadyConnected": "Zaten odada",
"app.createBreakoutRoom.confirm": "OluÅŸtur",
- "app.createBreakoutRoom.record": "Kayıt",
+ "app.createBreakoutRoom.record": "Kaydet",
"app.createBreakoutRoom.numberOfRooms": "Oda sayısı",
"app.createBreakoutRoom.durationInMinutes": "Süre (dakika)",
"app.createBreakoutRoom.randomlyAssign": "Rastgele atama",
- "app.createBreakoutRoom.endAllBreakouts": "Tüm çalışma odalarını sonlandır",
+ "app.createBreakoutRoom.endAllBreakouts": "Tüm grup odalarını kapat",
"app.createBreakoutRoom.roomName": "{0} (Oda - {1})",
"app.createBreakoutRoom.doneLabel": "Tamamlandı",
"app.createBreakoutRoom.nextLabel": "Sonraki",
- "app.createBreakoutRoom.minusRoomTime": "Çalışma odası süresini kısaltır",
- "app.createBreakoutRoom.addRoomTime": "Çalışma odası süresini arttırır",
+ "app.createBreakoutRoom.minusRoomTime": "Grup odası süresini kısalt",
+ "app.createBreakoutRoom.addRoomTime": "Grup odası süresini arttır",
"app.createBreakoutRoom.addParticipantLabel": "+ Katılımcı ekle",
- "app.createBreakoutRoom.freeJoin": "Kullanıcıların katılmak için bir çalışma odası seçmesine izin ver",
- "app.createBreakoutRoom.leastOneWarnBreakout": "Bir çalışma odasına en az bir kullanıcı atamalısınız..",
- "app.createBreakoutRoom.modalDesc": "İpucu: Herhangi bir çalışma odasına atama yapmak için kullanıcının adını sürükleyip bırakabilirsiniz.",
+ "app.createBreakoutRoom.freeJoin": "Kullanıcılar katılacakları grup odasını seçebilsin",
+ "app.createBreakoutRoom.leastOneWarnBreakout": "Bir grup odasına en az bir kullanıcı atamalısınız..",
+ "app.createBreakoutRoom.modalDesc": "İpucu: Herhangi bir grup odasına atamak için kullanıcıların adını sürükleyip bırakabilirsiniz.",
"app.createBreakoutRoom.roomTime": "{0} dakika",
"app.createBreakoutRoom.numberOfRoomsError": "Oda sayısı geçersiz.",
- "app.externalVideo.start": "Yeni bir video paylaÅŸ",
- "app.externalVideo.title": "Harici bir video paylaşın",
- "app.externalVideo.input": "Harici Video URL",
- "app.externalVideo.urlInput": "Video URL'i ekle",
- "app.externalVideo.urlError": "Bu video URL’si desteklenmiyor",
+ "app.externalVideo.start": "Yeni bir görüntü paylaş",
+ "app.externalVideo.title": "Dışarıdan bir görüntü paylaş",
+ "app.externalVideo.input": "Dış Görüntü Adresi",
+ "app.externalVideo.urlInput": "Görüntü Adresi Ekle",
+ "app.externalVideo.urlError": "Bu görüntü adresi desteklenmiyor",
"app.externalVideo.close": "Kapat",
"app.externalVideo.autoPlayWarning": "Medya eşleştirmesini etkinleştirmek için videoyu oynatın",
"app.network.connection.effective.slow": "Bağlantı sorunlarını tespit ediyoruz",
"app.network.connection.effective.slow.help": "Daha fazla bilgi",
"app.externalVideo.noteLabel": "Not: Paylaşılan harici videolar kayıtta görünmez. YouTube, Vimeo, Instructure Media, Twitch ve Daily Motion URL'leri desteklenir.",
- "app.actionsBar.actionsDropdown.shareExternalVideo": "Harici bir video paylaşın",
- "app.actionsBar.actionsDropdown.stopShareExternalVideo": "Harici video paylaşımını durdur",
- "app.iOSWarning.label": "Lütfen iOS 12.2 veya daha üstüne yükseltin",
+ "app.actionsBar.actionsDropdown.shareExternalVideo": "Dışarıdan bir görüntü paylaşın",
+ "app.actionsBar.actionsDropdown.stopShareExternalVideo": "Dış görüntü paylaşımını durdur",
+ "app.iOSWarning.label": "Lütfen iOS 12.2 ya da üzerindeki bir sürüme yükseltin",
"app.legacy.unsupportedBrowser": "Tam olarak desteklenmeyen bir tarayıcı kullanıyorsunuz. Lütfen tam destek için {0} veya {1} kullanın.",
"app.legacy.upgradeBrowser": "Desteklenen bir tarayıcının eski bir sürümünü kullanıyor gibi görünüyorsunuz. Lütfen tam destek için tarayıcınızı güncelleyin.",
- "app.legacy.criosBrowser": "Lütfen iOS'ta tam destek için Safari'yi kullanın."
+ "app.legacy.criosBrowser": "Lütfen iOS üzerinde tam destek almak için Safari kullanın."
}
diff --git a/bigbluebutton-html5/private/locales/tr_TR.json b/bigbluebutton-html5/private/locales/tr_TR.json
index be089638c9ac93c408c69a068e753498aecb51ca..52f983f46cdc290dacf356d4893eb24c572b7e54 100644
--- a/bigbluebutton-html5/private/locales/tr_TR.json
+++ b/bigbluebutton-html5/private/locales/tr_TR.json
@@ -63,6 +63,7 @@
"app.userList.presenter": "Sunucu",
"app.userList.you": "Siz",
"app.userList.locked": "Kilitli",
+ "app.userList.byModerator": "(Sorumlu) tarafından",
"app.userList.label": "Katılımcı listesi",
"app.userList.toggleCompactView.label": "Sıkıştırılmış görünüm moduna geç",
"app.userList.guest": "Misafir",
@@ -73,6 +74,7 @@
"app.userList.menu.clearStatus.label": "Durumu temizle",
"app.userList.menu.removeUser.label": "Kullanıcı uzaklaştır",
"app.userList.menu.removeConfirmation.label": "({0}) kullanıcısını kaldır",
+ "app.userlist.menu.removeConfirmation.desc": "Bu kullanıcının oturuma yeniden katılması engellensin",
"app.userList.menu.muteUserAudio.label": "Kullanıcıyı sustur",
"app.userList.menu.unmuteUserAudio.label": "Kullanıcıyı konuştur",
"app.userList.userAriaLabel": "{0} {1} {2} Durum {3}",
@@ -113,6 +115,7 @@
"app.media.screenshare.start": "Ekran paylaşımı başladı",
"app.media.screenshare.end": "Ekran paylaşımı sonlandı",
"app.media.screenshare.unavailable": "Ekran Paylaşımı Mevcut Değil",
+ "app.media.screenshare.notSupported": "Bu web tarayıcıda ekran paylaşımı desteklenmiyor.",
"app.media.screenshare.autoplayBlockedDesc": "Size sunum yapan kişinin ekranını göstermek için izninize ihtiyacımız var.",
"app.media.screenshare.autoplayAllowLabel": "Paylaşılan ekranı görüntüle",
"app.screenshare.notAllowed": "Hata: Ekrana eriÅŸim izni verilmedi.",
@@ -171,6 +174,9 @@
"app.presentationUploder.rejectedError": "Seçilen dosya(lar) reddedildi. Lütfen dosya tür(ler)ini kontrol edin.",
"app.presentationUploder.upload.progress": "Yükleniyor ({0}%)",
"app.presentationUploder.upload.413": "Dosya çok büyük. Lütfen daha küçük dosyalara bölün.",
+ "app.presentationUploder.upload.408": "Yükleme isteği kodunun süresi geçmiş.",
+ "app.presentationUploder.upload.404": "404: Yükleme kodu geçersiz",
+ "app.presentationUploder.upload.401": "Sunum yükleme isteği kodu oluşturulamadı.",
"app.presentationUploder.conversion.conversionProcessingSlides": "Sayfalar iÅŸleniyor: {0} / {1}",
"app.presentationUploder.conversion.genericConversionStatus": "Dosya dönüştürülüyor ...",
"app.presentationUploder.conversion.generatingThumbnail": "Küçük resimler oluşturuluyor ...",
diff --git a/bigbluebutton-html5/private/locales/uk_UA.json b/bigbluebutton-html5/private/locales/uk_UA.json
index 68823dd42baf819d7595f79565f55a15a590b386..dfc7d2664f631ddb1725ab0cbba18462f402b344 100644
--- a/bigbluebutton-html5/private/locales/uk_UA.json
+++ b/bigbluebutton-html5/private/locales/uk_UA.json
@@ -14,13 +14,13 @@
"app.chat.moreMessages": "Більше повідомлень нижче",
"app.chat.dropdown.options": "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‡Ð°Ñ‚Ñƒ",
"app.chat.dropdown.clear": "ОчиÑтити",
- "app.chat.dropdown.copy": "Скопіювати",
+ "app.chat.dropdown.copy": "Копіювати",
"app.chat.dropdown.save": "Зберегти",
"app.chat.label": "Чат",
"app.chat.offline": "Ðе в мережі",
"app.chat.emptyLogLabel": "Журнал чату порожній",
- "app.chat.clearPublicChatMessage": "ІÑÑ‚Ð¾Ñ€Ñ–Ñ Ð·Ð°Ð³Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ чату була очищена модератором",
- "app.chat.multi.typing": "Декілька кориÑтувачів набирають",
+ "app.chat.clearPublicChatMessage": "ІÑторію загального чату очищено ведучим",
+ "app.chat.multi.typing": "УчаÑники пишуть",
"app.chat.one.typing": "{0} набирає",
"app.chat.two.typing": "{0} і {1} набирають",
"app.captions.label": "Субтитри",
@@ -39,7 +39,7 @@
"app.captions.menu.previewLabel": "Попередній переглÑд",
"app.captions.menu.cancelLabel": "СкаÑувати",
"app.captions.pad.hide": "Приховати Ñубтитри",
- "app.captions.pad.tip": "ÐатиÑніть Esc, щоб ÑфокуÑувати панель інÑтрументів редактора",
+ "app.captions.pad.tip": "ÐатиÑніÑÑ‚ÑŒ Esc, щоб ÑфокуÑувати панель інÑтрументів редактора",
"app.captions.pad.ownership": "Стати ведучим",
"app.captions.pad.ownershipTooltip": "Ви будете призначені Ñк влаÑник {0} Ñубтитрів",
"app.captions.pad.interimResult": "Проміжні результати",
@@ -50,11 +50,11 @@
"app.note.title": "Спільні нотатки",
"app.note.label": "Ðотатки",
"app.note.hideNoteLabel": "Сховати нотатки",
- "app.user.activityCheck": "Перевірка активноÑÑ‚Ñ– кориÑтувача",
- "app.user.activityCheck.label": "Перевірте, чи знаходитьÑÑ ÐºÐ¾Ñ€Ð¸Ñтувач у зуÑÑ‚Ñ€iчi ({0})",
+ "app.user.activityCheck": "Перевірка активноÑÑ‚Ñ– учаÑника",
+ "app.user.activityCheck.label": "Перевірте, чи учаÑник зараз на зуÑÑ‚Ñ€iчi ({0})",
"app.user.activityCheck.check": "Перевірка",
"app.note.tipLabel": "ÐатиÑніть Esc, щоб ÑфокуÑувати панель інÑтрументів редактора",
- "app.userList.usersTitle": "КориÑтувачі",
+ "app.userList.usersTitle": "УчаÑники",
"app.userList.participantsTitle": "УчаÑники",
"app.userList.messagesTitle": "ПовідомленнÑ",
"app.userList.notesTitle": "Ðотатки",
@@ -63,34 +63,34 @@
"app.userList.presenter": "Ведучий",
"app.userList.you": "Ви",
"app.userList.locked": "Обмежено",
- "app.userList.byModerator": "(модератор)",
- "app.userList.label": "СпиÑок кориÑтувачів",
+ "app.userList.byModerator": "(ведучий)",
+ "app.userList.label": "СпиÑок учаÑників",
"app.userList.toggleCompactView.label": "Увімкнути/вимкнути компактний вид",
"app.userList.guest": "ГіÑÑ‚ÑŒ",
- "app.userList.menuTitleContext": "ДоÑтупні опції",
+ "app.userList.menuTitleContext": "ДоÑтупні параметри",
"app.userList.chatListItem.unreadSingular": "{0} нове повідомленнÑ",
"app.userList.chatListItem.unreadPlural": "{0} нових повідомлень",
"app.userList.menu.chat.label": "Почати приватний чат",
"app.userList.menu.clearStatus.label": "ЗнÑти ÑтатуÑ",
- "app.userList.menu.removeUser.label": "Виключити кориÑтувача",
- "app.userList.menu.removeConfirmation.label": "Вилучити кориÑтувача ({0})",
- "app.userlist.menu.removeConfirmation.desc": "ДійÑно вилучити цього кориÑтувача? ПіÑÐ»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ цей кориÑтувач не зможе повторно приєднатиÑÑ Ð´Ð¾ цього ÑеанÑу.",
- "app.userList.menu.muteUserAudio.label": "Вимкнути мікрофон кориÑтувача",
- "app.userList.menu.unmuteUserAudio.label": "Увімкнути мікрофон кориÑтувача",
+ "app.userList.menu.removeUser.label": "Вилучити учаÑника",
+ "app.userList.menu.removeConfirmation.label": "Вилучити учаÑника ({0})",
+ "app.userlist.menu.removeConfirmation.desc": "Ðе дозволÑти учаÑникові повторно приєднуватиÑÑ Ð´Ð¾ ÑеанÑу.",
+ "app.userList.menu.muteUserAudio.label": "Вимкнути мікрофон учаÑника",
+ "app.userList.menu.unmuteUserAudio.label": "Увімкнути мікрофон",
"app.userList.userAriaLabel": "{0} {1} {2} Ð¡Ñ‚Ð°Ñ‚ÑƒÑ {3}",
- "app.userList.menu.promoteUser.label": "Підвищити до модератора",
+ "app.userList.menu.promoteUser.label": "Зробити ведучим",
"app.userList.menu.demoteUser.label": "Понизити до глÑдача",
"app.userList.menu.unlockUser.label": "ЗнÑти Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ {0}",
"app.userList.menu.lockUser.label": "Обмежити можливоÑÑ‚Ñ– Ð´Ð»Ñ {0}",
"app.userList.menu.directoryLookup.label": "Пошук у каталозі",
"app.userList.menu.makePresenter.label": "Зробити ведучим",
- "app.userList.userOptions.manageUsersLabel": "Керувати кориÑтувачами",
+ "app.userList.userOptions.manageUsersLabel": "Керувати учаÑниками",
"app.userList.userOptions.muteAllLabel": "Вимкнути мікрофони вÑім",
"app.userList.userOptions.muteAllDesc": "Вимкнути вÑім учаÑникам мікрофони",
"app.userList.userOptions.clearAllLabel": "ЗнÑти вÑÑ– ÑтатуÑи",
"app.userList.userOptions.clearAllDesc": "ЗнÑти ÑтатуÑи уÑÑ–Ñ… учаÑників",
- "app.userList.userOptions.muteAllExceptPresenterLabel": "Вимкнути уÑім мікрофони, окрім модератора",
- "app.userList.userOptions.muteAllExceptPresenterDesc": "Вимикає уÑім учаÑникам мікрофони, окрім модератора",
+ "app.userList.userOptions.muteAllExceptPresenterLabel": "Вимкнути мікрофони уÑім, крім ведучого",
+ "app.userList.userOptions.muteAllExceptPresenterDesc": "Вимикає мікрофони уÑім учаÑникам, крім ведучого",
"app.userList.userOptions.unmuteAllLabel": "Увімкнути мікрофон",
"app.userList.userOptions.unmuteAllDesc": "СкаÑовує Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ð¼Ñ–ÐºÑ€Ð¾Ñ„Ð¾Ð½Ñƒ",
"app.userList.userOptions.lockViewersLabel": "ÐžÐ±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ð¹ учаÑникам",
@@ -100,21 +100,22 @@
"app.userList.userOptions.disablePrivChat": "Приватний чат вимкнено",
"app.userList.userOptions.disablePubChat": "Загальний чат вимкнено",
"app.userList.userOptions.disableNote": "Спільні нотатки тепер заблоковано",
- "app.userList.userOptions.hideUserList": "СпиÑок кориÑтувачів тепер приховано від учаÑників",
- "app.userList.userOptions.webcamsOnlyForModerator": "Вебкамери учаÑників можуть бачити лише модератори (через Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ)",
- "app.userList.content.participants.options.clearedStatus": "СтатуÑи кориÑтувачів знÑто",
+ "app.userList.userOptions.hideUserList": "СпиÑок учаÑників приховано від гоÑтей",
+ "app.userList.userOptions.webcamsOnlyForModerator": "Вебкамери учаÑників можуть бачити лише ведучі (через Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ)",
+ "app.userList.content.participants.options.clearedStatus": "СтатуÑи учаÑників знÑто",
"app.userList.userOptions.enableCam": "Вебкамери учаÑників увімкнено",
"app.userList.userOptions.enableMic": "Мікрофони учаÑників увімкнено",
"app.userList.userOptions.enablePrivChat": "Приватний чат увімкнено",
"app.userList.userOptions.enablePubChat": "Загальний чат увімкнено",
"app.userList.userOptions.enableNote": "Спільні нотатки тепер увімкнено",
- "app.userList.userOptions.showUserList": "СпиÑок кориÑтувачів тепер видимий Ð´Ð»Ñ ÑƒÑ‡Ð°Ñників",
+ "app.userList.userOptions.showUserList": "СпиÑок учаÑників тепер видимий гоÑÑ‚Ñм",
"app.userList.userOptions.enableOnlyModeratorWebcam": "Тепер можна активувати вебкамеру, вÑÑ– бачитимуть ваÑ",
"app.media.label": "Мультимедії",
"app.media.autoplayAlertDesc": "Дозволити доÑтуп",
"app.media.screenshare.start": "ДемонÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ ÐµÐºÑ€Ð°Ð½Ñƒ розпочалаÑÑ",
"app.media.screenshare.end": "ДемонÑтрацію екрану закінчено",
"app.media.screenshare.unavailable": "ДемонÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ ÐµÐºÑ€Ð°Ð½Ñƒ недоÑтупна",
+ "app.media.screenshare.notSupported": "ТранÑлÑÑ†Ñ–Ñ ÐµÐºÑ€Ð°Ð½Ñƒ не підтримуєтьÑÑ Ð¿ÐµÑ€ÐµÐ³Ð»Ñдачем.",
"app.media.screenshare.autoplayBlockedDesc": "Ðам потрібен дозвіл, щоб показати вам екран ведучого.",
"app.media.screenshare.autoplayAllowLabel": "Показати екран, Ñкий демонÑтруєтьÑÑ",
"app.screenshare.notAllowed": "Помилка: Дозвіл на доÑтуп до екрану не було надано.",
@@ -142,9 +143,9 @@
"app.presentation.presentationToolbar.nextSlideDesc": "Перемкнути презентацію на наÑтупний Ñлайд",
"app.presentation.presentationToolbar.skipSlideLabel": "ПропуÑтити Ñлайд",
"app.presentation.presentationToolbar.skipSlideDesc": "Перемкнути презентацію на вказаний Ñлайд",
- "app.presentation.presentationToolbar.fitWidthLabel": "Підігнати по ширині",
+ "app.presentation.presentationToolbar.fitWidthLabel": "По ширині",
"app.presentation.presentationToolbar.fitWidthDesc": "Показати вÑÑŽ ширину Ñлайда",
- "app.presentation.presentationToolbar.fitScreenLabel": "Підігнати до екрана",
+ "app.presentation.presentationToolbar.fitScreenLabel": "За розміром екрану",
"app.presentation.presentationToolbar.fitScreenDesc": "Показати веÑÑŒ Ñлайд",
"app.presentation.presentationToolbar.zoomLabel": "МаÑштаб",
"app.presentation.presentationToolbar.zoomDesc": "Змінити маÑштаб презентації",
@@ -152,20 +153,20 @@
"app.presentation.presentationToolbar.zoomInDesc": "Збільшити презентацію",
"app.presentation.presentationToolbar.zoomOutLabel": "Зменшити",
"app.presentation.presentationToolbar.zoomOutDesc": "Зменшити презентацію",
- "app.presentation.presentationToolbar.zoomReset": "Скинути маÑштаб",
+ "app.presentation.presentationToolbar.zoomReset": "Типово",
"app.presentation.presentationToolbar.zoomIndicator": "Поточне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¼Ð°Ñштабу",
- "app.presentation.presentationToolbar.fitToWidth": "Підігнати по ширині",
- "app.presentation.presentationToolbar.fitToPage": "Підігнати під розмір Ñторінки",
+ "app.presentation.presentationToolbar.fitToWidth": "По ширині",
+ "app.presentation.presentationToolbar.fitToPage": "За розміром Ñторінки",
"app.presentation.presentationToolbar.goToSlide": "Слайд {0}",
"app.presentationUploder.title": "ПрезентаціÑ",
- "app.presentationUploder.message": "Як ведучий ви маєте можливіÑÑ‚ÑŒ завантажувати будь-Ñкий документ або PDF-файл. Ð”Ð»Ñ Ð½Ð°Ð¹ÐºÑ€Ð°Ñ‰Ð¸Ñ… результатів ми рекомендуємо PDF-файл. ПереконайтеÑÑ, що вибрано презентацію - ÑкориÑтайтеÑÑ Ð¿Ñ€Ð°Ð¿Ð¾Ñ€Ñ†ÐµÐ¼, Ñкий розташовано праворуч.",
+ "app.presentationUploder.message": "Ведучий може завантажувати будь-Ñкий документ офіÑного формату, включно PDF. Ми рекомендуємо завантажувати презентації Ñаме у форматі PDF. ПіÑÐ»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ñтавте прапорець навпроти імені файлу, Ñкий ви хочете показати учаÑникам.",
"app.presentationUploder.uploadLabel": "Завантажити",
- "app.presentationUploder.confirmLabel": "Підтвердити",
+ "app.presentationUploder.confirmLabel": "Гаразд",
"app.presentationUploder.confirmDesc": "Зберегти зміни та розпочати презентацію",
"app.presentationUploder.dismissLabel": "СкаÑувати",
"app.presentationUploder.dismissDesc": "Закрити вікно Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñ‚Ð° ÑкаÑувати ваші зміни",
- "app.presentationUploder.dropzoneLabel": "Ð”Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑ‚Ñгніть файли Ñюди",
- "app.presentationUploder.dropzoneImagesLabel": "Ð”Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑ‚Ñгніть Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñюди",
+ "app.presentationUploder.dropzoneLabel": "Ð”Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑ‚Ñгніть Ñюди файли",
+ "app.presentationUploder.dropzoneImagesLabel": "Ð”Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑ‚Ñгніть Ñюди зображеннÑ",
"app.presentationUploder.browseFilesLabel": "або виберіть файл",
"app.presentationUploder.browseImagesLabel": "або виберіть/захопіть зображеннÑ",
"app.presentationUploder.fileToUpload": "Буде завантажено ...",
@@ -184,7 +185,7 @@
"app.presentationUploder.conversion.pageCountExceeded": "Перевищено кількіÑÑ‚ÑŒ Ñторінок. Будь лаÑка, розділіть файл на декілька.",
"app.presentationUploder.conversion.officeDocConversionInvalid": "Ðе вийшло опрацювати документ. Будь лаÑка, завантажте файл у форматі PDF.",
"app.presentationUploder.conversion.officeDocConversionFailed": "Ðе вийшло опрацювати документ. Будь лаÑка, завантажте файл у форматі PDF.",
- "app.presentationUploder.conversion.pdfHasBigPage": "Ми не змогли конвертувати PDF-файл. Будь лаÑка, Ñпробуйте оптимізувати його",
+ "app.presentationUploder.conversion.pdfHasBigPage": "Ðеможливо конвертувати PDF-файл. Будь лаÑка, Ñпробуйте оптимізувати його.",
"app.presentationUploder.conversion.timeout": "Ой, Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð°Ð¹Ð¼Ð°Ñ” надто багато чаÑу",
"app.presentationUploder.conversion.pageCountFailed": "Ðе вийшло визначити кількіÑÑ‚ÑŒ Ñторінок.",
"app.presentationUploder.isDownloadableLabel": "Заборонити Ð·Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€ÐµÐ·ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ—",
@@ -192,16 +193,16 @@
"app.presentationUploder.removePresentationLabel": "Вилучити презентацію",
"app.presentationUploder.setAsCurrentPresentation": "Ð’Ñтановити презентацію поточною",
"app.presentationUploder.tableHeading.filename": "Ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ",
- "app.presentationUploder.tableHeading.options": "Опції",
+ "app.presentationUploder.tableHeading.options": "Параметри",
"app.presentationUploder.tableHeading.status": "СтатуÑ",
"app.poll.pollPaneTitle": "ОпитуваннÑ",
"app.poll.quickPollTitle": "Швидке опитуваннÑ",
"app.poll.hidePollDesc": "Ховає панель меню опитувань",
- "app.poll.customPollInstruction": "Ð”Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ, натиÑніть відповідну кнопку та зазначте ваші питаннÑ.",
+ "app.poll.customPollInstruction": "Ð”Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ»Ð°Ñ†Ð½Ñ–Ñ‚ÑŒ на кнопку нижче, додайте запитаннÑ.",
"app.poll.quickPollInstruction": "Виберіть типовий шаблон опитуваннÑ.",
"app.poll.customPollLabel": "ВлаÑне опитуваннÑ",
"app.poll.startCustomLabel": "Розпочати влаÑне опитуваннÑ",
- "app.poll.activePollInstruction": "Залиште цю панель відкритою, щоб бачити відповіді на Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð² реальному чаÑÑ–. Коли будете готові, оберіть \"Опублікувати результати голоÑуваннÑ\", щоб опублікувати результати Ñ– завершити опитуваннÑ.",
+ "app.poll.activePollInstruction": "Залиште цю панель відкритою, щоб бачити відповіді на Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð² реальному чаÑÑ–. Коли будете готові, оберіть \"Опублікувати результати опитуваннÑ\", щоб зробити результати доÑтупними учаÑникам Ñ– таким чином завершити опитуваннÑ.",
"app.poll.publishLabel": "Опублікувати результати опитуваннÑ",
"app.poll.backLabel": "Ðазад до параметрів опитуваннÑ",
"app.poll.closeLabel": "Закрити",
@@ -209,7 +210,7 @@
"app.poll.ariaInputCount": "ÐžÐ¿Ñ†Ñ–Ñ Ñпеціального Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ {0} з {1}",
"app.poll.customPlaceholder": "Додати варіант опитуваннÑ",
"app.poll.noPresentationSelected": "Ðе вибрано жодної презентації! Виберіть щонайменше одну.",
- "app.poll.clickHereToSelect": "ÐатиÑніть тут, щоб вибрати",
+ "app.poll.clickHereToSelect": "Клацніть тут Ð´Ð»Ñ Ð²Ð¸Ð±Ð¾Ñ€Ñƒ",
"app.poll.t": "Правильно",
"app.poll.f": "Хибно",
"app.poll.tf": "Правильно / хибно",
@@ -229,20 +230,20 @@
"app.poll.answer.c": "Ð’",
"app.poll.answer.d": "Г",
"app.poll.answer.e": "Ò",
- "app.poll.liveResult.usersTitle": "КориÑтувачі",
+ "app.poll.liveResult.usersTitle": "УчаÑники",
"app.poll.liveResult.responsesTitle": "Відповідь",
"app.polling.pollingTitle": "ОпитуваннÑ: оберіть варіант",
"app.polling.pollAnswerLabel": "Результат Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ {0}",
"app.polling.pollAnswerDesc": "Виберіть цей варіант щоб проголоÑувати за {0}",
"app.failedMessage": "Вибачте, проблеми з підключеннÑм до Ñервера.",
- "app.downloadPresentationButton.label": "Скачати оригінал презентації",
+ "app.downloadPresentationButton.label": "Звантажити документ",
"app.connectingMessage": "З'єднаннÑ...",
"app.waitingMessage": "Втрачено з'єднаннÑ. Спроба повторного з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ· {0} Ñекунд...",
"app.retryNow": "Повторити",
- "app.navBar.settingsDropdown.optionsLabel": "Опції",
+ "app.navBar.settingsDropdown.optionsLabel": "Параметри",
"app.navBar.settingsDropdown.fullscreenLabel": "Ðа веÑÑŒ екран",
"app.navBar.settingsDropdown.settingsLabel": "ÐалаштуваннÑ",
- "app.navBar.settingsDropdown.aboutLabel": "Про програму",
+ "app.navBar.settingsDropdown.aboutLabel": "Про заÑтоÑунок",
"app.navBar.settingsDropdown.leaveSessionLabel": "Вийти",
"app.navBar.settingsDropdown.exitFullscreenLabel": "Вийти з повноекранного режиму",
"app.navBar.settingsDropdown.fullscreenDesc": "Розгорнути меню параметрів на веÑÑŒ екран",
@@ -253,11 +254,11 @@
"app.navBar.settingsDropdown.hotkeysLabel": "ГарÑчі клавіші",
"app.navBar.settingsDropdown.hotkeysDesc": "Перелік гарÑчих клавiш",
"app.navBar.settingsDropdown.helpLabel": "Допомога",
- "app.navBar.settingsDropdown.helpDesc": "ПереÑпрÑмовує кориÑтувача до відео з інÑтрукціÑми (нова вкладка)",
+ "app.navBar.settingsDropdown.helpDesc": "ПереÑпрÑмовує учаÑника до відео з інÑтрукціÑми (нова вкладка)",
"app.navBar.settingsDropdown.endMeetingDesc": "Завершити зуÑтріч",
"app.navBar.settingsDropdown.endMeetingLabel": "Завершити зуÑтріч",
- "app.navBar.userListToggleBtnLabel": "Увімкнути/вимкнути ÑпиÑок кориÑтувачів",
- "app.navBar.toggleUserList.ariaLabel": "Перемкнути кориÑтувачів та повідомленнÑ",
+ "app.navBar.userListToggleBtnLabel": "Перемкнути ÑпиÑок учаÑників",
+ "app.navBar.toggleUserList.ariaLabel": "Перемкнути учаÑників та повідомленнÑ",
"app.navBar.toggleUserList.newMessages": "зі ÑповіщеннÑм про нове повідомленнÑ",
"app.navBar.recording": "Цей ÑÐµÐ°Ð½Ñ Ð·Ð°Ð¿Ð¸ÑуєтьÑÑ",
"app.navBar.recording.on": "ЗапиÑуєтьÑÑ",
@@ -269,7 +270,7 @@
"app.endMeeting.description": "Ви точно хочете завершити цю зуÑтріч?",
"app.endMeeting.yesLabel": "Так",
"app.endMeeting.noLabel": "ÐÑ–",
- "app.about.title": "Про програму",
+ "app.about.title": "Про заÑтоÑунок",
"app.about.version": "Збірка клієнта:",
"app.about.copyright": "ÐвторÑьке право:",
"app.about.confirmLabel": "Гаразд",
@@ -287,19 +288,19 @@
"app.screenshare.screenShareLabel" : "ДемонÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ ÐµÐºÑ€Ð°Ð½Ñƒ",
"app.submenu.application.applicationSectionTitle": "ЗаÑтоÑунок",
"app.submenu.application.animationsLabel": "Ефекти",
- "app.submenu.application.audioAlertLabel": "Звукове ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ñ‡Ð°Ñ‚Ñƒ",
+ "app.submenu.application.audioAlertLabel": "Звукове ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð² чаті",
"app.submenu.application.pushAlertLabel": "Виринаючі ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ñ‡Ð°Ñ‚Ñƒ",
- "app.submenu.application.userJoinAudioAlertLabel": "Звукове ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувача",
- "app.submenu.application.userJoinPushAlertLabel": "Виринаючі ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувача",
+ "app.submenu.application.userJoinAudioAlertLabel": "Звукове ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ ÑƒÑ‡Ð°Ñника",
+ "app.submenu.application.userJoinPushAlertLabel": "Виринаючі ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ ÑƒÑ‡Ð°Ñника",
"app.submenu.application.fontSizeControlLabel": "Розмір шрифту",
- "app.submenu.application.increaseFontBtnLabel": "Збільшити шрифт заÑтоÑунку",
- "app.submenu.application.decreaseFontBtnLabel": "Зменшити шрифт заÑтоÑунку",
+ "app.submenu.application.increaseFontBtnLabel": "Збільшити розмір шрифту",
+ "app.submenu.application.decreaseFontBtnLabel": "Зменшити розмір шрифту",
"app.submenu.application.currentSize": "зараз {0}",
"app.submenu.application.languageLabel": "Мова заÑтоÑунку",
"app.submenu.application.languageOptionLabel": "Вибрати мову",
"app.submenu.application.noLocaleOptionLabel": "ВідÑутні переклади",
- "app.submenu.audio.micSourceLabel": "Джерело мікрофона",
- "app.submenu.audio.speakerSourceLabel": "Джерело динаміків",
+ "app.submenu.audio.micSourceLabel": "ПриÑтрій запиÑу",
+ "app.submenu.audio.speakerSourceLabel": "ПриÑтрій відтвореннÑ",
"app.submenu.audio.streamVolumeLabel": "ГучніÑÑ‚ÑŒ звукового потоку",
"app.submenu.video.title": "Відео",
"app.submenu.video.videoSourceLabel": "Джерело відео",
@@ -317,13 +318,13 @@
"app.settings.main.save.label": "Зберегти",
"app.settings.main.save.label.description": "Зберігає зміни та закриває меню налаштувань",
"app.settings.dataSavingTab.label": "Ð—Ð°Ð¾Ñ‰Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ñ‚Ñ€Ð°Ñ„Ñ–ÐºÑƒ",
- "app.settings.dataSavingTab.webcam": "Увімкнути вебкамери",
- "app.settings.dataSavingTab.screenShare": "Увімкнути демонÑтрацію Ñтільниці",
- "app.settings.dataSavingTab.description": "Ð”Ð»Ñ Ð·Ð°Ð¾Ñ‰Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…, будь лаÑка, виберіть функції, Ñкі потрібно відображати на екрані:",
+ "app.settings.dataSavingTab.webcam": "Вебкамери учаÑників",
+ "app.settings.dataSavingTab.screenShare": "ДемонÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ ÐµÐºÑ€Ð°Ð½Ñƒ",
+ "app.settings.dataSavingTab.description": "Ð”Ð»Ñ Ð·Ð°Ð¾Ñ‰Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ñ– даних, будь лаÑка, вимкніть функції, Ñкі пов'Ñзані з демонÑтрацією відео:",
"app.settings.save-notification.label": "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð¾",
- "app.switch.onLabel": "УВІМК.",
- "app.switch.offLabel": "ВИМК.",
- "app.talkingIndicator.ariaMuteDesc" : "ÐатиÑніть, щоб вимкнути мікрофон кориÑтувача",
+ "app.switch.onLabel": "ТÐК",
+ "app.switch.offLabel": "ÐІ",
+ "app.talkingIndicator.ariaMuteDesc" : "ÐатиÑніть, щоб вимкнути мікрофон учаÑника",
"app.talkingIndicator.isTalking" : "{0} говорить",
"app.talkingIndicator.wasTalking" : "{0} закінчив говорити",
"app.actionsBar.actionsDropdown.actionsLabel": "Дії",
@@ -338,17 +339,17 @@
"app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Зупинити демонÑтрацію екрану",
"app.actionsBar.actionsDropdown.pollBtnLabel": "ОпитуваннÑ",
"app.actionsBar.actionsDropdown.pollBtnDesc": "Перемкнути панель опитуваннÑ",
- "app.actionsBar.actionsDropdown.saveUserNames": "Зберегти імена кориÑтувачів",
+ "app.actionsBar.actionsDropdown.saveUserNames": "Зберегти імена учаÑників",
"app.actionsBar.actionsDropdown.createBreakoutRoom": "Створити кімнати Ð´Ð»Ñ ÑƒÑ‡Ð°Ñників",
"app.actionsBar.actionsDropdown.createBreakoutRoomDesc": "Ñтворити кімнати Ñ– розділити учаÑників між ними ",
"app.actionsBar.actionsDropdown.captionsLabel": "Створити приховані Ñубтитри",
"app.actionsBar.actionsDropdown.captionsDesc": "Вмикає панель Ñубтитрів",
"app.actionsBar.actionsDropdown.takePresenter": "Стати презентатором",
"app.actionsBar.actionsDropdown.takePresenterDesc": "Ð’Ñтановити Ñебе ведучим/презентатором",
- "app.actionsBar.emojiMenu.statusTriggerLabel": "Ð’Ñтановити ÑтатуÑ",
+ "app.actionsBar.emojiMenu.statusTriggerLabel": "СтатуÑ",
"app.actionsBar.emojiMenu.awayLabel": "Відійшов",
"app.actionsBar.emojiMenu.awayDesc": "Змінює ваш ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° \"Відійшов\"",
- "app.actionsBar.emojiMenu.raiseHandLabel": "ПіднÑто руку",
+ "app.actionsBar.emojiMenu.raiseHandLabel": "Бажаю говорити",
"app.actionsBar.emojiMenu.raiseHandDesc": "ПіднÑти руку, щоб поÑтавити питаннÑ",
"app.actionsBar.emojiMenu.neutralLabel": "Ðе визначивÑÑ",
"app.actionsBar.emojiMenu.neutralDesc": "Змінює ваш ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° \"Ðе визначивÑÑ\"",
@@ -356,8 +357,8 @@
"app.actionsBar.emojiMenu.confusedDesc": "Змінює ваш ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° \"Збентежений\"",
"app.actionsBar.emojiMenu.sadLabel": "Сумний",
"app.actionsBar.emojiMenu.sadDesc": "Змінює ваш ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° \"Сумний\"",
- "app.actionsBar.emojiMenu.happyLabel": "ЩаÑливий",
- "app.actionsBar.emojiMenu.happyDesc": "Змінює ваш ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° \"ЩаÑливий\"",
+ "app.actionsBar.emojiMenu.happyLabel": "РадіÑний",
+ "app.actionsBar.emojiMenu.happyDesc": "Змінює ваш ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° \"РадіÑний\"",
"app.actionsBar.emojiMenu.noneLabel": "ЗнÑти ÑтатуÑ",
"app.actionsBar.emojiMenu.noneDesc": "Знімає ваш ÑтатуÑ",
"app.actionsBar.emojiMenu.applauseLabel": "ОплеÑки",
@@ -371,7 +372,7 @@
"app.actionsBar.captions.stop": "Зупинити переглÑд Ñубтитрів",
"app.audioNotification.audioFailedError1001": "WebSocket від'єднано (Помилка 1001)",
"app.audioNotification.audioFailedError1002": "Ðе можу Ñтворити WebSocket з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ (Помилка 1002)",
- "app.audioNotification.audioFailedError1003": "ВерÑÑ–Ñ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð° не підтримуєтьÑÑ (Помилка 1003)",
+ "app.audioNotification.audioFailedError1003": "ВерÑÑ–Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñдача не підтримуєтьÑÑ (Помилка 1003)",
"app.audioNotification.audioFailedError1004": "Помилка у виклилику (reason={0}) (Помилка 1004)",
"app.audioNotification.audioFailedError1005": "Виклик неÑподівано ÑкінчивÑÑ (Помилка 1005)",
"app.audioNotification.audioFailedError1006": "Ð§Ð°Ñ Ð²Ð¸ÐºÐ»Ð¸ÐºÐ° закінчивÑÑ (Помилка 1006)",
@@ -384,12 +385,12 @@
"app.audioNotification.audioFailedMessage": "Ðе вдалоÑÑ Ð²Ñтановити голоÑове з'єднаннÑ",
"app.audioNotification.mediaFailedMessage": "Помилка getUserMicMedia, дозволені тільки безпечні джерела",
"app.audioNotification.closeLabel": "Закрити",
- "app.audioNotificaion.reconnectingAsListenOnly": "Звук було заблоковано модератором, Ð²Ð°Ñ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð¾ лише Ñк Ñлухача",
+ "app.audioNotificaion.reconnectingAsListenOnly": "Ведучий вимкнув учаÑникам мікрофон, ви можете приєднатиÑÑ Ð»Ð¸ÑˆÐµ Ñк Ñлухач",
"app.breakoutJoinConfirmation.title": "ПриєднатиÑÑ Ð´Ð¾ зуÑтрічі",
"app.breakoutJoinConfirmation.message": "Чи хочете ви приєднатиÑÑ Ð´Ð¾",
"app.breakoutJoinConfirmation.confirmDesc": "Приєднує Ð²Ð°Ñ Ð´Ð¾ зуÑтрічі",
"app.breakoutJoinConfirmation.dismissLabel": "СкаÑувати",
- "app.breakoutJoinConfirmation.dismissDesc": "Закриває та відмовлÑÑ” в приєднанні до зуÑтрічі",
+ "app.breakoutJoinConfirmation.dismissDesc": "Закрити та відмовити у приєднанні до зуÑтрічі",
"app.breakoutJoinConfirmation.freeJoinMessage": "Виберіть конференцію, до Ñкої бажаєте під’єднатиÑÑ",
"app.breakoutTimeRemainingMessage": "Ð§Ð°Ñ Ð´Ð¾ Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„ÐµÑ€ÐµÐ½Ñ†Ñ–Ñ—: {0}",
"app.breakoutWillCloseMessage": "Ð§Ð°Ñ Ð²Ð¸Ñ‡ÐµÑ€Ð¿Ð°Ð½Ð¾. Конференцію невдовзі буде закрито",
@@ -399,17 +400,17 @@
"app.audioModal.listenOnlyLabel": "Тільки Ñлухати",
"app.audioModal.audioChoiceLabel": "Як ви хочете приєднатиÑÑ Ð´Ð¾ голоÑової конференції?",
"app.audioModal.iOSBrowser": "Звук/відео не підтримуєтьÑÑ",
- "app.audioModal.iOSErrorDescription": "Ðаразі звук та відео у Chrome Ð´Ð»Ñ iOS не підтримуютьÑÑ.",
+ "app.audioModal.iOSErrorDescription": "Поки що звук та відео у Chrome Ð´Ð»Ñ iOS не підтримуютьÑÑ.",
"app.audioModal.iOSErrorRecommendation": "Ми рекомендуємо викориÑтовувати Safari Ð´Ð»Ñ iOS.",
"app.audioModal.audioChoiceDesc": "Виберіть ÑпоÑіб учаÑÑ‚Ñ– у голоÑовій конференції",
- "app.audioModal.unsupportedBrowserLabel": "Схоже, ви викориÑтовуєте браузер, Ñкий повніÑÑ‚ÑŽ не підтримуєтьÑÑ. Ð”Ð»Ñ Ð¿Ð¾Ð²Ð½Ð¾Ñ— підтримки викориÑтовуйте {0} або {1}.",
+ "app.audioModal.unsupportedBrowserLabel": "Схоже, ви викориÑтовуєте переглÑдач, Ñкий повніÑÑ‚ÑŽ не підтримуєтьÑÑ. Ð”Ð»Ñ Ð¿Ð¾Ð²Ð½Ð¾Ñ— підтримки викориÑтовуйте {0} або {1}.",
"app.audioModal.closeLabel": "Закрити",
"app.audioModal.yes": "Так",
- "app.audioModal.no": "ÐÑ–",
+ "app.audioModal.no": "Змінити приÑтрій",
"app.audioModal.yes.arialabel" : "Чутно луну",
"app.audioModal.no.arialabel" : "Луну не чутно",
- "app.audioModal.echoTestTitle": "Перевірка на Ð²Ñ–Ð´Ð»ÑƒÐ½Ð½Ñ Ð³Ð¾Ð»Ð¾Ñу. Промовте кілька Ñлів. Чи чуєте ви Ñебе в динаміках?",
- "app.audioModal.settingsTitle": "Змінити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ",
+ "app.audioModal.echoTestTitle": "Перевірка звукових приÑтроїв.\nБудь лаÑка, Ñкажіть щоÑÑŒ. Чи ви чуєте Ñебе?",
+ "app.audioModal.settingsTitle": "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð²ÑƒÐºÐ¾Ð²Ð¸Ñ… приÑтроїв",
"app.audioModal.helpTitle": "З'ÑвилиÑÑ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¸ з приÑтроÑми Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ",
"app.audioModal.helpText": "Чи ви надали BigBlueButton дозвіл на доÑтуп до мікрофона? Зверніть увагу, що коли ви намагаєтеÑÑ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ голоÑової конференції, має з'ÑвитиÑÑ Ð´Ñ–Ð°Ð»Ð¾Ð³Ð¾Ð²Ðµ вікно, в Ñкому Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ð°ÑŽÑ‚ÑŒ про дозвіл на під'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¼ÐµÐ´Ñ–Ð¹Ð½Ð¸Ñ… приÑтроїв. Будь лаÑка, прийміть це, щоб вÑтановити голоÑовий зв'Ñзок. Якщо цього не відбулоÑÑ Ñпробуйте змінити дозволи мікрофона у налаштуваннÑÑ… вашого переглÑдача.",
"app.audioModal.help.noSSL": "Сторінка незахищена. Щоб дозволити доÑтуп до мікрофона, Ñторінка повинна обÑлуговуватиÑÑ Ñ‡ÐµÑ€ÐµÐ· HTTPS. Будь лаÑка, зв'ÑжітьÑÑ Ð· адмініÑтратором Ñервера.",
@@ -423,11 +424,11 @@
"app.audioDial.tipIndicator": "Підказка",
"app.audioDial.tipMessage": "ÐатиÑніть кнопку '0' на телефоні, щоб вимкнути чи увімкнути мікрофон",
"app.audioModal.connecting": "ПриєднаннÑ",
- "app.audioModal.connectingEchoTest": "Підготовка до перевірки на Ð²Ñ–Ð´Ð»ÑƒÐ½Ð½Ñ Ð³Ð¾Ð»Ð¾Ñу",
+ "app.audioModal.connectingEchoTest": "ÐŸÑ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ перевірки звуку",
"app.audioManager.joinedAudio": "Ви приєдналиÑÑ Ð´Ð¾ голоÑової конференції",
- "app.audioManager.joinedEcho": "Ви приєдналиÑÑ Ð´Ð¾ перевірки на Ð²Ñ–Ð´Ð»ÑƒÐ½Ð½Ñ Ð³Ð¾Ð»Ð¾Ñу",
+ "app.audioManager.joinedEcho": "Зараз відбуватиметьÑÑ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ° звуку",
"app.audioManager.leftAudio": "Ви вийшли з голоÑової конференції",
- "app.audioManager.reconnectingAudio": "Спроба повторно приєднати голоÑ",
+ "app.audioManager.reconnectingAudio": "Спроба повторно приєднати звук",
"app.audioManager.genericError": "Помилка: ЩоÑÑŒ пішло не так, будь лаÑка, Ñпробуйте ще раз",
"app.audioManager.connectionError": "Помилка: ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð½Ðµ вдалоÑÑ",
"app.audioManager.requestTimeout": "Помилка: Ð§Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð²Ð¸Ñ‡ÐµÑ€Ð¿Ð°Ð½Ð¾",
@@ -436,12 +437,12 @@
"app.audio.joinAudio": "ПриєднатиÑÑ Ð´Ð¾ голоÑової конференції ",
"app.audio.leaveAudio": "Вийти",
"app.audio.enterSessionLabel": "ПриєднатиÑÑ Ð´Ð¾ ÑеанÑу",
- "app.audio.playSoundLabel": "Програти звук",
+ "app.audio.playSoundLabel": "Відтворити звук",
"app.audio.backLabel": "Ðазад",
"app.audio.audioSettings.titleLabel": "Виберіть Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ",
- "app.audio.audioSettings.descriptionLabel": "Зверніть увагу, що у вашому переглÑдачі з'ÑвитьÑÑ Ð´Ñ–Ð°Ð»Ð¾Ð³Ð¾Ð²Ðµ вікно Ð´Ð»Ñ Ð½Ð°Ð´Ð°Ð½Ð½Ñ Ð´Ð¾Ð·Ð²Ð¾Ð»Ñƒ на доÑтуп до мікрофона.",
- "app.audio.audioSettings.microphoneSourceLabel": "Джерело мікрофона",
- "app.audio.audioSettings.speakerSourceLabel": "Джерело динаміків",
+ "app.audio.audioSettings.descriptionLabel": "У вашому переглÑдачі з'ÑвитьÑÑ Ð²Ñ–ÐºÐ½Ð¾ із запитом на доÑтуп до мікрофона. Вам потрібно його підтвердити.",
+ "app.audio.audioSettings.microphoneSourceLabel": "ПриÑтрій запиÑу",
+ "app.audio.audioSettings.speakerSourceLabel": "ПриÑтрій відтвореннÑ",
"app.audio.audioSettings.microphoneStreamLabel": "ГучніÑÑ‚ÑŒ вашого звукового потоку",
"app.audio.audioSettings.retryLabel": "Повторити",
"app.audio.listenOnly.backLabel": "Ðазад",
@@ -450,11 +451,11 @@
"app.audio.permissionsOverlay.hint": "Ðам потрібно, щоб ви дозволили викориÑтовувати мультимедійні приÑтрої, щоб приєднатиÑÑŒ до голоÑової конференції :)",
"app.error.removed": "Ð’Ð°Ñ Ð±ÑƒÐ»Ð¾ вилучено з конференції",
"app.error.meeting.ended": "Ви вийшли з конференції",
- "app.meeting.logout.duplicateUserEjectReason": "КориÑтувач з таким же ім'Ñм намагаєтьÑÑ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ зуÑтрічі",
+ "app.meeting.logout.duplicateUserEjectReason": "УчаÑник з таким Ñаме ім'Ñм намагаєтьÑÑ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ зуÑтрічі",
"app.meeting.logout.permissionEjectReason": "Вилучено через Ð¿Ð¾Ñ€ÑƒÑˆÐµÐ½Ð½Ñ Ð´Ð¾Ð·Ð²Ð¾Ð»Ñƒ",
"app.meeting.logout.ejectedFromMeeting": "Ð’Ð°Ñ Ð±ÑƒÐ»Ð¾ вилучено із зуÑтрічі",
"app.meeting.logout.validateTokenFailedEjectReason": "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸ токен авторизації",
- "app.meeting.logout.userInactivityEjectReason": "КориÑтувач неактивний занадто довго",
+ "app.meeting.logout.userInactivityEjectReason": "УчаÑник занадто довго неактивний",
"app.meeting-ended.rating.legendLabel": "Рейтинг відгуків",
"app.meeting-ended.rating.starLabel": "Зірка",
"app.modal.close": "Закрити",
@@ -474,14 +475,14 @@
"app.error.fallback.presentation.description": "Уже увійшли. Спробуйте перезавантажити Ñторінку.",
"app.error.fallback.presentation.reloadButton": "Перезавантажити",
"app.guest.waiting": "ÐžÑ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ ÑÑ…Ð²Ð°Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ",
- "app.userList.guest.waitingUsers": "ÐžÑ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувачів",
- "app.userList.guest.waitingUsersTitle": "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувачами",
- "app.userList.guest.optionTitle": "ПереглÑньте очікуваних кориÑтувачів",
+ "app.userList.guest.waitingUsers": "Очікуємо на учаÑників",
+ "app.userList.guest.waitingUsersTitle": "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÑƒÑ‡Ð°Ñниками",
+ "app.userList.guest.optionTitle": "ПереглÑнути учаÑників, Ñкі очікують",
"app.userList.guest.allowAllAuthenticated": "Дозволити вÑім авторизованим",
"app.userList.guest.allowAllGuests": "Дозволити вÑім гоÑÑ‚Ñм",
"app.userList.guest.allowEveryone": "Дозволити вÑім",
"app.userList.guest.denyEveryone": "Заборонити вÑім",
- "app.userList.guest.pendingUsers": "{0} кориÑтувачів в очікуванні",
+ "app.userList.guest.pendingUsers": "{0} уваÑники в очікуванні",
"app.userList.guest.pendingGuestUsers": "{0} гоÑтей в очікуванні",
"app.userList.guest.pendingGuestAlert": "ПриєднавÑÑ Ð´Ð¾ ÑеанÑу та очікує вашого ÑхваленнÑ",
"app.userList.guest.rememberChoice": "Запам'Ñтати вибір",
@@ -492,9 +493,9 @@
"app.toast.chat.system": "СиÑтема",
"app.toast.clearedEmoji.label": "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð·Ð½Ñто",
"app.toast.setEmoji.label": "{0}",
- "app.toast.meetingMuteOn.label": "Ð’Ñім кориÑтувачам вимкнено мікрофони",
+ "app.toast.meetingMuteOn.label": "Ð’Ñім учаÑникам вимкнено мікрофони",
"app.toast.meetingMuteOff.label": "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¼Ñ–ÐºÑ€Ð¾Ñ„Ð¾Ð½Ñƒ вимкнено",
- "app.notification.recordingStart": "Цей ÑÐµÐ°Ð½Ñ Ð½Ð°Ñ€Ð°Ð·Ñ– запиÑуєтьÑÑ",
+ "app.notification.recordingStart": "Цей ÑÐµÐ°Ð½Ñ Ð·Ð°Ð¿Ð¸ÑуєтьÑÑ",
"app.notification.recordingStop": "Цей ÑÐµÐ°Ð½Ñ Ð½Ðµ запиÑуєтьÑÑ",
"app.notification.recordingPaused": "Цей ÑÐµÐ°Ð½Ñ Ð±Ñ–Ð»ÑŒÑˆÐµ не запиÑуєтьÑÑ",
"app.notification.recordingAriaLabel": "ЗапиÑано чаÑу ",
@@ -504,18 +505,18 @@
"app.shortcut-help.comboLabel": "Комбо",
"app.shortcut-help.functionLabel": "ФункціÑ",
"app.shortcut-help.closeLabel": "Закрити",
- "app.shortcut-help.closeDesc": "Закриває вікно клавіш швидкого доÑтупу",
- "app.shortcut-help.openOptions": "Відкриває налаштуваннÑ",
- "app.shortcut-help.toggleUserList": "Перемикає ÑпиÑок кориÑтувачів",
- "app.shortcut-help.toggleMute": "Перемикає Ñтан мікрофону",
- "app.shortcut-help.togglePublicChat": "Вмикає загальний чат (СпиÑок кориÑтувачів має бути відкритим)",
- "app.shortcut-help.hidePrivateChat": "Приховує приватний чат",
- "app.shortcut-help.closePrivateChat": "Закриває приватний чат",
- "app.shortcut-help.openActions": "Відкриває меню дій",
- "app.shortcut-help.openStatus": "Відкриває меню ÑтатуÑу",
- "app.shortcut-help.togglePan": "Ðктивувати інÑтрумент Ð¿Ð°Ð½Ð¾Ñ€Ð°Ð¼ÑƒÐ²Ð°Ð½Ð½Ñ (Ведучий)",
- "app.shortcut-help.nextSlideDesc": "ÐаÑтупний Ñлайд (Ведучий)",
- "app.shortcut-help.previousSlideDesc": "Попередній Ñлайд (Ведучий)",
+ "app.shortcut-help.closeDesc": "Закрити вікно 'гарÑчих' клавіш",
+ "app.shortcut-help.openOptions": "Відкрити налаштуваннÑ",
+ "app.shortcut-help.toggleUserList": "Перемкнути ÑпиÑок учаÑників",
+ "app.shortcut-help.toggleMute": "Змінити Ñтан мікрофону",
+ "app.shortcut-help.togglePublicChat": "Увімкнути загальний чат (вікно зі ÑпиÑком учаÑників має бути відкрито)",
+ "app.shortcut-help.hidePrivateChat": "Приховати приватний чат",
+ "app.shortcut-help.closePrivateChat": "Закрити приватний чат",
+ "app.shortcut-help.openActions": "Відкрити меню дій",
+ "app.shortcut-help.openStatus": "Відкрити меню ÑтатуÑів",
+ "app.shortcut-help.togglePan": "Ðктивувати Ñпільний доÑтуп до інÑтрументів (ведучий)",
+ "app.shortcut-help.nextSlideDesc": "Перейти на наÑтупний Ñлайд (ведучий)",
+ "app.shortcut-help.previousSlideDesc": "ПовернутиÑÑ Ð´Ð¾ попереднього Ñлайду (ведучий)",
"app.lock-viewers.title": "ÐžÐ±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ð¹ учаÑникам",
"app.lock-viewers.description": "Ці Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑŽÑ‚ÑŒ обмежити учаÑників у доÑтупі до певних функцій",
"app.lock-viewers.featuresLable": "ФункціÑ",
@@ -526,20 +527,20 @@
"app.lock-viewers.PublicChatLabel": "ÐадÑилати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñƒ загальному чаті",
"app.lock-viewers.PrivateChatLable": "ÐадÑилати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñƒ приватному чаті",
"app.lock-viewers.notesLabel": "Редагувати Ñпільні нотатки",
- "app.lock-viewers.userListLabel": "ПереглÑдати учаÑників у ÑпиÑку кориÑтувачів",
- "app.lock-viewers.ariaTitle": "Вікно Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувачів",
+ "app.lock-viewers.userListLabel": "ПереглÑдати учаÑників у ÑпиÑку учаÑників",
+ "app.lock-viewers.ariaTitle": "Вікно Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð³Ð¾Ñтей",
"app.lock-viewers.button.apply": "ЗаÑтоÑувати",
"app.lock-viewers.button.cancel": "СкаÑувати",
"app.lock-viewers.locked": "Обмежено",
"app.lock-viewers.unlocked": "Розблокований",
"app.recording.startTitle": "Почати запиÑ",
- "app.recording.stopTitle": "ПоÑтавити Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° паузу",
+ "app.recording.stopTitle": "Пауза",
"app.recording.resumeTitle": "Відновити запиÑ",
- "app.recording.startDescription": "Ð”Ð»Ñ Ð¿Ð°ÑƒÐ·Ð¸ запиÑу, будь лаÑка, натиÑніть повторно кнопку запиÑу.",
- "app.recording.stopDescription": "Ви впевнені, що хочете призупинити запиÑ? Ви зможете відновити Ð·Ð°Ð¿Ð¸Ñ - Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ ще раз натиÑніть на кнопку запиÑу.",
+ "app.recording.startDescription": "Ð”Ð»Ñ Ð¿Ð°ÑƒÐ·Ð¸ запиÑу клацніть повторно на кнопку запиÑу.",
+ "app.recording.stopDescription": "ДійÑно призупинити запиÑ? Щоб відновити запиÑ, клацніть ще раз на кнопку запиÑу.",
"app.videoPreview.cameraLabel": "Камера",
"app.videoPreview.profileLabel": "ЯкіÑÑ‚ÑŒ",
- "app.videoPreview.cancelLabel": "Відмінити",
+ "app.videoPreview.cancelLabel": "СкаÑувати",
"app.videoPreview.closeLabel": "Закрити",
"app.videoPreview.findingWebcamsLabel": "Пошук вебкамер",
"app.videoPreview.startSharingLabel": "Почати транÑлÑцію",
@@ -564,7 +565,7 @@
"app.video.enable": "Увімкнути",
"app.video.cancel": "СкаÑувати",
"app.video.swapCam": "Змінити",
- "app.video.swapCamDesc": "помінÑти Ñ„Ð¾ÐºÑƒÑ Ð²ÐµÐ±ÐºÐ°Ð¼ÐµÑ€Ð¸",
+ "app.video.swapCamDesc": "змінити Ñ„Ð¾ÐºÑƒÑ Ð²ÐµÐ±ÐºÐ°Ð¼ÐµÑ€Ð¸",
"app.video.videoLocked": "ТранÑлÑцію вебкамери заблоковано",
"app.video.videoButtonDesc": "Увімкнути вебкамеру",
"app.video.videoMenu": "Меню відео",
@@ -626,7 +627,7 @@
"app.whiteboard.toolbar.clear": "Стерти вÑе",
"app.whiteboard.toolbar.multiUserOn": "Увімкнути Ñпільний доÑтуп",
"app.whiteboard.toolbar.multiUserOff": "Вимкнути Ñпільний доÑтуп",
- "app.whiteboard.toolbar.fontSize": "Вибір розміру шрифту",
+ "app.whiteboard.toolbar.fontSize": "Розміру шрифту",
"app.feedback.title": "Ви вийшли з конференції",
"app.feedback.subtitle": "Будь лаÑка, поділітьÑÑ Ð²Ð°ÑˆÐ¸Ð¼ доÑвідом кориÑÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ BigBlueButton (необов'Ñзково)",
"app.feedback.textarea": "Як можна покращити BigBlueButton?",
@@ -640,7 +641,7 @@
"app.videoDock.autoplayAllowLabel": "ПодивитиÑÑ Ð²ÐµÐ±ÐºÐ°Ð¼ÐµÑ€Ð¸",
"app.invitation.title": "Ð—Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ ÑƒÑ‡Ð°Ñників до окремих кімнат",
"app.invitation.confirm": "ЗапроÑити",
- "app.createBreakoutRoom.title": "Розділити учаÑників на кімнати",
+ "app.createBreakoutRoom.title": "Кімнати учаÑників",
"app.createBreakoutRoom.ariaTitle": "Приховати кімнати учаÑників",
"app.createBreakoutRoom.breakoutRoomLabel": "Кімнати учаÑників {0}",
"app.createBreakoutRoom.generatingURL": "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ URL",
@@ -664,9 +665,9 @@
"app.createBreakoutRoom.minusRoomTime": "Зменшити триваліÑÑ‚ÑŒ до",
"app.createBreakoutRoom.addRoomTime": "Збільшити триваліÑÑ‚ÑŒ до",
"app.createBreakoutRoom.addParticipantLabel": "+ Додати учаÑника",
- "app.createBreakoutRoom.freeJoin": "Дозволити кориÑтувачам обирати кімнату ÑамоÑтійно",
- "app.createBreakoutRoom.leastOneWarnBreakout": "Щонайменше один кориÑтувач має бути приÑутнім у кімнаті.",
- "app.createBreakoutRoom.modalDesc": "Примітка: Щоб призначити кориÑтувачів до певної кімнати, будь лаÑка, перетÑгніть їхні імена до комірок кімнат.",
+ "app.createBreakoutRoom.freeJoin": "Дозволити учаÑникам обирати кімнату ÑамоÑтійно",
+ "app.createBreakoutRoom.leastOneWarnBreakout": "Щонайменше один учаÑникам має бути приÑутнім у кімнаті.",
+ "app.createBreakoutRoom.modalDesc": "Примітка: Щоб призначити учаÑників до певної кімнати, будь лаÑка, перетÑгніть їхні імена до комірок кімнат.",
"app.createBreakoutRoom.roomTime": "{0} хвилин",
"app.createBreakoutRoom.numberOfRoomsError": "КількіÑÑ‚ÑŒ кімнат Ñ” неправильною.",
"app.externalVideo.start": "ПоділитиÑÑ Ð½Ð¾Ð²Ð¸Ð¼ відео",
diff --git a/bigbluebutton-html5/private/locales/zh_CN.json b/bigbluebutton-html5/private/locales/zh_CN.json
index 0aff691d3db9e89279b672ee4f54cb6ac72d9911..d503fa7210b9d28157ae04844f4722255af97490 100644
--- a/bigbluebutton-html5/private/locales/zh_CN.json
+++ b/bigbluebutton-html5/private/locales/zh_CN.json
@@ -74,7 +74,7 @@
"app.userList.menu.clearStatus.label": "清除状æ€",
"app.userList.menu.removeUser.label": "踢出去",
"app.userList.menu.removeConfirmation.label": "åˆ é™¤ç”¨æˆ· ({0})",
- "app.userlist.menu.removeConfirmation.desc": "确实è¦åˆ 除æ¤ç”¨æˆ·å—ï¼Ÿä¸€æ—¦åˆ é™¤ï¼Œä»–ä»¬å°†æ— æ³•é‡æ–°åŠ å…¥æ¤ä¼šè¯ã€‚",
+ "app.userlist.menu.removeConfirmation.desc": "阻æ¢æ¤ç”¨æˆ·é‡æ–°åŠ 入会è¯ã€‚",
"app.userList.menu.muteUserAudio.label": "é™éŸ³",
"app.userList.menu.unmuteUserAudio.label": "å–消é™éŸ³",
"app.userList.userAriaLabel": "{0}{1}{2}状æ€{3}",
@@ -115,6 +115,7 @@
"app.media.screenshare.start": "å±å¹•åˆ†äº«å·²å¼€å§‹",
"app.media.screenshare.end": "å±å¹•åˆ†äº«å·²ç»“æŸ",
"app.media.screenshare.unavailable": "å±å¹•åˆ†äº«ä¸å¯ç”¨",
+ "app.media.screenshare.notSupported": "æ¤æµè§ˆå™¨ä¸æ”¯æŒå±å¹•åˆ†äº«ã€‚",
"app.media.screenshare.autoplayBlockedDesc": "我们需è¦æ‚¨çš„许å¯æ‰èƒ½æ˜¾ç¤ºæ¼”示者的å±å¹•ã€‚",
"app.media.screenshare.autoplayAllowLabel": "查看分享å±å¹•",
"app.screenshare.notAllowed": "错误：未授予访问å±å¹•çš„æƒé™ã€‚",
diff --git a/bigbluebutton-html5/private/locales/zh_TW.json b/bigbluebutton-html5/private/locales/zh_TW.json
index b4b82bd88b3fed740f04aded75511c3ebe5a2bb1..52afebc12c44b88e4050ccfcffa11dd269bc1674 100644
--- a/bigbluebutton-html5/private/locales/zh_TW.json
+++ b/bigbluebutton-html5/private/locales/zh_TW.json
@@ -74,7 +74,6 @@
"app.userList.menu.clearStatus.label": "清除狀態",
"app.userList.menu.removeUser.label": "移除用戶",
"app.userList.menu.removeConfirmation.label": "刪除使用者({0})",
- "app.userlist.menu.removeConfirmation.desc": "您確定è¦åˆªé™¤é€™å€‹åƒèˆ‡è€…å—Ž?刪除後他將å†ä¹Ÿä¸èƒ½åŠ å…¥æ¤æœƒè«‡ã€‚",
"app.userList.menu.muteUserAudio.label": "用戶éœéŸ³",
"app.userList.menu.unmuteUserAudio.label": "å–消用戶éœéŸ³",
"app.userList.userAriaLabel": "{0}{1}{2}狀態{3}",
diff --git a/bigbluebutton-html5/server/main.js b/bigbluebutton-html5/server/main.js
index 17a83e32ce0dfbfa66382827f64b81cb64ad03cc..579a7dd0e1e7e33cb10394687f3129c8ebb21fae 100755
--- a/bigbluebutton-html5/server/main.js
+++ b/bigbluebutton-html5/server/main.js
@@ -21,6 +21,7 @@ import '/imports/api/whiteboard-multi-user/server';
import '/imports/api/video-streams/server';
import '/imports/api/network-information/server';
import '/imports/api/users-infos/server';
+import '/imports/api/connection-status/server';
import '/imports/api/note/server';
import '/imports/api/external-videos/server';
import '/imports/api/guest-users/server';
diff --git a/bigbluebutton-html5/tests/puppeteer/.env-template b/bigbluebutton-html5/tests/puppeteer/.env-template
index e98532835edb654077f483fd8dda83cb8612d98d..bdb481f5b5ba8d4c30e22853abc35a91ad52ab9b 100644
--- a/bigbluebutton-html5/tests/puppeteer/.env-template
+++ b/bigbluebutton-html5/tests/puppeteer/.env-template
@@ -3,22 +3,25 @@ BBB_SERVER_URL=""
BBB_SHARED_SECRET=""
# browserless credentials
-BROWSERLESS_ENABLED=false # true/false
-BROWSERLESS_URL= # ip:port
-BROWSERLESS_TOKEN= # token
+BROWSERLESS_ENABLED=false # true/false
+BROWSERLESS_URL= # ip:port
+BROWSERLESS_TOKEN= # token
# collecting metrics
-BBB_COLLECT_METRICS=true # (true/false): true to collect metrics
-METRICS_FOLDER=/tmp/bbb-metrics # the metrics output folder
+BBB_COLLECT_METRICS=true # (true/false): true to collect metrics
+TEST_FOLDER=data # the metrics output folder
+GENERATE_EVIDENCES=true # (true/false): true to generate evidences
+DEBUG=true # (true/false): true to enable console debugging
# webcams test
-LOOP_INTERVAL=1000 # time to loop in the webcams test in milliseconds
+LOOP_INTERVAL=1000 # time to loop in the webcams test in milliseconds
CAMERA_SHARE_FAILED_WAIT_TIME=15000 # this is set by default in the BBB server
# audio test
-IS_AUDIO_TEST=false # (true/false): true if the test will require enabling audio
+IS_AUDIO_TEST=false # (true/false): true if the test will require enabling audio
USER_LIST_VLIST_BOTS_TALKING=1
USER_LIST_VLIST_BOTS_LISTENING=100
-TEST_DURATION_TIME=3600000 # Basic test duration time
\ No newline at end of file
+TEST_DURATION_TIME=3600000 # Basic test duration time
+GENERATE_EVIDENCES=true # (true/false): true means it will generate sceenshots during the test
\ No newline at end of file
diff --git a/bigbluebutton-html5/tests/puppeteer/.gitignore b/bigbluebutton-html5/tests/puppeteer/.gitignore
index a7b53d8b6233012c7691f78b5b8bbd39355deef1..e4eda523df75148ddda58719ba386ccdda25a1ff 100644
--- a/bigbluebutton-html5/tests/puppeteer/.gitignore
+++ b/bigbluebutton-html5/tests/puppeteer/.gitignore
@@ -5,4 +5,5 @@ downloads/*
!downloads/downloads.txt
.directory
.env
-media/*
\ No newline at end of file
+media/*
+data/
diff --git a/bigbluebutton-html5/tests/puppeteer/audio.test.js b/bigbluebutton-html5/tests/puppeteer/audio.test.js
index 1ccdd1b3a08bc051f2ade55f69ca4201b37e8e45..fa0e3c0a991526f704016af6535eba14db0df888 100644
--- a/bigbluebutton-html5/tests/puppeteer/audio.test.js
+++ b/bigbluebutton-html5/tests/puppeteer/audio.test.js
@@ -1,11 +1,16 @@
const Audio = require('./audio/audio');
+const Page = require('./core/page');
describe('Audio', () => {
- test('Join audio', async () => {
+ beforeEach(() => {
+ jest.setTimeout(30000);
+ });
+
+ test('Join audio with Listen Only', async () => {
const test = new Audio();
let response;
try {
- await test.init();
+ await test.init(Page.getArgsWithAudio());
response = await test.test();
} catch (e) {
console.log(e);
@@ -15,12 +20,12 @@ describe('Audio', () => {
expect(response).toBe(true);
});
- test('Mute the other User', async () => {
+ test('Join audio with Microphone', async () => {
const test = new Audio();
let response;
try {
- await test.init();
- response = await test.mute();
+ await test.init(Page.getArgsWithAudio());
+ response = await test.microphone();
} catch (e) {
console.log(e);
} finally {
diff --git a/bigbluebutton-html5/tests/puppeteer/breakout.test.js b/bigbluebutton-html5/tests/puppeteer/breakout.test.js
index b472a00bc0177028a8e2fc85a1acda1f820a0817..4e335bea854da31c38984bed6a5d49065b020135 100644
--- a/bigbluebutton-html5/tests/puppeteer/breakout.test.js
+++ b/bigbluebutton-html5/tests/puppeteer/breakout.test.js
@@ -1,14 +1,93 @@
const Join = require('./breakout/join');
+const Create = require('./breakout/create');
+const Page = require('./core/page');
describe('Breakoutrooms', () => {
+ beforeEach(() => {
+ jest.setTimeout(150000);
+ });
+
+ // Create Breakout Room
+ test('Create Breakout room', async () => {
+ const test = new Create();
+ let response;
+ try {
+ const testName = 'createBreakoutrooms';
+ await test.init(undefined);
+ await test.create(testName);
+ response = await test.testCreatedBreakout(testName);
+ } catch (e) {
+ console.log(e);
+ } finally {
+ await test.close();
+ }
+ expect(response).toBe(true);
+ });
+
+ // Join Breakout Room
test('Join Breakout room', async () => {
const test = new Join();
let response;
try {
- await test.init();
- await test.create();
- await test.join();
- response = await test.test();
+ const testName = 'joinBreakoutroomsWithoutFeatures';
+ await test.init(undefined);
+ await test.create(testName);
+ await test.join(testName);
+ response = await test.testJoined(testName);
+ } catch (e) {
+ console.log(e);
+ } finally {
+ await test.close();
+ }
+ expect(response).toBe(true);
+ });
+
+ // Join Breakout Room with Video
+ test('Join Breakout room with Video', async () => {
+ const test = new Join();
+ let response;
+ try {
+ const testName = 'joinBreakoutroomsWithVideo';
+ await test.init(undefined);
+ await test.create(testName);
+ await test.join(testName);
+ response = await test.testJoined(testName);
+ } catch (e) {
+ console.log(e);
+ } finally {
+ await test.close();
+ }
+ expect(response).toBe(true);
+ });
+
+ // Join Breakout Room and start Screen Share
+ test('Join Breakout room and share screen', async () => {
+ const test = new Join();
+ let response;
+ try {
+ const testName = 'joinBreakoutroomsAndShareScreen';
+ await test.init(undefined);
+ await test.create(testName);
+ await test.join(testName);
+ response = await test.testJoined(testName);
+ } catch (e) {
+ console.log(e);
+ } finally {
+ await test.close();
+ }
+ expect(response).toBe(true);
+ });
+
+ // Join Breakout Room with Audio
+ test('Join Breakout room with Audio', async () => {
+ const test = new Join();
+ let response;
+ try {
+ const testName = 'joinBreakoutroomsWithAudio';
+ await test.init(undefined);
+ await test.create(testName);
+ await test.join(testName);
+ response = await test.testJoined(testName);
} catch (e) {
console.log(e);
} finally {
diff --git a/bigbluebutton-html5/tests/puppeteer/breakout/create.js b/bigbluebutton-html5/tests/puppeteer/breakout/create.js
index 85654805f6ac1e229845d507b965b037c69cbb05..5282281478a96fbdf1b4dd6bad2f034cece3e076 100644
--- a/bigbluebutton-html5/tests/puppeteer/breakout/create.js
+++ b/bigbluebutton-html5/tests/puppeteer/breakout/create.js
@@ -1,6 +1,14 @@
+const moment = require('moment');
+const path = require('path');
const Page = require('../core/page');
const params = require('../params');
const util = require('./util');
+const be = require('./elements'); // breakout elements
+const we = require('../webcam/elements'); // webcam elements
+const ae = require('../audio/elements'); // audio elements
+const e = require('../core/elements'); // page base elements
+// page elements
+const today = moment().format('DD-MM-YYYY');
class Create {
constructor() {
@@ -11,17 +19,146 @@ class Create {
// Join BigBlueButton meeting
async init(meetingId) {
- await this.page1.init(Page.getArgs(), meetingId, { ...params, fullName: 'Moderator1' });
- await this.page2.init(Page.getArgs(), this.page1.meetingId, { ...params, fullName: 'Viewer1', moderatorPW: '' });
+ await this.page1.init(Page.getArgs(), meetingId, { ...params, fullName: 'Moderator1' }, undefined);
+ await this.page2.init(Page.getArgs(), this.page1.meetingId, { ...params, fullName: 'Viewer1', moderatorPW: '' }, undefined);
}
- async create() {
- await util.waitForBreakoutElements(this.page1);
- await util.createBreakoutRooms(this.page1, this.page2);
+ // Create Breakoutrooms
+ async create(testName) {
+ await this.page1.screenshot(`${testName}`, `01-page01-initialized-${testName}`);
+ await this.page2.screenshot(`${testName}`, `01-page02-initialized-${testName}`);
+ this.page1.logger('page01 initialized');
+ this.page2.logger('page02 initialized');
+ await this.page1.page.evaluate(util.clickTestElement, be.manageUsers);
+ await this.page1.page.evaluate(util.clickTestElement, be.createBreakoutRooms);
+ this.page1.logger('page01 breakout rooms menu loaded');
+ await this.page1.screenshot(`${testName}`, `02-page01-creating-breakoutrooms-${testName}`);
+ await this.page1.waitForSelector(be.randomlyAssign);
+ await this.page1.page.evaluate(util.clickTestElement, be.randomlyAssign);
+ this.page1.logger('page01 randomly assigned users');
+ await this.page1.screenshot(`${testName}`, `03-page01-randomly-assign-user-${testName}`);
+ await this.page1.waitForSelector(be.modalConfirmButton);
+ await this.page1.page.evaluate(util.clickTestElement, be.modalConfirmButton);
+ this.page1.logger('page01 breakout rooms creation confirmed');
+ await this.page1.screenshot(`${testName}`, `04-page01-confirm-breakoutrooms-creation-${testName}`);
+ await this.page2.waitForSelector(be.modalConfirmButton);
+ await this.page2.page.evaluate(util.clickTestElement, be.modalConfirmButton);
+ this.page2.logger('page02 breakout rooms join confirmed');
+ await this.page2.screenshot(`${testName}`, `02-page02-accept-invite-breakoutrooms-${testName}`);
+
+ const page2 = await this.page2.browser.pages();
+ this.page2.logger('before closing audio modal');
+ await page2[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/03-breakout-page02-before-closing-audio-modal.png`) });
+ await this.page2.waitForBreakoutElement('button[aria-label="Close Join audio modal"]', 2);
+ await this.page2.clickBreakoutElement('button[aria-label="Close Join audio modal"]', 2);
+ await page2[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/04-breakout-page02-after-closing-audio-modal.png`) });
+ this.page2.logger('audio modal closed');
+ }
+
+ // Check if Breakoutrooms have been created
+ async testCreatedBreakout(testName) {
+ const resp = await this.page1.page.evaluate(() => document.querySelectorAll('div[data-test="breakoutRoomsItem"]').length !== 0);
+ if (resp === true) {
+ await this.page1.screenshot(`${testName}`, `05-page01-success-${testName}`);
+ return true;
+ }
+ await this.page1.screenshot(`${testName}`, `05-page01-fail-${testName}`);
+ return false;
+ }
+
+ // Initialize a Moderator session
+ async joinWithUser3(testName) {
+ if (testName === 'joinBreakoutroomsWithAudio') {
+ await this.page3.init(Page.getArgsWithAudio(), this.page1.meetingId, { ...params, fullName: 'Moderator3' }, undefined);
+ await this.page3.closeAudioModal();
+ await this.page3.waitForSelector(be.breakoutRoomsButton);
+ await this.page3.click(be.breakoutRoomsButton, true);
+ await this.page3.waitForSelector(be.joinRoom1);
+ await this.page3.click(be.joinRoom1, true);
+ await this.page3.waitForSelector(be.alreadyConnected);
+
+ const page3 = await this.page3.browser.pages();
+
+ await page3[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/00-breakout-page03-user-joined-no-mic-before-check-${testName}.png`) });
+ await page3[2].waitForSelector(ae.microphone);
+ await page3[2].click(ae.microphone);
+ await page3[2].waitForSelector(ae.connectingStatus);
+ await page3[2].waitForSelector(ae.audioAudible);
+ await page3[2].click(ae.audioAudible);
+ await page3[2].waitForSelector(e.whiteboard);
+
+ await page3[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/00-breakout-page03-user-joined-with-mic-before-check-${testName}.png`) });
+
+ this.page3.logger('joined breakout with audio');
+ } else if (testName === 'joinBreakoutroomsWithVideo') {
+ await this.page3.init(Page.getArgsWithVideo(), this.page1.meetingId, { ...params, fullName: 'Moderator3' }, undefined);
+ await this.page3.closeAudioModal();
+ await this.page3.waitForSelector(be.breakoutRoomsButton);
+ await this.page3.click(be.breakoutRoomsButton, true);
+ await this.page3.waitForSelector(be.joinRoom1);
+ await this.page3.click(be.joinRoom1, true);
+ await this.page3.waitForSelector(be.alreadyConnected);
+
+ const page3 = await this.page3.browser.pages();
+
+ await page3[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/00-breakout-page03-user-joined-no-webcam-before-check-${testName}.png`) });
+ await page3[2].waitForSelector(e.audioDialog);
+ await page3[2].waitForSelector(e.closeAudio);
+ await page3[2].click(e.closeAudio);
+ await page3[2].waitForSelector(we.joinVideo);
+ await page3[2].click(we.joinVideo);
+ await page3[2].waitForSelector(we.videoPreview);
+ await page3[2].click(we.videoPreview);
+ await page3[2].waitForSelector(we.startSharingWebcam);
+ await page3[2].click(we.startSharingWebcam);
+ await page3[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/00-breakout-page03-user-joined-with-webcam-before-check-${testName}.png`) });
+
+ this.page3.logger('joined breakout with video');
+ } else if (testName === 'joinBreakoutroomsAndShareScreen') {
+ await this.page3.init(Page.getArgs(), this.page1.meetingId, { ...params, fullName: 'Moderator3' }, undefined);
+ await this.page3.closeAudioModal();
+ await this.page3.waitForSelector(be.breakoutRoomsButton);
+ await this.page3.click(be.breakoutRoomsButton, true);
+ await this.page3.waitForSelector(be.joinRoom1);
+ await this.page3.click(be.joinRoom1, true);
+ await this.page3.waitForSelector(be.alreadyConnected);
+ const page3 = await this.page3.browser.pages();
+
+ await page3[2].waitForSelector(e.audioDialog);
+ await page3[2].waitForSelector(e.closeAudio);
+ await page3[2].click(e.closeAudio);
+
+ // Take Presenter
+ await page3[2].waitForSelector('div[data-test="userListItemCurrent"]');
+ await page3[2].click('div[data-test="userListItemCurrent"]');
+ await page3[2].waitForSelector('li[data-test="setPresenter"]');
+ await page3[2].click('li[data-test="setPresenter"]');
+
+ // Start Share Screen
+ await page3[2].waitForSelector('button[aria-label="Share your screen"]');
+ await page3[2].click('button[aria-label="Share your screen"]');
+ await page3[2].on('dialog', async (dialog) => {
+ await dialog.accept();
+ });
+
+ this.page3.logger('joined breakout and started screen share');
+ } else {
+ await this.page3.init(Page.getArgs(), this.page1.meetingId, { ...params, fullName: 'Moderator3' }, undefined);
+ await this.page3.closeAudioModal();
+ await this.page3.waitForSelector(be.breakoutRoomsButton);
+ await this.page3.click(be.breakoutRoomsButton, true);
+ await this.page3.waitForSelector(be.joinRoom1);
+ await this.page3.click(be.joinRoom1, true);
+ await this.page3.waitForSelector(be.alreadyConnected);
+
+ this.page3.logger('joined breakout without use of any feature');
+ }
}
- async joinWithUser2() {
- await this.page3.init(Page.getArgs(), this.page1.meetingId, { ...params, fullName: 'Moderator2' });
+ // Close pages
+ async close() {
+ await this.page1.close();
+ await this.page2.close();
}
}
diff --git a/bigbluebutton-html5/tests/puppeteer/breakout/elements.js b/bigbluebutton-html5/tests/puppeteer/breakout/elements.js
index a008a48949875b321d9ba0750ff4c06c08aee7b4..3d96da32e8e7c445ac74c3b90559dc64eee74c19 100644
--- a/bigbluebutton-html5/tests/puppeteer/breakout/elements.js
+++ b/bigbluebutton-html5/tests/puppeteer/breakout/elements.js
@@ -1,8 +1,12 @@
-exports.manageUsers = '[data-test="manageUsers"]';
+exports.manageUsers = 'button[data-test="manageUsers"]';
exports.createBreakoutRooms = '[data-test="createBreakoutRooms"]';
exports.inviteBreakoutRooms = '[data-test="inviteBreakoutRooms"]';
exports.randomlyAssign = '[data-test="randomlyAssign"]';
exports.modalConfirmButton = '[data-test="modalConfirmButton"]';
exports.breakoutRemainingTime = '[data-test="breakoutRemainingTime"]';
exports.breakoutRoomsItem = '[data-test="breakoutRoomsItem"]';
+exports.alreadyConnected = 'span[class^="alreadyConnected--"]';
exports.breakoutJoin = '[data-test="breakoutJoin"]';
+exports.userJoined = 'div[aria-label^="Moderator3"]';
+exports.breakoutRoomsButton = 'div[aria-label="Breakout Rooms"]';
+exports.joinRoom1 = 'button[aria-label="Join room 1"]';
diff --git a/bigbluebutton-html5/tests/puppeteer/breakout/join.js b/bigbluebutton-html5/tests/puppeteer/breakout/join.js
index ed843500cecc42d3a3e7f8764f251c48e2311a19..39734d17b83fb220b4fd429c54f1cf610a06b54e 100644
--- a/bigbluebutton-html5/tests/puppeteer/breakout/join.js
+++ b/bigbluebutton-html5/tests/puppeteer/breakout/join.js
@@ -1,27 +1,95 @@
+const path = require('path');
+const moment = require('moment');
const Page = require('../core/page');
const Create = require('./create');
const util = require('./util');
const e = require('./elements');
+const pe = require('../core/elements');
+const we = require('../webcam/elements');
+
+const today = moment().format('DD-MM-YYYY');
class Join extends Create {
constructor() {
super('join-breakout');
- this.page3 = new Page();
}
- async join() {
- await this.joinWithUser2();
- await util.joinBreakoutRooms(this.page3);
+ // Join Existing Breakoutrooms
+ async join(testName) {
+ if (testName === 'joinBreakoutroomsWithAudio') {
+ await this.joinWithUser3(testName);
+ } else if (testName === 'joinBreakoutroomsWithVideo') {
+ await this.joinWithUser3(testName);
+ } else if (testName === 'joinBreakoutroomsAndShareScreen') {
+ await this.joinWithUser3(testName);
+ } else {
+ await this.joinWithUser3(testName);
+ }
}
- async test() {
- const n = [(await this.page3.browser.pages()).length - 1];
- const page = (await this.page3.browser.pages())[n];
- const notificationBar = await page.evaluate(util.getTestElement, e.breakoutRemainingTime);
- const response = notificationBar !== null;
- return response;
+ // Check if User Joined in Breakoutrooms
+ async testJoined(testName) {
+ this.page3.logger('Now executing: ', testName);
+ if (testName === 'joinBreakoutroomsWithAudio') {
+ try {
+ this.page3.logger('logged in to breakout with audio');
+
+ const page2 = await this.page2.browser.pages();
+ await page2[2].waitForSelector(pe.isTalking);
+ await page2[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/05-breakout-page02-user-joined-with-audio-before-check-${testName}.png`) });
+ this.page3.logger('before pages check');
+
+ const respTalkingIndicatorElement = await page2[2].evaluate(util.getTestElement, pe.isTalking);
+ const resp = respTalkingIndicatorElement === true;
+
+ await page2[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/06-breakout-page02-user-joined-with-audio-after-check-${testName}.png`) });
+ this.page3.logger('after pages check');
+ return resp;
+ } catch (e) {
+ console.log(e);
+ }
+ } else if (testName === 'joinBreakoutroomsWithVideo') {
+ this.page2.logger('logged in to breakout with video');
+
+ const page2 = await this.page2.browser.pages();
+ await page2[2].waitForSelector(we.videoContainer);
+ await page2[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/05-breakout-page02-user-joined-with-webcam-success-${testName}.png`) });
+ this.page2.logger('before pages check');
+
+ const respWebcamElement = await page2[2].evaluate(util.getTestElement, we.videoContainer);
+ const resp = respWebcamElement === true;
+
+ await page2[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/06-breakout-page02-user-joined-webcam-before-check-${testName}.png`) });
+ this.page2.logger('after pages check');
+ return resp;
+ } else if (testName === 'joinBreakoutroomsAndShareScreen') {
+ this.page2.logger('logged in to breakout with screenshare');
+
+ const page2 = await this.page2.browser.pages();
+ await page2[2].waitForSelector(pe.screenShareVideo);
+ await page2[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/05-breakout-page02-user-joined-webcam-after-check-${testName}.png`) });
+ this.page2.logger('before pages check');
+ const resp = await page2[2].evaluate(async () => {
+ const screenshareContainerElement = await document.querySelectorAll('video[id="screenshareVideo"]').length !== 0;
+ return screenshareContainerElement === true;
+ });
+ await page2[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/06-breakout-page02-user-joined-with-webcam-success-${testName}.png`) });
+ this.page2.logger('after pages check');
+ return resp;
+ } else {
+ const page2 = await this.page2.browser.pages();
+ await page2[2].waitForSelector(e.userJoined);
+ await page2[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/05-breakout-page02-user-joined-before-check-${testName}.png`) });
+ const resp = await page2[2].evaluate(async () => {
+ const foundUserElement = await document.querySelectorAll('div[aria-label^="Moderator3"]').length !== 0;
+ return foundUserElement;
+ });
+ await page2[2].screenshot({ path: path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testName}/screenshots/06-breakout-page02-user-joined-after-check-${testName}.png`) });
+ return resp;
+ }
}
+ // Close pages
async close() {
await this.page1.close();
await this.page2.close();
diff --git a/bigbluebutton-html5/tests/puppeteer/breakout/util.js b/bigbluebutton-html5/tests/puppeteer/breakout/util.js
index 8b42a393822ee7cc514184aba2349381f27a3582..fbc6838505c57e6be50707ea4f74e5f6e3db2af9 100644
--- a/bigbluebutton-html5/tests/puppeteer/breakout/util.js
+++ b/bigbluebutton-html5/tests/puppeteer/breakout/util.js
@@ -2,33 +2,30 @@ const e = require('./elements');
const pe = require('../core/elements');
async function waitForBreakoutElements(page1) {
- await page1.page.waitForSelector(e.manageUsers);
- await page1.page.waitForSelector(e.createBreakoutRooms);
+ await page1.waitForSelector(e.manageUsers);
+ await page1.waitForSelector(e.createBreakoutRooms);
}
async function createBreakoutRooms(page1, page2) {
- await page1.page.click(e.manageUsers);
- await page1.page.click(e.createBreakoutRooms);
- await page1.page.waitForSelector(e.randomlyAssign);
- await page1.page.click(e.randomlyAssign);
- await page1.page.waitForSelector(e.modalConfirmButton);
- await page1.page.click(e.modalConfirmButton);
- await page2.page.waitForSelector(e.modalConfirmButton);
- await page2.page.click(e.modalConfirmButton);
+ await page1.click(e.manageUsers, true);
+ await page1.click(e.createBreakoutRooms, true);
+ await page1.waitForSelector(e.randomlyAssign);
+ await page1.click(e.randomlyAssign, true);
+ await page1.waitForSelector(e.modalConfirmButton);
+ await page1.click(e.modalConfirmButton, true);
+ await page2.waitForSelector(e.modalConfirmButton);
+ await page2.click(e.modalConfirmButton, true);
}
async function getTestElement(element) {
- await document.querySelectorAll(element)[0] !== null;
+ return document.querySelectorAll(element)[0] !== null;
}
-async function joinBreakoutRooms(test) {
- await test.waitForSelector(e.breakoutRoomsItem);
- await test.page.click(e.breakoutRoomsItem, true);
- await test.waitForSelector(e.breakoutJoin);
- await test.page.click(e.breakoutJoin, true);
+async function clickTestElement(element) {
+ await document.querySelectorAll(element)[0].click();
}
exports.getTestElement = getTestElement;
exports.createBreakoutRooms = createBreakoutRooms;
exports.waitForBreakoutElements = waitForBreakoutElements;
-exports.joinBreakoutRooms = joinBreakoutRooms;
+exports.clickTestElement = clickTestElement;
diff --git a/bigbluebutton-html5/tests/puppeteer/chat.test.js b/bigbluebutton-html5/tests/puppeteer/chat.test.js
index 5639ef8e221301e18e35c9347883dfcffe131ac4..67360c2b9299ec548800f2a2720f10a89ebc836f 100644
--- a/bigbluebutton-html5/tests/puppeteer/chat.test.js
+++ b/bigbluebutton-html5/tests/puppeteer/chat.test.js
@@ -6,11 +6,16 @@ const Save = require('./chat/save');
const MultiUsers = require('./user/multiusers');
describe('Chat', () => {
+ beforeEach(() => {
+ jest.setTimeout(30000);
+ });
+
test('Send message', async () => {
const test = new Send();
let response;
try {
await test.init(Page.getArgs());
+ await test.closeAudioModal();
response = await test.test();
} catch (e) {
console.log(e);
@@ -25,6 +30,7 @@ describe('Chat', () => {
let response;
try {
await test.init(Page.getArgs());
+ await test.closeAudioModal();
response = await test.test();
} catch (e) {
console.log(e);
@@ -39,6 +45,7 @@ describe('Chat', () => {
let response;
try {
await test.init(Page.getArgs());
+ await test.closeAudioModal();
response = await test.test();
} catch (e) {
console.log(e);
@@ -53,6 +60,7 @@ describe('Chat', () => {
let response;
try {
await test.init(Page.getArgs());
+ await test.closeAudioModal();
response = await test.test();
} catch (e) {
console.log(e);
@@ -67,11 +75,13 @@ describe('Chat', () => {
let response;
try {
await test.init();
+ await test.page1.closeAudioModal();
+ await test.page2.closeAudioModal();
response = await test.multiUsersPrivateChat();
} catch (e) {
console.log(e);
} finally {
- await test.close();
+ await test.close(test.page1, test.page2);
}
expect(response).toBe(true);
});
@@ -81,11 +91,13 @@ describe('Chat', () => {
let response;
try {
await test.init();
+ await test.page1.closeAudioModal();
+ await test.page2.closeAudioModal();
response = await test.multiUsersPublicChat();
} catch (e) {
console.log(e);
} finally {
- await test.close();
+ await test.close(test.page1, test.page2);
}
expect(response).toBe(true);
});
diff --git a/bigbluebutton-html5/tests/puppeteer/chat/save.js b/bigbluebutton-html5/tests/puppeteer/chat/save.js
index b57aca9333f759d22ce23881c4bf64014d5c3e85..ee3e04f832a4e4e7b86376a0c56713d907aaa3bf 100644
--- a/bigbluebutton-html5/tests/puppeteer/chat/save.js
+++ b/bigbluebutton-html5/tests/puppeteer/chat/save.js
@@ -14,9 +14,10 @@ class Save extends Page {
await this.click(e.chatOptions);
await this.click(e.chatSave, true);
- const clicked = await this.page.addListener('click', () => document.addEventListener('click'));
- return clicked;
+ let clicked = '';
+ clicked = await this.page.addListener('click', () => document.addEventListener('click'));
+ return clicked !== '';
}
}
-module.exports = exports = Save;
\ No newline at end of file
+module.exports = exports = Save;
diff --git a/bigbluebutton-html5/tests/puppeteer/chat/util.js b/bigbluebutton-html5/tests/puppeteer/chat/util.js
index 8c6a37851bdccf552625940e0e82bac82503a660..02ff0a5a783a793116fe0fd3718e032bb80d1f70 100644
--- a/bigbluebutton-html5/tests/puppeteer/chat/util.js
+++ b/bigbluebutton-html5/tests/puppeteer/chat/util.js
@@ -2,9 +2,6 @@ const e = require('./elements');
const ule = require('../user/elements');
async function openChat(test) {
- // TODO: Check this if it's open before click
- // await test.click(ce.userList);
- // await test.click(e.chatButton, true);
await test.waitForSelector(e.chatBox);
await test.waitForSelector(e.chatMessages);
}
diff --git a/bigbluebutton-html5/tests/puppeteer/core/elements.js b/bigbluebutton-html5/tests/puppeteer/core/elements.js
index faed3c80ffdf9a97c77d2bb3d37041e6145983c8..f3df31cf550b9fe1f7d1e5993f6802782ca88664 100644
--- a/bigbluebutton-html5/tests/puppeteer/core/elements.js
+++ b/bigbluebutton-html5/tests/puppeteer/core/elements.js
@@ -15,7 +15,12 @@ exports.actions = 'button[aria-label="Actions"]';
exports.options = 'button[aria-label="Options"]';
exports.userList = 'button[aria-label="Users and Messages Toggle"]';
exports.joinAudio = 'button[aria-label="Join Audio"]';
+exports.connectingStatus = 'div[class^="connecting--"]';
exports.leaveAudio = 'button[aria-label="Leave Audio"]';
exports.videoMenu = 'button[aria-label="Open video menu dropdown"]';
exports.screenShare = 'button[aria-label="Share your screen"]';
-exports.screenShareVideo = '[id="screenshareVideo"]';
+exports.screenShareVideo = 'video[id="screenshareVideo"]';
+exports.logout = 'li[data-test="logout"]';
+exports.meetingEndedModal = 'div[data-test="meetingEndedModal"]';
+exports.rating = 'div[data-test="rating"]';
+exports.whiteboard = 'svg[data-test="whiteboard"]';
diff --git a/bigbluebutton-html5/tests/puppeteer/core/helper.js b/bigbluebutton-html5/tests/puppeteer/core/helper.js
index 275b51ffc071384a17d768b14e2a9f30588d169f..bad2e35972de0472b9219b8541ed3e012cdc7fa7 100644
--- a/bigbluebutton-html5/tests/puppeteer/core/helper.js
+++ b/bigbluebutton-html5/tests/puppeteer/core/helper.js
@@ -15,22 +15,26 @@ function getRandomInt(min, max) {
return Math.floor(Math.random() * (max - min)) + min;
}
-async function createMeeting(params, meetingId) {
+async function createMeeting(params, meetingId, customParameter) {
const meetingID = meetingId || `random-${getRandomInt(1000000, 10000000).toString()}`;
const mp = params.moderatorPW;
const ap = params.attendeePW;
- const query = `name=${meetingID}&meetingID=${meetingID}&attendeePW=${ap}&moderatorPW=${mp}&joinViaHtml5=true`
+ const query = customParameter !== undefined ? `name=${meetingID}&meetingID=${meetingID}&attendeePW=${ap}&moderatorPW=${mp}&joinViaHtml5=true`
+ + `&record=false&allowStartStopRecording=true&${customParameter}&autoStartRecording=false&welcome=${params.welcome}`
+ : `name=${meetingID}&meetingID=${meetingID}&attendeePW=${ap}&moderatorPW=${mp}&joinViaHtml5=true`
+ `&record=false&allowStartStopRecording=true&autoStartRecording=false&welcome=${params.welcome}`;
const apicall = `create${query}${params.secret}`;
const checksum = sha1(apicall);
const url = `${params.server}/create?${query}&checksum=${checksum}`;
+
const response = await axios.get(url, { adapter: http });
return meetingID;
}
-function getJoinURL(meetingID, params, moderator) {
+function getJoinURL(meetingID, params, moderator, customParameter) {
const pw = moderator ? params.moderatorPW : params.attendeePW;
- const query = `fullName=${params.fullName}&joinViaHtml5=true&meetingID=${meetingID}&password=${pw}`;
+ const query = customParameter !== undefined ? `fullName=${params.fullName}&joinViaHtml5=true&meetingID=${meetingID}&password=${pw}&${customParameter}`
+ : `fullName=${params.fullName}&joinViaHtml5=true&meetingID=${meetingID}&password=${pw}`;
const apicall = `join${query}${params.secret}`;
const checksum = sha1(apicall);
const url = `${params.server}/join?${query}&checksum=${checksum}`;
diff --git a/bigbluebutton-html5/tests/puppeteer/core/page.js b/bigbluebutton-html5/tests/puppeteer/core/page.js
index 1d68133fbd44737bc731efdf303d8d6f44d2a824..30d5ab2851c47c432d4b78883ad29de3d788063f 100644
--- a/bigbluebutton-html5/tests/puppeteer/core/page.js
+++ b/bigbluebutton-html5/tests/puppeteer/core/page.js
@@ -1,6 +1,7 @@
require('dotenv').config();
const puppeteer = require('puppeteer');
const fs = require('fs');
+const moment = require('moment');
const path = require('path');
const helper = require('./helper');
const params = require('../params');
@@ -21,7 +22,7 @@ class Page {
}
// Join BigBlueButton meeting
- async init(args, meetingId, newParams) {
+ async init(args, meetingId, newParams, customParameter, testFolderName) {
try {
this.effectiveParams = newParams || params;
const isModerator = this.effectiveParams.moderatorPW;
@@ -39,24 +40,23 @@ class Page {
// this.page.on('console', async msg => console[msg._type](
// ...await Promise.all(msg.args().map(arg => arg.jsonValue()))
// ));
-
+ await this.page.setExtraHTTPHeaders({
+ 'Accept-Language': 'en-US',
+ });
await this.setDownloadBehavior(`${this.parentDir}/downloads`);
- this.meetingId = await helper.createMeeting(params, meetingId);
- const joinURL = helper.getJoinURL(this.meetingId, this.effectiveParams, isModerator);
+ this.meetingId = await helper.createMeeting(params, meetingId, customParameter);
+ const joinURL = helper.getJoinURL(this.meetingId, this.effectiveParams, isModerator, customParameter);
await this.page.goto(joinURL);
const checkForGetMetrics = async () => {
if (process.env.BBB_COLLECT_METRICS === 'true') {
await this.page.waitForSelector('[data-test^="userListItem"]');
- await this.getMetrics();
+ await this.getMetrics(testFolderName);
}
};
- if (process.env.IS_AUDIO_TEST !== 'true') {
- await this.closeAudioModal();
- }
await checkForGetMetrics();
} catch (e) {
- console.log(e);
+ this.logger(e);
}
}
@@ -65,10 +65,27 @@ class Page {
await this.waitForSelector(e.audioDialog);
await this.waitForSelector(e.microphoneButton);
await this.click(e.microphoneButton, true);
+ await this.waitForSelector(e.connectingStatus);
await this.waitForSelector(e.echoYes);
await this.click(e.echoYes, true);
}
+ // Joining audio with microphone
+ async joinMicrophoneWithoutEchoTest() {
+ await this.waitForSelector(e.audioDialog);
+ await this.waitForSelector(e.microphoneButton);
+ await this.click(e.microphoneButton, true);
+ await this.waitForSelector(e.connectingStatus);
+ }
+
+ // Logout from meeting
+ async logoutFromMeeting() {
+ await this.waitForSelector(e.options);
+ await this.click(e.options, true);
+ await this.waitForSelector(e.logout);
+ await this.click(e.logout, true);
+ }
+
// Joining audio with Listen Only mode
async listenOnly() {
await this.waitForSelector(e.audioDialog);
@@ -99,10 +116,24 @@ class Page {
async getTestElements() {
}
+ async waitForBreakoutElement(element, pageNumber) {
+ const pageTarget = await this.browser.pages();
+ await pageTarget[pageNumber].waitForSelector(element, { timeout: 0 });
+ }
+
+ async clickBreakoutElement(element, pageNumber) {
+ const pageTarget = await this.browser.pages();
+ await pageTarget[pageNumber].click(element);
+ }
+
+ async returnElement(element) {
+ return await document.querySelectorAll(element)[0];
+ }
+
// Get the default arguments for creating a page
static getArgs() {
- const args = ['--no-sandbox', '--use-fake-ui-for-media-stream'];
- return { headless: false, args };
+ const args = ['--no-sandbox', '--use-fake-ui-for-media-stream', '--lang=en-US'];
+ return { headless: true, args };
}
static getArgsWithAudio() {
@@ -111,11 +142,10 @@ class Page {
'--no-sandbox',
'--use-fake-ui-for-media-stream',
'--use-fake-device-for-media-stream',
- `--use-file-for-fake-audio-capture=${path.join(__dirname, '../media/audio.wav')}`,
- '--allow-file-access',
+ '--lang=en-US',
];
return {
- headless: false,
+ headless: true,
args,
};
}
@@ -123,9 +153,12 @@ class Page {
'--no-sandbox',
'--use-fake-ui-for-media-stream',
'--use-fake-device-for-media-stream',
+ `--use-file-for-fake-audio-capture=${path.join(__dirname, '../media/audio.wav')}`,
+ '--allow-file-access',
+ '--lang=en-US',
];
return {
- headless: false,
+ headless: true,
args,
};
}
@@ -136,9 +169,10 @@ class Page {
'--no-sandbox',
'--use-fake-ui-for-media-stream',
'--use-fake-device-for-media-stream',
+ '--lang=en-US',
];
return {
- headless: false,
+ headless: true,
args,
};
}
@@ -146,11 +180,12 @@ class Page {
'--no-sandbox',
'--use-fake-ui-for-media-stream',
'--use-fake-device-for-media-stream',
- `--use-file-for-fake-video-capture=${path.join(__dirname, '../media/video.wav')}`,
+ `--use-file-for-fake-video-capture=${path.join(__dirname, '../media/video_rgb.y4m')}`,
'--allow-file-access',
+ '--lang=en-US',
];
return {
- headless: false,
+ headless: true,
args,
};
}
@@ -211,12 +246,35 @@ class Page {
await this.page.type(element, text);
}
- async screenshot(relief = false) {
- if (relief) await helper.sleep(1000);
- const filename = `${this.name}-${this.screenshotIndex}.png`;
- const path = `${this.parentDir}/screenshots/${filename}`;
- await this.page.screenshot({ path });
- this.screenshotIndex++;
+ async screenshot(testFolderName, testFileName, relief = false) {
+ if (process.env.GENERATE_EVIDENCES === 'true') {
+ const today = moment().format('DD-MM-YYYY');
+ const dir = path.join(__dirname, `../${process.env.TEST_FOLDER}`);
+ if (!fs.existsSync(dir)) {
+ fs.mkdirSync(dir);
+ }
+ const testResultsFolder = `${dir}/test-${today}-${testFolderName}`;
+ if (!fs.existsSync(testResultsFolder)) {
+ fs.mkdirSync(testResultsFolder);
+ }
+ const screenshots = `${testResultsFolder}/screenshots`;
+ if (!fs.existsSync(screenshots)) {
+ fs.mkdirSync(screenshots);
+ }
+ if (relief) await helper.sleep(1000);
+ const filename = `${testFileName}.png`;
+ await this.page.screenshot({ path: `${screenshots}/${filename}` });
+ this.screenshotIndex++;
+ }
+ }
+
+ async logger() {
+ if (process.env.DEBUG === 'true') {
+ const date = `${new Date().getDate()}.${new Date().getMonth()}.${new Date().getFullYear()} / ${new Date().getHours()}:${new Date().getMinutes()}:${new Date().getSeconds()}`;
+ const args = Array.prototype.slice.call(arguments);
+ args.unshift(`${date} `);
+ console.log(...args);
+ }
}
async paste(element) {
@@ -230,12 +288,21 @@ class Page {
await this.page.waitForSelector(element, { timeout: 0 });
}
- async getMetrics() {
+ async getMetrics(testFolderName) {
const pageMetricsObj = {};
- const dir = process.env.METRICS_FOLDER;
+ const today = moment().format('DD-MM-YYYY');
+ const dir = path.join(__dirname, `../${process.env.TEST_FOLDER}`);
if (!fs.existsSync(dir)) {
fs.mkdirSync(dir);
}
+ const testExecutionResultsName = `${dir}/test-${today}-${testFolderName}`;
+ if (!fs.existsSync(testExecutionResultsName)) {
+ fs.mkdirSync(testExecutionResultsName);
+ }
+ const metricsFolder = `${testExecutionResultsName}/metrics`;
+ if (!fs.existsSync(metricsFolder)) {
+ fs.mkdirSync(metricsFolder);
+ }
await this.waitForSelector('[data-test^="userListItem"]');
const totalNumberOfUsersMongo = await this.page.evaluate(() => {
const collection = require('/imports/api/users/index.js');
@@ -243,16 +310,17 @@ class Page {
return users;
});
const totalNumberOfUsersDom = await this.page.evaluate(() => document.querySelectorAll('[data-test^="userListItem"]').length);
- console.log({ totalNumberOfUsersDom, totalNumberOfUsersMongo });
+ this.logger({ totalNumberOfUsersDom, totalNumberOfUsersMongo });
const metric = await this.page.metrics();
pageMetricsObj.totalNumberOfUsersMongoObj = totalNumberOfUsersMongo;
pageMetricsObj.totalNumberOfUsersDomObj = totalNumberOfUsersDom;
pageMetricsObj[`metricObj-${this.meetingId}`] = metric;
+ const metricsFile = path.join(__dirname, `../${process.env.TEST_FOLDER}/test-${today}-${testFolderName}/metrics/metrics-${this.effectiveParams.fullName}-${this.meetingId}.json`);
const createFile = () => {
try {
- fs.appendFileSync(`${dir}/metrics-${this.effectiveParams.fullName}-${this.meetingId}.json`, `${JSON.stringify(pageMetricsObj)},\n`);
+ fs.appendFileSync(metricsFile, `${JSON.stringify(pageMetricsObj)},\n`);
} catch (error) {
- console.log(error);
+ this.logger(error);
}
};
createFile();
diff --git a/bigbluebutton-html5/tests/puppeteer/customparameters.test.js b/bigbluebutton-html5/tests/puppeteer/customparameters.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..292a8503852aaacc17794e5b03b0ab1cb3f48c14
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/customparameters.test.js
@@ -0,0 +1,432 @@
+const Page = require('./core/page');
+const CustomParameters = require('./customparameters/customparameters');
+const c = require('./customparameters/constants');
+const util = require('./customparameters/util');
+
+describe('Custom parameters', () => {
+ beforeEach(() => {
+ jest.setTimeout(30000);
+ });
+
+ // This test spec sets the userdata-autoJoin parameter to false
+ // and checks that the users don't get audio modal on login
+ test('Auto join', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'autoJoin';
+ response = await test.autoJoin(testName, Page.getArgs(), undefined, c.autoJoin);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-listenOnlyMode parameter to false
+ // and checks that the users can't see or use listen Only mode
+ test('Listen Only Mode', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'listenOnlyMode';
+ response = await test.listenOnlyMode(testName, Page.getArgsWithAudio(), undefined, c.listenOnlyMode);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.close(test.page1, test.page2);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-forceListenOnly parameter to false
+ // and checks that the Viewers can only use listen only mode
+ test('Force Listen Only', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'forceListenOnly';
+ response = await test.forceListenOnly(testName, Page.getArgsWithAudio(), undefined, c.forceListenOnly);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page2);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-skipCheck parameter to true
+ // and checks that the users automatically skip audio check when clicking on Microphone
+ test('Skip audio check', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'skipCheck';
+ response = await test.skipCheck(testName, Page.getArgsWithAudio(), undefined, c.skipCheck);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-clientTitle parameter to some value
+ // and checks that the meeting window name starts with that value
+ test('Client title', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'clientTitle';
+ response = await test.clientTitle(testName, Page.getArgs(), undefined, c.clientTitle);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-askForFeedbackOnLogout parameter to true
+ // and checks that the users automatically get asked for feedback on logout page
+ test('Ask For Feedback On Logout', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'askForFeedbackOnLogout';
+ response = await test.askForFeedbackOnLogout(testName, Page.getArgs(), undefined, c.askForFeedbackOnLogout);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-displayBrandingArea parameter to true and add a logo link
+ // and checks that the users see the logo displaying in the meeting
+ test('Display Branding Area', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'displayBrandingArea';
+ const parameterWithLogo = `${c.displayBrandingArea}&${c.logo}`;
+ response = await test.displayBrandingArea(testName, Page.getArgs(), undefined, parameterWithLogo);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-shortcuts parameter to one or a list of shortcuts parameters
+ // and checks that the users can use those shortcuts
+ test('Shortcuts', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'shortcuts';
+ response = await test.shortcuts(testName, Page.getArgs(), undefined, encodeURI(c.shortcuts));
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-enableScreensharing parameter to false
+ // and checks that the Moderator can not see the Screen sharing button
+ test('Enable Screensharing', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'enableScreensharing';
+ response = await test.enableScreensharing(testName, Page.getArgs(), undefined, c.enableScreensharing);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-enableVideo parameter to false
+ // and checks that the Moderator can not see the Webcam sharing button
+ test('Enable Webcam', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'enableVideo';
+ response = await test.enableVideo(testName, Page.getArgsWithVideo(), undefined, c.enableVideo);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-autoShareWebcam parameter to true
+ // and checks that the Moderator sees the Webcam Settings Modal automatically at his connection to meeting
+ test('Auto Share Webcam', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'autoShareWebcam';
+ response = await test.autoShareWebcam(testName, Page.getArgsWithVideo(), undefined, c.autoShareWebcam);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-multiUserPenOnly parameter to true
+ // and checks that at multi Users whiteboard other users can see only pencil as drawing tool
+ test('Multi Users Pen Only', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'multiUserPenOnly';
+ response = await test.multiUserPenOnly(testName, Page.getArgs(), undefined, c.multiUserPenOnly);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.close(test.page1, test.page2);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-presenterTools parameter to an interval of parameters
+ // and checks that at multi Users whiteboard Presenter can see only the set tools from the interval
+ test('Presenter Tools', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'presenterTools';
+ response = await test.presenterTools(testName, Page.getArgs(), undefined, encodeURI(c.presenterTools));
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-multiUserTools parameter to an interval of parameters
+ // and checks that at multi Users whiteboard other users can see only the set tools from the interval
+ test('Multi Users Tools', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'multiUserTools';
+ response = await test.multiUserTools(testName, Page.getArgs(), undefined, encodeURI(c.multiUserTools));
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.close(test.page1, test.page2);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-customStyle parameter to an interval of styles
+ // and checks that the meeting displays what was called in the styles interval
+ test('Custom Styles', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'customStyle';
+ response = await test.customStyle(testName, Page.getArgs(), undefined, encodeURIComponent(c.customStyle));
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-customStyleUrl parameter to a styles URL
+ // and checks that the meeting displays what was called in the styles URL
+ test('Custom Styles URL', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'customStyleUrl';
+ response = await test.customStyleUrl(testName, Page.getArgs(), undefined, encodeURI(c.customStyleUrl));
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-autoSwapLayout parameter to true
+ // and checks that at any webcam share, the focus will be on the webcam,
+ // and the presentation gets minimized and the available shared webcam will replace the Presentation
+ test('Auto Swap Layout', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'autoSwapLayout';
+ response = await test.autoSwapLayout(testName, Page.getArgs(), undefined, encodeURI(c.autoSwapLayout));
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-hidePresentation parameter to true
+ // and checks that the Presentation is totally hidden, and its place will be displaying a message
+ test('Hide Presentation', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'hidePresentation';
+ response = await test.hidePresentation(testName, Page.getArgs(), undefined, encodeURI(c.hidePresentation));
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-bannerText parameter to some text
+ // and checks that the meeting has a banner bar containing the same text
+ test('Banner Text', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'bannerText';
+ response = await test.bannerText(testName, Page.getArgs(), undefined, c.bannerText);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-bannerColor parameter to some hex color value
+ // and checks that the meeting has a banner bar containing that color in rgb(r, g, b)
+ test('Banner Color', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'bannerColor';
+ const colorToRGB = util.hexToRgb(c.color);
+ response = await test.bannerColor(testName, Page.getArgs(), undefined, `${c.bannerColor}&${encodeURI(c.bannerText)}`, colorToRGB);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-bbb_show_public_chat_on_login parameter to false
+ // and checks that the users don't see that box by default
+ test('Show Public Chat On Login', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'showPublicChatOnLogin';
+ response = await test.showPublicChatOnLogin(testName, Page.getArgs(), undefined, `${c.showPublicChatOnLogin}`);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.closePage(test.page1);
+ }
+ expect(response).toBe(true);
+ });
+
+ // This test spec sets the userdata-bbb_force_restore_presentation_on_new_events parameter to true
+ // and checks that the viewers get the presentation restored forcefully when the Moderator zooms
+ // in/out the presentation or publishes a poll or adds an annotation
+ test('Force Restore Presentation On New Events', async () => {
+ const test = new CustomParameters();
+ const page = new Page();
+ let response;
+ try {
+ page.logger('before');
+ const testName = 'forceRestorePresentationOnNewEvents';
+ response = await test.forceRestorePresentationOnNewEvents(testName, Page.getArgs(), undefined, `${c.forceRestorePresentationOnNewEvents}`);
+ page.logger('after');
+ } catch (e) {
+ page.logger(e);
+ } finally {
+ await test.close(test.page1, test.page2);
+ }
+ expect(response).toBe(true);
+ });
+});
diff --git a/bigbluebutton-html5/tests/puppeteer/customparameters/constants.js b/bigbluebutton-html5/tests/puppeteer/customparameters/constants.js
new file mode 100644
index 0000000000000000000000000000000000000000..b0bac2a433a96817f67e41cbd39cbd7f8a280fb3
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/customparameters/constants.js
@@ -0,0 +1,28 @@
+exports.autoJoin = 'userdata-bbb_auto_join_audio=false';
+exports.listenOnlyMode = 'userdata-bbb_listen_only_mode=false';
+exports.forceListenOnly = 'userdata-bbb_force_listen_only=true';
+exports.skipCheck = 'userdata-bbb_skip_check_audio=true';
+const docTitle = 'puppeteer';
+exports.docTitle = docTitle;
+exports.clientTitle = `userdata-bbb_client_title=${docTitle}`;
+exports.askForFeedbackOnLogout = 'userdata-bbb_ask_for_feedback_on_logout=true';
+exports.displayBrandingArea = 'userdata-bbb_display_branding_area=true';
+exports.logo = 'logo=https://bigbluebutton.org/wp-content/themes/bigbluebutton/library/images/bigbluebutton-logo.png';
+exports.shortcuts = 'userdata-bbb_shortcuts=["openOptions", "toggleUserList", "toggleMute", "joinAudio", "leaveAudio", "togglePublicChat", "hidePrivateChat", "closePrivateChat", "openActions", "openStatus"]';
+exports.enableScreensharing = 'userdata-bbb_enable_screen_sharing=false';
+exports.enableVideo = 'userdata-bbb_enable_video=false';
+exports.autoShareWebcam = 'userdata-bbb_auto_share_webcam=true';
+exports.multiUserPenOnly = 'userdata-bbb_multi_user_pen_only=true';
+exports.presenterTools = 'userdata-bbb_presenter_tools=["pencil", "hand"]';
+exports.multiUserTools = 'userdata-bbb_multi_user_tools=["pencil", "hand"]';
+exports.customStyle = 'userdata-bbb_custom_style=:root{--loader-bg:#000;}.overlay--1aTlbi{background-color:#000!important;}body{background-color:#000!important;}.presentationTitle--1LT79g{display: none;}.navbar--Z2lHYbG{display:none;}.actionsbar--Z1ant6U{display:none;}';
+exports.customStyleUrl = 'userdata-bbb_custom_style_url=https://bbb22.bbbvm.imdt.com.br/styles.css';
+exports.autoSwapLayout = 'userdata-bbb_auto_swap_layout=true';
+exports.hidePresentation = 'userdata-bbb_hide_presentation=true';
+exports.outsideToggleSelfVoice = 'userdata-bbb_outside_toggle_self_voice=true';
+exports.outsideToggleRecording = 'userdata-bbb_outside_toggle_recording=true';
+exports.showPublicChatOnLogin = 'userdata-bbb_show_public_chat_on_login=false';
+exports.forceRestorePresentationOnNewEvents = 'userdata-bbb_force_restore_presentation_on_new_events=true';
+exports.bannerText = 'bannerText=some text';
+exports.color = '111111';
+exports.bannerColor = `bannerColor=%23${this.color}`;
diff --git a/bigbluebutton-html5/tests/puppeteer/customparameters/customparameters.js b/bigbluebutton-html5/tests/puppeteer/customparameters/customparameters.js
new file mode 100644
index 0000000000000000000000000000000000000000..005cb7e742379d65f9c48a3cacd8214afd5d0ff8
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/customparameters/customparameters.js
@@ -0,0 +1,488 @@
+const path = require('path');
+const Page = require('../core/page');
+const params = require('../params');
+const helper = require('../core/helper');
+const cpe = require('./elements');
+const util = require('./util');
+const c = require('./constants');
+
+class CustomParameters {
+ constructor() {
+ this.page1 = new Page();
+ this.page2 = new Page();
+ this.name = name;
+ this.screenshotIndex = 0;
+ this.parentDir = this.getParentDir(__dirname);
+ }
+
+ getParentDir(dir) {
+ const tmp = dir.split('/');
+ tmp.pop();
+ return tmp.join('/');
+ }
+
+ async autoJoin(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.waitForSelector('div[data-test="chatMessages"]', { timeout: 5000 });
+ if (await this.page1.page.evaluate(util.getTestElement, cpe.audioModal) === false) {
+ await this.page1.screenshot(`${testName}`, `02-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.getTestElement, cpe.audioModal) === true;
+ await this.page1.screenshot(`${testName}`, `02-success-${testName}`);
+ return resp === true;
+ }
+
+ async listenOnlyMode(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-page1-${testName}`);
+ await this.page2.init(args, this.page1.meetingId, { ...params, fullName: 'Attendee', moderatorPW: '' }, customParameter, testName);
+ await this.page2.screenshot(`${testName}`, `01-page2-${testName}`);
+ this.page1.logger('after init');
+ if (await this.page2.page.$('[data-test="audioModalHeader"]')) {
+ await this.page2.screenshot(`${testName}`, `02-fail-${testName}`);
+ return false;
+ }
+ await this.page1.page.waitFor(cpe.echoTestYesButton);
+ await this.page1.screenshot(`${testName}`, `02-success-page1-${testName}`);
+ await this.page2.page.waitFor(cpe.echoTestYesButton);
+ await this.page2.screenshot(`${testName}`, `02-success-page2-${testName}`);
+ const resp1 = await util.listenOnlyMode(this.page1);
+ await this.page1.screenshot(`${testName}`, `03-success-page1-${testName}`);
+ const resp2 = await util.listenOnlyMode(this.page2);
+ await this.page2.screenshot(`${testName}`, `03-success-page2-${testName}`);
+ this.page1.logger({ resp1, resp2 });
+ return resp1 === true && resp2 === true;
+ }
+
+ async forceListenOnly(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page2.init(args, meetingId, { ...params, fullName: 'Attendee', moderatorPW: '' }, customParameter, testName);
+ await this.page2.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ if (await this.page2.page.$('[data-test="audioModalHeader"]')) {
+ await this.page2.screenshot(`${testName}`, `02-fail-${testName}`);
+ return false;
+ }
+ await this.page2.waitForSelector(cpe.audioNotification);
+ await this.page2.screenshot(`${testName}`, `02-success-${testName}`);
+ const resp = await util.forceListenOnly(this.page2);
+ await this.page2.screenshot(`${testName}`, `03-success-${testName}`);
+ this.page1.logger(resp);
+ return resp === true;
+ }
+
+ async skipCheck(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ this.page1.logger('connecting with microphone');
+ await this.page1.joinMicrophoneWithoutEchoTest();
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ await this.page1.elementRemoved('div[class^="connecting--"]');
+ await this.page1.screenshot(`${testName}`, `03-${testName}`);
+ this.page1.logger('before if condition');
+ if (await this.page1.page.evaluate(util.countTestElements, cpe.echoTestYesButton) === true) {
+ await this.page1.screenshot(`${testName}`, `04-fail-${testName}`);
+ this.page1.logger('fail');
+ return false;
+ }
+ this.page1.logger('before skipCheck');
+ const resp = await this.page1.page.evaluate(util.countTestElements, cpe.echoTestYesButton) === false;
+ await this.page1.screenshot(`${testName}`, `04-success-${testName}`);
+ this.page1.logger('after skipCheck');
+ this.page1.logger(resp);
+ return resp === true;
+ }
+
+ async clientTitle(testName, args, meetingId, customParameter) {
+ testName = 'clientTitle';
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.waitForSelector('button[aria-label="Microphone"]');
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ if (await !(await this.page1.page.title()).includes(c.docTitle)) {
+ await this.page1.screenshot(`${testName}`, `03-fail-${testName}`);
+ this.page1.logger('fail');
+ return false;
+ }
+ const resp = await (await this.page1.page.title()).includes(c.docTitle);
+ await this.page1.screenshot(`${testName}`, `03-success-${testName}`);
+ this.page1.logger(resp);
+ return resp === true;
+ }
+
+ async askForFeedbackOnLogout(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ await this.page1.logoutFromMeeting();
+ await this.page1.screenshot(`${testName}`, `03-${testName}`);
+ await this.page1.waitForSelector(cpe.meetingEndedModal);
+ await this.page1.screenshot(`${testName}`, `04-${testName}`);
+ this.page1.logger('audio modal closed');
+ if (await this.page1.page.evaluate(util.countTestElements, cpe.rating) === false) {
+ await this.page1.screenshot(`${testName}`, `05-fail-${testName}`);
+ this.page1.logger('fail');
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.countTestElements, cpe.rating) === true;
+ await this.page1.screenshot(`${testName}`, `05-success-${testName}`);
+ this.page1.logger(resp);
+ return resp === true;
+ }
+
+ async displayBrandingArea(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ this.page1.logger('audio modal closed');
+ await this.page1.waitForSelector('div[data-test="userListContent"]');
+ if (await this.page1.page.evaluate(util.countTestElements, cpe.brandingAreaLogo) === false) {
+ this.page1.logger('fail');
+ await this.page1.screenshot(`${testName}`, `03-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.countTestElements, cpe.brandingAreaLogo) === true;
+ this.page1.logger(resp);
+ await this.page1.screenshot(`${testName}`, `03-success-${testName}`);
+ return resp === true;
+ }
+
+ async shortcuts(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ this.page1.logger('audio modal closed');
+ await this.page1.waitForSelector('button[aria-label="Options"]');
+ await this.page1.page.keyboard.down('Alt');
+ await this.page1.page.keyboard.press('O');
+ if (await this.page1.page.evaluate(util.getTestElement, cpe.verticalListOptions) === false) {
+ this.page1.logger('fail');
+ await this.page1.screenshot(`${testName}`, `03-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.getTestElement, cpe.verticalListOptions) === true;
+ this.page1.logger(resp);
+ await this.page1.screenshot(`${testName}`, `03-success-${testName}`);
+ return resp === true;
+ }
+
+ async enableScreensharing(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator' }, customParameter, testName);
+ await this.page1.closeAudioModal();
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ if (await this.page1.page.evaluate(util.getTestElement, cpe.screenShareButton) === false) {
+ await this.page1.screenshot(`${testName}`, `02-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.getTestElement, cpe.screenShareButton) === true;
+ await this.page1.screenshot(`${testName}`, `02-success-${testName}`);
+ return resp === true;
+ }
+
+ async enableVideo(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator' }, customParameter, testName);
+ await this.page1.closeAudioModal();
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ if (await this.page1.page.evaluate(util.getTestElement, cpe.shareWebcamButton) === false) {
+ await this.page1.screenshot(`${testName}`, `02-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.getTestElement, cpe.shareWebcamButton) === true;
+ await this.page1.screenshot(`${testName}`, `02-success-${testName}`);
+ return resp === true;
+ }
+
+ async autoShareWebcam(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ if (await this.page1.page.evaluate(util.getTestElement, cpe.webcamSettingsModal) === true) {
+ await this.page1.screenshot(`${testName}`, `03-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.getTestElement, cpe.webcamSettingsModal) === false;
+ await this.page1.screenshot(`${testName}`, `03-success-${testName}`);
+ return resp === true;
+ }
+
+ async multiUserPenOnly(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator1' }, customParameter, testName);
+ await this.page2.init(args, this.page1.meetingId, { ...params, fullName: 'Moderator2' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-page1-${testName}`);
+ await this.page2.screenshot(`${testName}`, `01-page2-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page2.closeAudioModal();
+ await this.page1.screenshot(`${testName}`, `02-page1-${testName}`);
+ await this.page2.screenshot(`${testName}`, `02-page2-${testName}`);
+ await this.page1.waitForSelector(cpe.multiUsersWhiteboard);
+ await this.page1.click(cpe.multiUsersWhiteboard, true);
+ await this.page1.screenshot(`${testName}`, `03-page1-${testName}`);
+ await this.page2.waitForSelector(cpe.tools);
+ await this.page2.click(cpe.tools, true);
+ await this.page2.screenshot(`${testName}`, `04-page2-${testName}`);
+ if (await this.page2.page.evaluate(async () => await document.querySelectorAll('[aria-label="Tools"]')[0].parentElement.childElementCount === 2)) {
+ await this.page2.screenshot(`${testName}`, `05-page2-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page2.page.evaluate(async () => await document.querySelectorAll('[aria-label="Tools"]')[0].parentElement.childElementCount === 1);
+ await this.page2.screenshot(`${testName}`, `05-page2-success-${testName}`);
+ return resp === true;
+ }
+
+ async presenterTools(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator1' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ await this.page1.waitForSelector(cpe.tools);
+ await this.page1.click(cpe.tools, true);
+ await this.page1.screenshot(`${testName}`, `03-${testName}`);
+ if (await this.page1.page.evaluate(async () => await document.querySelectorAll('[aria-label="Tools"]')[0].parentElement.querySelector('[class^="toolbarList--"]').childElementCount === 7)) {
+ await this.page1.screenshot(`${testName}`, `04-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(async () => await document.querySelectorAll('[aria-label="Tools"]')[0].parentElement.querySelector('[class^="toolbarList--"]').childElementCount === 2);
+ await this.page1.screenshot(`${testName}`, `04-success-${testName}`);
+ return resp === true;
+ }
+
+ async multiUserTools(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator1' }, customParameter, testName);
+ await this.page2.init(args, this.page1.meetingId, { ...params, fullName: 'Moderator2' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-page1-${testName}`);
+ await this.page2.screenshot(`${testName}`, `01-page2-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page2.closeAudioModal();
+ await this.page1.screenshot(`${testName}`, `02-page1-${testName}`);
+ await this.page2.screenshot(`${testName}`, `02-page2-${testName}`);
+ await this.page1.waitForSelector(cpe.multiUsersWhiteboard);
+ await this.page1.click(cpe.multiUsersWhiteboard, true);
+ await this.page1.screenshot(`${testName}`, `03-page1-${testName}`);
+ await this.page2.waitForSelector(cpe.tools);
+ await this.page2.click(cpe.tools, true);
+ await this.page2.screenshot(`${testName}`, `04-page2-${testName}`);
+ if (await this.page2.page.evaluate(async () => await document.querySelectorAll('[aria-label="Tools"]')[0].parentElement.querySelector('[class^="toolbarList--"]').childElementCount === 7)) {
+ await this.page2.screenshot(`${testName}`, `05-page2-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page2.page.evaluate(async () => await document.querySelectorAll('[aria-label="Tools"]')[0].parentElement.querySelector('[class^="toolbarList--"]').childElementCount === 2);
+ await this.page2.screenshot(`${testName}`, `05-page2-success-${testName}`);
+ return resp === true;
+ }
+
+ async customStyle(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator1' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.waitForSelector(cpe.whiteboard);
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ if (await this.page1.page.evaluate(util.getTestElement, cpe.actions) === false) {
+ await this.page1.screenshot(`${testName}`, `03-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.getTestElement, cpe.actions) === true;
+ await this.page1.screenshot(`${testName}`, `03-success-${testName}`);
+ return resp === true;
+ }
+
+ async customStyleUrl(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator1' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.waitForSelector(cpe.whiteboard);
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ if (await this.page1.page.evaluate(util.getTestElement, cpe.actions) === false) {
+ await this.page1.screenshot(`${testName}`, `03-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.getTestElement, cpe.actions) === true;
+ await this.page1.screenshot(`${testName}`, `03-success-${testName}`);
+ return resp === true;
+ }
+
+ async autoSwapLayout(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator1' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.waitForSelector(cpe.container);
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ if (await this.page1.page.evaluate(util.getTestElement, cpe.restorePresentation) === false) {
+ await this.page1.screenshot(`${testName}`, `03-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.getTestElement, cpe.restorePresentation) === true;
+ await this.page1.screenshot(`${testName}`, `03-success-${testName}`);
+ return resp === true;
+ }
+
+ async hidePresentation(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator1' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.waitForSelector(cpe.actions);
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ if (await this.page1.page.evaluate(util.countTestElements, cpe.defaultContent) === false) {
+ await this.page1.screenshot(`${testName}`, `03-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.countTestElements, cpe.defaultContent) === true;
+ await this.page1.screenshot(`${testName}`, `03-success-${testName}`);
+ return resp === true;
+ }
+
+ async bannerText(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator1' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.waitForSelector(cpe.actions);
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ if (await this.page1.page.evaluate(util.countTestElements, cpe.notificationBar) === false) {
+ await this.page1.screenshot(`${testName}`, `03-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.countTestElements, cpe.notificationBar) === true;
+ await this.page1.screenshot(`${testName}`, `03-success-${testName}`);
+ return resp === true;
+ }
+
+ async bannerColor(testName, args, meetingId, customParameter, colorToRGB) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator1' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.waitForSelector(cpe.notificationBar);
+ await this.page1.screenshot(`${testName}`, `02-${testName}`);
+ const resp = await this.page1.page.evaluate(() => getComputedStyle('div[class^="notificationsBar--"]').backgroundColor);
+ await this.page1.screenshot(`${testName}`, `03-${testName}`);
+ return resp === colorToRGB;
+ }
+
+ async hideAndSwapPresentation(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator1' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.waitForSelector(cpe.container);
+ if (await this.page1.page.evaluate(util.countTestElements, cpe.restorePresentation) === false && await this.page1.page.evaluate(util.countTestElements, cpe.defaultContent) === false) {
+ await this.page1.screenshot(`${testName}`, `03-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.countTestElements, cpe.restorePresentation) === true && await this.page1.page.evaluate(util.countTestElements, cpe.defaultContent) === true;
+ await this.page1.screenshot(`${testName}`, `03-success-${testName}`);
+ return resp === true;
+ }
+
+ async showPublicChatOnLogin(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator1' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.waitForSelector(cpe.container);
+ if (await this.page1.page.evaluate(util.countTestElements, cpe.chat) === true) {
+ await this.page1.screenshot(`${testName}`, `03-fail-${testName}`);
+ return false;
+ }
+ const resp = await this.page1.page.evaluate(util.countTestElements, cpe.chat) === false;
+ await this.page1.screenshot(`${testName}`, `03-success-${testName}`);
+ return resp === true;
+ }
+
+ async forceRestorePresentationOnNewEvents(testName, args, meetingId, customParameter) {
+ this.page1.logger('before init');
+ await this.page1.init(args, meetingId, { ...params, fullName: 'Moderator1' }, customParameter, testName);
+ await this.page2.init(args, this.page1.meetingId, { ...params, fullName: 'Viewer1', moderatorPW: '' }, customParameter, testName);
+ await this.page1.screenshot(`${testName}`, `01-page1-${testName}`);
+ await this.page2.screenshot(`${testName}`, `01-page2-${testName}`);
+ this.page1.logger('after init');
+ await this.page1.closeAudioModal();
+ await this.page1.screenshot(`${testName}`, `02-page1-${testName}`);
+ await this.page2.closeAudioModal();
+ await this.page2.screenshot(`${testName}`, `02-page2-${testName}`);
+ await this.page1.waitForSelector(cpe.container);
+ await this.page2.waitForSelector(cpe.hidePresentation);
+ await this.page2.click(cpe.hidePresentation, true);
+ await this.page2.screenshot(`${testName}`, `03-page2-${testName}`);
+ const zoomInCase = await util.zoomIn(this.page1);
+ await this.page1.screenshot(`${testName}`, `03-page1-${testName}`);
+ await this.page2.screenshot(`${testName}`, `04-page2-${testName}`);
+ const zoomOutCase = await util.zoomOut(this.page1);
+ await this.page1.screenshot(`${testName}`, `03-page1-${testName}`);
+ await this.page2.screenshot(`${testName}`, `04-page2-${testName}`);
+ const pollCase = await util.poll(this.page1);
+ await this.page1.screenshot(`${testName}`, `03-page1-${testName}`);
+ await this.page2.screenshot(`${testName}`, `04-page2-${testName}`);
+ const previousSlideCase = await util.previousSlide(this.page1);
+ await this.page1.screenshot(`${testName}`, `04-page1-${testName}`);
+ await this.page2.screenshot(`${testName}`, `05-page2-${testName}`);
+ const nextSlideCase = await util.nextSlide(this.page1);
+ await this.page1.screenshot(`${testName}`, `05-page1-${testName}`);
+ await this.page2.screenshot(`${testName}`, `06-page2-${testName}`);
+ const annotationCase = await util.annotation(this.page1);
+ await this.page1.screenshot(`${testName}`, `06-page1-${testName}`);
+ await this.page2.screenshot(`${testName}`, `07-page2-${testName}`);
+ if (zoomInCase === true && zoomOutCase === true && pollCase === true && previousSlideCase === true && nextSlideCase === true && annotationCase === true
+ && await this.page2.page.evaluate(util.countTestElements, cpe.restorePresentation) === true) {
+ await this.page2.screenshot(`${testName}`, `08-page2-fail-${testName}`);
+ this.page1.logger('fail');
+ return false;
+ }
+ await this.page2.page.evaluate(util.countTestElements, cpe.restorePresentation) === false;
+ await this.page2.screenshot(`${testName}`, `08-page2-success-${testName}`);
+ return true;
+ }
+
+ async closePage(page) {
+ page.close();
+ }
+
+ async close(page1, page2) {
+ page1.close();
+ page2.close();
+ }
+}
+
+module.exports = exports = CustomParameters;
diff --git a/bigbluebutton-html5/tests/puppeteer/customparameters/elements.js b/bigbluebutton-html5/tests/puppeteer/customparameters/elements.js
new file mode 100644
index 0000000000000000000000000000000000000000..4af8c808fbc11b79de3cc555a7b5ddd822176e0c
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/customparameters/elements.js
@@ -0,0 +1,25 @@
+exports.audioModal = 'div[aria-label="Join audio modal"]';
+exports.audioOverlay = 'div[class^="ReactModal__Overlay"]';
+exports.whiteboard = 'svg[data-test="whiteboard"]';
+exports.echoTestYesButton = 'button[aria-label="Echo is audible"]';
+exports.echoTestNoButton = 'button[aria-label="Echo is inaudible"]';
+exports.audioNotification = 'div[class^="toastContainer--"]';
+exports.options = 'button[aria-label="Options"]';
+exports.logout = 'li[data-test="logout"]';
+exports.meetingEndedModal = 'div[data-test="meetingEndedModal"]';
+exports.rating = 'div[data-test="rating"]';
+exports.brandingAreaLogo = 'div[class^="branding--"]';
+exports.verticalListOptions = 'div[aria-expanded="true"] > div[class^="scrollable--"] > ul[class^="verticalList"]';
+exports.screenShareButton = 'button[aria-label="Share your screen"]';
+exports.shareWebcamButton = 'button[aria-label="Share webcam"]';
+exports.webcamSettingsModal = 'div[aria-label="Webcam settings"]';
+exports.startWebcamSharingConfirm = 'button[aria-label="Start sharing"]';
+exports.multiUsersWhiteboard = 'button[aria-label="Turn multi-user whiteboard on"]';
+exports.tools = 'button[aria-label="Tools"]';
+exports.actions = 'button[aria-label="Actions"]';
+exports.restorePresentation = 'button[aria-label="Restore presentation"]';
+exports.container = 'div[id="container"]';
+exports.defaultContent = 'div[class^="defaultContent--"]';
+exports.notificationBar = 'div[class^="notificationsBar--"]';
+exports.chat = 'section[aria-label="Chat"]';
+exports.hidePresentation = 'button[aria-label="Hide presentation"]';
diff --git a/bigbluebutton-html5/tests/puppeteer/customparameters/util.js b/bigbluebutton-html5/tests/puppeteer/customparameters/util.js
new file mode 100644
index 0000000000000000000000000000000000000000..e1a440da8a7436471950d5580f50d58bb213f128
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/customparameters/util.js
@@ -0,0 +1,170 @@
+const path = require('path');
+
+async function autoJoinTest(test) {
+ const resp = await test.page.evaluate(async () => {
+ const rep = await document.querySelectorAll('div[aria-label="Join audio modal"]').length === 0;
+ return rep !== false;
+ });
+ return resp;
+}
+
+async function listenOnlyMode(test) {
+ try {
+ const resp = await test.page.evaluate(async () => {
+ await document.querySelectorAll('div[class^="connecting--"]')[0];
+ const audibleButton = await document.querySelectorAll('button[aria-label="Echo is audible"]').length !== 0;
+ return audibleButton !== false;
+ });
+ return resp;
+ } catch (e) {
+ console.log(e);
+ }
+}
+
+async function forceListenOnly(test) {
+ try {
+ const resp = await test.page.evaluate(async () => {
+ await document.querySelectorAll('div[class^="connecting--"]')[0];
+ if (await document.querySelectorAll('button[aria-label="Echo is audible"]').length > 0) {
+ return false;
+ }
+ const audibleNotification = await document.querySelectorAll('div[class^="toastContainer--"]')[0].innerText === 'You have joined the audio conference';
+ return audibleNotification !== false;
+ });
+ return resp;
+ } catch (e) {
+ console.log(e);
+ }
+}
+
+async function skipCheck(test) {
+ try {
+ await test.waitForSelector('div[class^="toastContainer--"]');
+ const resp1 = await test.page.evaluate(async () => await document.querySelectorAll('div[class^="toastContainer--"]').length !== 0);
+ await test.waitForSelector('button[aria-label="Mute"]');
+ const resp2 = await test.page.evaluate(async () => await document.querySelectorAll('button[aria-label="Mute"]').length !== 0);
+ return resp1 === true && resp2 === true;
+ } catch (e) {
+ console.log(e);
+ }
+}
+
+async function countTestElements(element) {
+ return document.querySelectorAll(element).length !== 0;
+}
+
+async function getTestElement(element) {
+ return document.querySelectorAll(element).length === 0;
+}
+
+function hexToRgb(hex) {
+ const bigint = parseInt(hex, 16);
+ const r = (bigint >> 16) & 255;
+ const g = (bigint >> 8) & 255;
+ const b = bigint & 255;
+ return `rgb(${r}, ${g}, ${b})`;
+}
+
+async function zoomIn(test) {
+ try {
+ await test.page.evaluate(() => {
+ setInterval(() => {
+ document.querySelector('button[aria-label="Zoom in"]').scrollBy(0, 10);
+ }, 100);
+ });
+ return true;
+ } catch (e) {
+ console.log(e);
+ return false;
+ }
+}
+
+async function zoomOut(test) {
+ try {
+ await test.page.evaluate(() => {
+ setInterval(() => {
+ document.querySelector('button[aria-label="Zoom in"]').scrollBy(10, 0);
+ }, 100);
+ }); return true;
+ } catch (e) {
+ console.log(e);
+ return false;
+ }
+}
+
+async function poll(test) {
+ try {
+ await test.page.evaluate(async () => await document.querySelectorAll('button[aria-label="Actions"]')[0].click());
+ await test.waitForSelector('li[data-test="polling"]');
+ await test.click('li[data-test="polling"]', true);
+ await test.waitForSelector('button[aria-label="Yes / No"]');
+ await test.click('button[aria-label="Yes / No"]', true);
+ await test.waitForSelector('button[aria-label="Publish polling results"]');
+ await test.click('button[aria-label="Publish polling results"]', true);
+ return true;
+ } catch (e) {
+ console.log(e);
+ return false;
+ }
+}
+
+async function previousSlide(test) {
+ try {
+ await test.page.evaluate(() => document.querySelectorAll('button[aria-describedby="prevSlideDesc"]')[0].click());
+ return true;
+ } catch (e) {
+ console.log(e);
+ return false;
+ }
+}
+
+async function nextSlide(test) {
+ try {
+ await test.page.evaluate(() => document.querySelectorAll('button[aria-describedby="nextSlideDesc"]')[0].click());
+ return true;
+ } catch (e) {
+ console.log(e);
+ return false;
+ }
+}
+
+async function annotation(test) {
+ await test.waitForSelector('button[aria-label="Tools"]');
+ await test.click('button[aria-label="Tools"]', true);
+ await test.waitForSelector('button[aria-label="Pencil"]');
+ await test.click('button[aria-label="Pencil"]', true);
+ await test.click('svg[data-test="whiteboard"]', true);
+ const annoted = await test.page.evaluate(async () => await document.querySelectorAll('[data-test="whiteboard"] > g > g')[1].innerHTML !== '');
+ return annoted;
+}
+
+async function presetationUpload(test) {
+ try {
+ await test.waitForSelector('button[aria-label="Actions"]');
+ await test.click('button[aria-label="Actions"]', true);
+ await test.waitForSelector('li[data-test="uploadPresentation"]');
+ await test.click('li[data-test="uploadPresentation"]', true);
+ const elementHandle = await test.page.$('input[type=file]');
+ await elementHandle.uploadFile(path.join(__dirname, '../media/DifferentSizes.pdf'));
+ await test.click('button[aria-label="Confirm "]', true);
+ return true;
+ } catch (e) {
+ console.log(e);
+ return false;
+ }
+}
+
+exports.zoomIn = zoomIn;
+exports.zoomOut = zoomOut;
+exports.poll = poll;
+exports.previousSlide = previousSlide;
+exports.nextSlide = nextSlide;
+exports.annotation = annotation;
+exports.presetationUpload = presetationUpload;
+exports.hexToRgb = hexToRgb;
+exports.getTestElement = getTestElement;
+exports.countTestElements = countTestElements;
+exports.autoJoinTest = autoJoinTest;
+exports.listenOnlyMode = listenOnlyMode;
+exports.forceListenOnly = forceListenOnly;
+exports.skipCheck = skipCheck;
diff --git a/bigbluebutton-html5/tests/puppeteer/jest.config.js b/bigbluebutton-html5/tests/puppeteer/jest.config.js
index 462d7cd2177fd2d0a2c13d1796329ac62446cd51..74bd3ec983ce58cf53c4f9f1f3897e9f15ea2554 100644
--- a/bigbluebutton-html5/tests/puppeteer/jest.config.js
+++ b/bigbluebutton-html5/tests/puppeteer/jest.config.js
@@ -1,4 +1,3 @@
-module.exports =
-{
- setupTestFrameworkScriptFile: './jest.setup.js',
+module.exports = {
+ setupFilesAfterEnv: ['./jest.setup.js'],
};
diff --git a/bigbluebutton-html5/tests/puppeteer/notes/util.js b/bigbluebutton-html5/tests/puppeteer/notes/util.js
index 82754966ed04c7273fdaa64be2f3151c63b1d198..3f1c1137c069ef921542e0d435662e2e95c1905f 100644
--- a/bigbluebutton-html5/tests/puppeteer/notes/util.js
+++ b/bigbluebutton-html5/tests/puppeteer/notes/util.js
@@ -10,7 +10,7 @@ async function startSharedNotes(test) {
}
async function getTestElement(element) {
- const response = document.querySelectorAll(element).length >= 1;
+ const response = await document.querySelectorAll(element).length >= 1;
return response;
}
diff --git a/bigbluebutton-html5/tests/puppeteer/notifications.test.js b/bigbluebutton-html5/tests/puppeteer/notifications.test.js
index 8c60c07bd1a837c362d2c7b08dfa24aa6474e12f..9d55f042c5e784d462460de07de4c453dddb378e 100644
--- a/bigbluebutton-html5/tests/puppeteer/notifications.test.js
+++ b/bigbluebutton-html5/tests/puppeteer/notifications.test.js
@@ -1,18 +1,24 @@
const Notifications = require('./notifications/notifications');
const ShareScreen = require('./screenshare/screenshare');
const Audio = require('./audio/audio');
+const Page = require('./core/page');
describe('Notifications', () => {
+ beforeEach(() => {
+ jest.setTimeout(30000);
+ });
+
test('Save settings notification', async () => {
const test = new Notifications();
let response;
try {
- await test.init();
- response = await test.saveSettingsNotification();
+ const testName = 'saveSettingsNotification';
+ response = await test.saveSettingsNotification(testName);
} catch (e) {
console.log(e);
} finally {
- await test.close();
+ await test.close(test.page1, test.page2);
+ await test.page1.logger('Save Setting notification !');
}
expect(response).toBe(true);
});
@@ -21,12 +27,13 @@ describe('Notifications', () => {
const test = new Notifications();
let response;
try {
- await test.init();
- response = await test.publicChatNotification();
+ const testName = 'publicChatNotification';
+ response = await test.publicChatNotification(testName);
} catch (e) {
console.log(e);
} finally {
- await test.close();
+ await test.close(test.page1, test.page2);
+ await test.page1.logger('Public Chat notification !');
}
expect(response).toBe(true);
});
@@ -35,12 +42,13 @@ describe('Notifications', () => {
const test = new Notifications();
let response;
try {
- await test.init();
- response = await test.privateChatNotification();
+ const testName = 'privateChatNotification';
+ response = await test.privateChatNotification(testName);
} catch (e) {
console.log(e);
} finally {
- await test.close();
+ await test.close(test.page1, test.page2);
+ await test.page1.logger('Private Chat notification !');
}
expect(response).toBe(true);
});
@@ -49,14 +57,13 @@ describe('Notifications', () => {
const test = new Notifications();
let response;
try {
- await test.initUser3();
- await test.userJoinNotification();
- await test.initUser4();
- response = await test.getUserJoinPopupResponse();
+ const testName = 'userJoinNotification';
+ response = await test.getUserJoinPopupResponse(testName);
} catch (e) {
console.log(e);
} finally {
await test.closePages();
+ await test.page1.logger('User join notification !');
}
expect(response).toBe('User4 joined the session');
});
@@ -65,12 +72,13 @@ describe('Notifications', () => {
const test = new Notifications();
let response;
try {
- await test.initUser3();
- response = await test.fileUploaderNotification();
+ const testName = 'uploadPresentationNotification';
+ response = await test.fileUploaderNotification(testName);
} catch (e) {
console.log(e);
} finally {
await test.closePage(test.page3);
+ await test.page3.logger('Presentation upload notification !');
}
expect(response).toContain('Current presentation');
});
@@ -79,44 +87,44 @@ describe('Notifications', () => {
const test = new Notifications();
let response;
try {
- await test.initUser3();
- response = await test.publishPollResults();
+ const testName = 'pollResultsNotification';
+ response = await test.publishPollResults(testName);
} catch (e) {
console.log(e);
} finally {
await test.closePage(test.page3);
+ await test.page3.logger('Poll results notification !');
}
expect(response).toContain('Poll results were published to Public Chat and Whiteboard');
});
test('Screenshare notification', async () => {
- const test = new ShareScreen();
- const page = new Notifications()
+ const page = new Notifications();
let response;
try {
- await page.initUser3();
- response = await test.toast(page.page3);
+ const testName = 'screenShareNotification';
+ response = await page.screenshareToast(testName);
} catch (e) {
console.log(e);
} finally {
await page.closePage(page.page3);
+ await page.page3.logger('Screenshare notification !');
}
expect(response).toBe('Screenshare has started');
});
test('Audio notifications', async () => {
- const test = new Audio();
- const page = new Notifications();
+ const test = new Notifications();
let response;
try {
- process.env.IS_AUDIO_TEST = true;
- await test.initOneUser(page.page3);
- response = await test.audioNotification(page.page3);
+ const testName = 'audioNotification';
+ response = await test.audioNotification(testName);
} catch (e) {
console.log(e);
} finally {
- await page.closePage(page.page3);
+ await test.closePage(test.page3);
+ await test.page3.logger('Audio notification !');
}
- expect(response).toBe('You have joined the audio conference');
- })
+ expect(response).toBe(true);
+ });
});
diff --git a/bigbluebutton-html5/tests/puppeteer/notifications/elements.js b/bigbluebutton-html5/tests/puppeteer/notifications/elements.js
index 1bc0dab8cce6946b237e2192a48196ff94b9b45d..e6ba8f50729a67e9dca69cc389250ccd950c7c05 100644
--- a/bigbluebutton-html5/tests/puppeteer/notifications/elements.js
+++ b/bigbluebutton-html5/tests/puppeteer/notifications/elements.js
@@ -1,6 +1,6 @@
exports.settings = 'li[data-test="settings"]';
exports.settingsModal = 'div[aria-label="Settings"]';
-exports.chatPushAlerts = '[data-test="chatPushAlerts"]';
+exports.chatPushAlerts = 'input[aria-label="Chat Message Popup Alerts"]';
exports.smallToastMsg = 'div[data-test="toastSmallMsg"]';
exports.saveSettings = '[data-test="modalConfirmButton"]';
@@ -11,11 +11,13 @@ exports.userListNotifiedIcon = '[class^=btnWithNotificationDot]';
exports.hasUnreadMessages = 'button[data-test="hasUnreadMessages"]';
exports.modalConfirmButton = 'button[data-test="modalConfirmButton"]';
-exports.userJoinPushAlerts = '[data-test="userJoinPushAlerts"]';
+exports.userJoinPushAlerts = '[aria-label="User Join Popup Alerts"]';
exports.uploadPresentation = '[data-test="uploadPresentation"]';
exports.dropdownContent = '[data-test="dropdownContent"]';
exports.fileUploadDropZone = '[data-test="fileUploadDropZone"]';
-exports.polling = '[data-test="polling"]';
-exports.hidePollDesc = '[data-test="hidePollDesc"]';
-exports.pollBtn = '[data-test="pollBtn"]';
-exports.publishLabel = '[data-test="publishLabel"]';
+exports.polling = 'li[data-test="polling"]';
+exports.pollBtn = 'button[data-test="pollBtn"]';
+exports.hidePollDesc = 'button[data-test="hidePollDesc"]';
+exports.publishLabel = 'button[data-test="publishLabel"]';
+exports.joinAudioToast = 'You have joined the audio conference';
+exports.notificationsTab = 'span[id="notificationTab"]';
diff --git a/bigbluebutton-html5/tests/puppeteer/notifications/notifications.js b/bigbluebutton-html5/tests/puppeteer/notifications/notifications.js
index 9f6fbe5cf9c6be23244a2b3de85089ce5e59ba82..524c78fc1e840ce6891a8078ec0c7c548b3da419 100644
--- a/bigbluebutton-html5/tests/puppeteer/notifications/notifications.js
+++ b/bigbluebutton-html5/tests/puppeteer/notifications/notifications.js
@@ -1,7 +1,9 @@
+const path = require('path');
const MultiUsers = require('../user/multiusers');
const Page = require('../core/page');
const params = require('../params');
const util = require('./util');
+const utilScreenShare = require('../screenshare/util'); // utils imported from screenshare folder
const ne = require('./elements');
const we = require('../whiteboard/elements');
@@ -15,12 +17,14 @@ class Notifications extends MultiUsers {
}
async init(meetingId) {
- await this.page1.init(Page.getArgs(), meetingId, { ...params });
+ await this.page1.init(Page.getArgs(), meetingId, { ...params, fullName: 'User1' });
+ await this.page1.closeAudioModal();
await this.page2.init(Page.getArgs(), this.page1.meetingId, { ...params, fullName: 'User2' });
+ await this.page2.closeAudioModal();
}
- async initUser3(meetingId) {
- await this.page3.init(Page.getArgs(), meetingId, { ...params, fullName: 'User3' });
+ async initUser3(arg, meetingId) {
+ await this.page3.init(arg, meetingId, { ...params, fullName: 'User3' });
}
async initUser4() {
@@ -28,70 +32,136 @@ class Notifications extends MultiUsers {
}
// Save Settings toast notification
- async saveSettingsNotification() {
+ async saveSettingsNotification(testName) {
+ await this.init(undefined);
+ await this.page1.screenshot(`${testName}`, `01-page01-initialized-${testName}`);
await util.popupMenu(this.page1);
+ await this.page1.screenshot(`${testName}`, `02-page01-popupMenu-${testName}`);
await util.saveSettings(this.page1);
+ await this.page1.screenshot(`${testName}`, `03-page01-save-settings-${testName}`);
const resp = await util.getLastToastValue(this.page1) === ne.savedSettingsToast;
- return resp;
+ await this.page1.screenshot(`${testName}`, `04-page01-saved-Settings-toast-${testName}`);
+ return resp === true;
}
// Public chat toast notification
- async publicChatNotification() {
+ async publicChatNotification(testName) {
+ await this.init(undefined);
+ await this.page1.screenshot(`${testName}`, `01-page01-initialized-${testName}`);
await util.popupMenu(this.page1);
+ await this.page1.screenshot(`${testName}`, `02-page01-popup-menu-${testName}`);
await util.enableChatPopup(this.page1);
+ await this.page1.screenshot(`${testName}`, `03-page01-setting-popup-option-${testName}`);
await util.saveSettings(this.page1);
+ await this.page1.screenshot(`${testName}`, `04-page01-applied-settings-${testName}`);
const expectedToastValue = await util.publicChatMessageToast(this.page1, this.page2);
+ await this.page1.screenshot(`${testName}`, `05-page01-public-chat-message-sent-${testName}`);
await this.page1.waitForSelector(ne.smallToastMsg);
await this.page1.waitForSelector(ne.hasUnreadMessages);
const lastToast = await util.getOtherToastValue(this.page1);
+ await this.page1.screenshot(`${testName}`, `06-page01-public-chat-toast-${testName}`);
return expectedToastValue === lastToast;
}
// Private chat toast notification
- async privateChatNotification() {
+ async privateChatNotification(testName) {
+ await this.init(undefined);
+ await this.page1.screenshot(`${testName}`, `01-page01-initialized-${testName}`);
await util.popupMenu(this.page1);
+ await this.page1.screenshot(`${testName}`, `02-page01-popup-menu-${testName}`);
await util.enableChatPopup(this.page1);
+ await this.page1.screenshot(`${testName}`, `03-page01-setting-popup-option-${testName}`);
await util.saveSettings(this.page1);
+ await this.page1.screenshot(`${testName}`, `04-page01-applied-settings-${testName}`);
const expectedToastValue = await util.privateChatMessageToast(this.page2);
+ await this.page1.screenshot(`${testName}`, `05-page01-private-chat-message-sent-${testName}`);
await this.page1.waitForSelector(ne.smallToastMsg);
await this.page1.waitForSelector(ne.hasUnreadMessages);
const lastToast = await util.getOtherToastValue(this.page1);
+ await this.page1.screenshot(`${testName}`, `06-page01-public-chat-toast-${testName}`);
return expectedToastValue === lastToast;
}
// User join toast notification
- async userJoinNotification() {
- await util.popupMenu(this.page3);
- await util.enableUserJoinPopup(this.page3);
- await util.saveSettings(this.page3);
+ async userJoinNotification(page) {
+ await util.popupMenu(page);
+ await util.enableUserJoinPopup(page);
+ await util.saveSettings(page);
}
- async getUserJoinPopupResponse() {
+ async getUserJoinPopupResponse(testName) {
+ await this.initUser3(Page.getArgs(), undefined);
+ await this.page3.screenshot(`${testName}`, `01-page03-initialized-${testName}`);
+ await this.page3.closeAudioModal();
+ await this.page3.screenshot(`${testName}`, `02-page03-audio-modal-closed-${testName}`);
+ await this.userJoinNotification(this.page3);
+ await this.page3.screenshot(`${testName}`, `03-page03-after-user-join-notification-activation-${testName}`);
+ await this.initUser4(undefined);
+ await this.page4.closeAudioModal();
await this.page3.waitForSelector(ne.smallToastMsg);
const response = await util.getOtherToastValue(this.page3);
+ await this.page3.screenshot(`${testName}`, `04-page03-user-join-toast-${testName}`);
return response;
}
// File upload notification
- async fileUploaderNotification() {
+ async fileUploaderNotification(testName) {
+ await this.initUser3(Page.getArgs(), undefined);
+ await this.page3.screenshot(`${testName}`, `01-page03-initialized-${testName}`);
+ await this.page3.closeAudioModal();
+ await this.page3.screenshot(`${testName}`, `02-page03-audio-modal-closed-${testName}`);
await util.uploadFileMenu(this.page3);
+ await this.page3.screenshot(`${testName}`, `03-page03-upload-file-menu-${testName}`);
await this.page3.waitForSelector(ne.fileUploadDropZone);
const inputUploadHandle = await this.page3.page.$('input[type=file]');
- await inputUploadHandle.uploadFile(process.env.PDF_FILE);
+ await inputUploadHandle.uploadFile(path.join(__dirname, '../media/DifferentSizes.pdf'));
await this.page3.page.evaluate(util.clickTestElement, ne.modalConfirmButton);
- const resp = await util.getLastToastValue(this.page3);
+ await this.page3.screenshot(`${testName}`, `04-page03-file-uploaded-and-ready-${testName}`);
+ await this.page3.waitForSelector(ne.smallToastMsg);
await this.page3.waitForSelector(we.whiteboard);
+ await this.page3.screenshot(`${testName}`, `05-page03-presentation-changed-${testName}`);
+ const resp = await util.getLastToastValue(this.page3);
+ await this.page3.screenshot(`${testName}`, `06-page03-presentation-change-toast-${testName}`);
return resp;
}
- async publishPollResults() {
+ // Publish Poll Results notification
+ async publishPollResults(testName) {
+ await this.initUser3(Page.getArgs(), undefined);
+ await this.page3.screenshot(`${testName}`, `01-page03-initialized-${testName}`);
+ await this.page3.closeAudioModal();
+ await this.page3.screenshot(`${testName}`, `02-page03-audio-modal-closed-${testName}`);
await this.page3.waitForSelector(we.whiteboard);
await util.startPoll(this.page3);
+ await this.page3.screenshot(`${testName}`, `03-page03-started-poll-${testName}`);
await this.page3.waitForSelector(ne.smallToastMsg);
const resp = await util.getLastToastValue(this.page3);
+ await this.page3.screenshot(`${testName}`, `04-page03-poll-toast-${testName}`);
return resp;
}
+ async audioNotification(testName) {
+ await this.initUser3(Page.getArgsWithAudio(), undefined);
+ await this.page3.screenshot(`${testName}`, `01-page03-initialized-${testName}`);
+ await this.page3.joinMicrophone();
+ await this.page3.screenshot(`${testName}`, `02-page03-joined-microphone-${testName}`);
+ const resp = await util.getLastToastValue(this.page3) === ne.joinAudioToast;
+ await this.page3.screenshot(`${testName}`, `03-page03-audio-toast-${testName}`);
+ return resp === true;
+ }
+
+ async screenshareToast(testName) {
+ await this.initUser3(Page.getArgs(), undefined);
+ await this.page3.screenshot(`${testName}`, `01-page03-initialized-${testName}`);
+ await this.page3.closeAudioModal();
+ await this.page3.screenshot(`${testName}`, `02-page03-audio-modal-closed-${testName}`);
+ await utilScreenShare.startScreenshare(this.page3);
+ await this.page3.screenshot(`${testName}`, `03-page03-screenshare-started-${testName}`);
+ const response = await util.getLastToastValue(this.page3);
+ await this.page3.screenshot(`${testName}`, `04-page03-screenshare-toast-${testName}`);
+ return response;
+ }
+
async closePages() {
await this.page3.close();
await this.page4.close();
diff --git a/bigbluebutton-html5/tests/puppeteer/notifications/util.js b/bigbluebutton-html5/tests/puppeteer/notifications/util.js
index 5178e93c4c6b073de60c545b1fcc484c2f47f806..b2db20ec23ccce823707eabb49ed26ceff06b596 100644
--- a/bigbluebutton-html5/tests/puppeteer/notifications/util.js
+++ b/bigbluebutton-html5/tests/puppeteer/notifications/util.js
@@ -7,19 +7,23 @@ async function clickTestElement(element) {
await document.querySelectorAll(element)[0].click();
}
-async function popupMenu(page) {
- await page.page.evaluate(clickTestElement, e.options);
- await page.page.evaluate(clickTestElement, ne.settings);
+async function popupMenu(test) {
+ await test.page.evaluate(clickTestElement, e.options);
+ await test.page.evaluate(clickTestElement, ne.settings);
}
async function enableChatPopup(test) {
+ await test.waitForSelector(ne.notificationsTab);
+ await test.page.evaluate(clickTestElement, ne.notificationsTab);
await test.waitForSelector(ne.chatPushAlerts);
- await test.page.evaluate(() => document.querySelector('[data-test="chatPushAlerts"]').children[0].click());
+ await test.page.evaluate(clickTestElement, ne.chatPushAlerts);
}
async function enableUserJoinPopup(test) {
+ await test.waitForSelector(ne.notificationsTab);
+ await test.page.evaluate(clickTestElement, ne.notificationsTab);
await test.waitForSelector(ne.userJoinPushAlerts);
- await test.page.evaluate(() => document.querySelector('[data-test="userJoinPushAlerts"]').children[0].click());
+ await test.page.evaluate(clickTestElement, ne.userJoinPushAlerts);
}
async function saveSettings(page) {
@@ -35,8 +39,8 @@ async function waitForToast(test) {
async function getLastToastValue(test) {
await test.waitForSelector(ne.smallToastMsg);
- const toast = test.page.evaluate(() => {
- const lastToast = document.querySelectorAll('[data-test="toastSmallMsg"]')[0].innerText;
+ const toast = test.page.evaluate(async () => {
+ const lastToast = await document.querySelectorAll('div[data-test="toastSmallMsg"]')[0].innerText;
return lastToast;
});
return toast;
@@ -44,8 +48,8 @@ async function getLastToastValue(test) {
async function getOtherToastValue(test) {
await test.waitForSelector(ne.smallToastMsg);
- const toast = test.page.evaluate(() => {
- const lastToast = document.querySelectorAll('[data-test="toastSmallMsg"]')[1].innerText;
+ const toast = test.page.evaluate(async () => {
+ const lastToast = await document.querySelectorAll('div[data-test="toastSmallMsg"]')[1].innerText;
return lastToast;
});
return toast;
@@ -93,19 +97,14 @@ async function getFileItemStatus(element, value) {
document.querySelectorAll(element)[1].innerText.includes(value);
}
-async function clickRandomPollOption(element) {
- document.querySelector(element).click();
-}
-
async function startPoll(test) {
await test.page.evaluate(clickOnElement, ne.dropdownContent);
await test.page.evaluate(clickOnElement, ne.polling);
await test.waitForSelector(ne.hidePollDesc);
await test.waitForSelector(ne.pollBtn);
- await test.page.evaluate(clickRandomPollOption, ne.pollBtn);
+ await test.page.evaluate(clickOnElement, ne.pollBtn);
await test.waitForSelector(ne.publishLabel);
await test.page.evaluate(clickOnElement, ne.publishLabel);
- await test.waitForSelector(ne.smallToastMsg);
}
exports.getFileItemStatus = getFileItemStatus;
diff --git a/bigbluebutton-html5/tests/puppeteer/package-lock.json b/bigbluebutton-html5/tests/puppeteer/package-lock.json
new file mode 100644
index 0000000000000000000000000000000000000000..363ad501167a4383d5ea91f9e50de4c570bdd3c8
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/package-lock.json
@@ -0,0 +1,4674 @@
+{
+ "requires": true,
+ "lockfileVersion": 1,
+ "dependencies": {
+ "@babel/code-frame": {
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+ "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+ "requires": {
+ "@babel/highlight": "^7.10.4"
+ }
+ },
+ "@babel/helper-validator-identifier": {
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+ "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="
+ },
+ "@babel/highlight": {
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+ "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.10.4",
+ "chalk": "^2.0.0",
+ "js-tokens": "^4.0.0"
+ },
+ "dependencies": {
+ "js-tokens": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+ }
+ }
+ },
+ "abab": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
+ "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="
+ },
+ "acorn": {
+ "version": "5.7.4",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+ "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
+ },
+ "acorn-globals": {
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
+ "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
+ "requires": {
+ "acorn": "^6.0.1",
+ "acorn-walk": "^6.0.1"
+ },
+ "dependencies": {
+ "acorn": {
+ "version": "6.4.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+ "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
+ }
+ }
+ },
+ "acorn-walk": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
+ "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="
+ },
+ "agent-base": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+ "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+ "requires": {
+ "es6-promisify": "^5.0.0"
+ }
+ },
+ "ajv": {
+ "version": "6.12.3",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+ "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+ "requires": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ }
+ },
+ "ansi-escapes": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+ "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+ },
+ "ansi-regex": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "anymatch": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+ "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+ "requires": {
+ "micromatch": "^3.1.4",
+ "normalize-path": "^2.1.1"
+ },
+ "dependencies": {
+ "arr-diff": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+ "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+ },
+ "array-unique": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+ },
+ "braces": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+ "requires": {
+ "arr-flatten": "^1.1.0",
+ "array-unique": "^0.3.2",
+ "extend-shallow": "^2.0.1",
+ "fill-range": "^4.0.0",
+ "isobject": "^3.0.1",
+ "repeat-element": "^1.1.2",
+ "snapdragon": "^0.8.1",
+ "snapdragon-node": "^2.0.1",
+ "split-string": "^3.0.2",
+ "to-regex": "^3.0.1"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "expand-brackets": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+ "requires": {
+ "debug": "^2.3.3",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "posix-character-classes": "^0.1.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "requires": {
+ "is-descriptor": "^0.1.0"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "is-data-descriptor": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "requires": {
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
+ }
+ },
+ "kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+ }
+ }
+ },
+ "extglob": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+ "requires": {
+ "array-unique": "^0.3.2",
+ "define-property": "^1.0.0",
+ "expand-brackets": "^2.1.4",
+ "extend-shallow": "^2.0.1",
+ "fragment-cache": "^0.2.1",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "requires": {
+ "is-descriptor": "^1.0.0"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "fill-range": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+ "requires": {
+ "extend-shallow": "^2.0.1",
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1",
+ "to-regex-range": "^2.1.0"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-buffer": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "requires": {
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+ }
+ },
+ "is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ },
+ "kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+ },
+ "micromatch": {
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+ "requires": {
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "braces": "^2.3.1",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "extglob": "^2.0.4",
+ "fragment-cache": "^0.2.1",
+ "kind-of": "^6.0.2",
+ "nanomatch": "^1.2.9",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.2"
+ }
+ }
+ }
+ },
+ "append-transform": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
+ "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
+ "requires": {
+ "default-require-extensions": "^1.0.0"
+ }
+ },
+ "argparse": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+ "requires": {
+ "sprintf-js": "~1.0.2"
+ }
+ },
+ "arr-diff": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+ "requires": {
+ "arr-flatten": "^1.0.1"
+ }
+ },
+ "arr-flatten": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+ "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
+ },
+ "arr-union": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
+ },
+ "array-equal": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+ "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
+ },
+ "array-unique": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+ "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
+ },
+ "arrify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+ },
+ "asn1": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+ "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+ "requires": {
+ "safer-buffer": "~2.1.0"
+ }
+ },
+ "assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+ },
+ "assign-symbols": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
+ },
+ "astral-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
+ },
+ "async": {
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+ "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+ "requires": {
+ "lodash": "^4.17.14"
+ }
+ },
+ "async-limiter": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+ "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
+ },
+ "asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+ },
+ "atob": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+ },
+ "aws-sign2": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+ },
+ "aws4": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
+ "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="
+ },
+ "axios": {
+ "version": "0.18.1",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz",
+ "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
+ "requires": {
+ "follow-redirects": "1.5.10",
+ "is-buffer": "^2.0.2"
+ }
+ },
+ "babel-code-frame": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+ "requires": {
+ "chalk": "^1.1.3",
+ "esutils": "^2.0.2",
+ "js-tokens": "^3.0.2"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+ },
+ "chalk": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+ "requires": {
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+ "requires": {
+ "ansi-regex": "^2.0.0"
+ }
+ },
+ "supports-color": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+ }
+ }
+ },
+ "babel-core": {
+ "version": "6.26.3",
+ "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+ "requires": {
+ "babel-code-frame": "^6.26.0",
+ "babel-generator": "^6.26.0",
+ "babel-helpers": "^6.24.1",
+ "babel-messages": "^6.23.0",
+ "babel-register": "^6.26.0",
+ "babel-runtime": "^6.26.0",
+ "babel-template": "^6.26.0",
+ "babel-traverse": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0",
+ "convert-source-map": "^1.5.1",
+ "debug": "^2.6.9",
+ "json5": "^0.5.1",
+ "lodash": "^4.17.4",
+ "minimatch": "^3.0.4",
+ "path-is-absolute": "^1.0.1",
+ "private": "^0.1.8",
+ "slash": "^1.0.0",
+ "source-map": "^0.5.7"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ }
+ }
+ },
+ "babel-generator": {
+ "version": "6.26.1",
+ "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+ "requires": {
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "detect-indent": "^4.0.0",
+ "jsesc": "^1.3.0",
+ "lodash": "^4.17.4",
+ "source-map": "^0.5.7",
+ "trim-right": "^1.0.1"
+ }
+ },
+ "babel-helpers": {
+ "version": "6.24.1",
+ "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+ "requires": {
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
+ }
+ },
+ "babel-jest": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-23.6.0.tgz",
+ "integrity": "sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==",
+ "requires": {
+ "babel-plugin-istanbul": "^4.1.6",
+ "babel-preset-jest": "^23.2.0"
+ }
+ },
+ "babel-messages": {
+ "version": "6.23.0",
+ "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+ "requires": {
+ "babel-runtime": "^6.22.0"
+ }
+ },
+ "babel-plugin-istanbul": {
+ "version": "4.1.6",
+ "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz",
+ "integrity": "sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==",
+ "requires": {
+ "babel-plugin-syntax-object-rest-spread": "^6.13.0",
+ "find-up": "^2.1.0",
+ "istanbul-lib-instrument": "^1.10.1",
+ "test-exclude": "^4.2.1"
+ }
+ },
+ "babel-plugin-jest-hoist": {
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz",
+ "integrity": "sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc="
+ },
+ "babel-plugin-syntax-object-rest-spread": {
+ "version": "6.13.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+ "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U="
+ },
+ "babel-preset-jest": {
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz",
+ "integrity": "sha1-jsegOhOPABoaj7HoETZSvxpV2kY=",
+ "requires": {
+ "babel-plugin-jest-hoist": "^23.2.0",
+ "babel-plugin-syntax-object-rest-spread": "^6.13.0"
+ }
+ },
+ "babel-register": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+ "requires": {
+ "babel-core": "^6.26.0",
+ "babel-runtime": "^6.26.0",
+ "core-js": "^2.5.0",
+ "home-or-tmp": "^2.0.0",
+ "lodash": "^4.17.4",
+ "mkdirp": "^0.5.1",
+ "source-map-support": "^0.4.15"
+ }
+ },
+ "babel-runtime": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+ "requires": {
+ "core-js": "^2.4.0",
+ "regenerator-runtime": "^0.11.0"
+ }
+ },
+ "babel-template": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+ "requires": {
+ "babel-runtime": "^6.26.0",
+ "babel-traverse": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0",
+ "lodash": "^4.17.4"
+ }
+ },
+ "babel-traverse": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+ "requires": {
+ "babel-code-frame": "^6.26.0",
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0",
+ "debug": "^2.6.8",
+ "globals": "^9.18.0",
+ "invariant": "^2.2.2",
+ "lodash": "^4.17.4"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ }
+ }
+ },
+ "babel-types": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+ "requires": {
+ "babel-runtime": "^6.26.0",
+ "esutils": "^2.0.2",
+ "lodash": "^4.17.4",
+ "to-fast-properties": "^1.0.3"
+ }
+ },
+ "babylon": {
+ "version": "6.18.0",
+ "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+ "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
+ },
+ "balanced-match": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+ },
+ "base": {
+ "version": "0.11.2",
+ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+ "requires": {
+ "cache-base": "^1.0.1",
+ "class-utils": "^0.3.5",
+ "component-emitter": "^1.2.1",
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.1",
+ "mixin-deep": "^1.2.0",
+ "pascalcase": "^0.1.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "requires": {
+ "is-descriptor": "^1.0.0"
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "requires": {
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ },
+ "kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+ }
+ }
+ },
+ "bcrypt-pbkdf": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+ "requires": {
+ "tweetnacl": "^0.14.3"
+ }
+ },
+ "bindings": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+ "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+ "optional": true,
+ "requires": {
+ "file-uri-to-path": "1.0.0"
+ }
+ },
+ "brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "requires": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "braces": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+ "requires": {
+ "expand-range": "^1.8.1",
+ "preserve": "^0.2.0",
+ "repeat-element": "^1.1.2"
+ }
+ },
+ "browser-process-hrtime": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+ "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+ },
+ "browser-resolve": {
+ "version": "1.11.3",
+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+ "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
+ "requires": {
+ "resolve": "1.1.7"
+ },
+ "dependencies": {
+ "resolve": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+ "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
+ }
+ }
+ },
+ "bser": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+ "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+ "requires": {
+ "node-int64": "^0.4.0"
+ }
+ },
+ "buffer-crc32": {
+ "version": "0.2.13",
+ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+ "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
+ },
+ "buffer-from": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+ },
+ "cache-base": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+ "requires": {
+ "collection-visit": "^1.0.0",
+ "component-emitter": "^1.2.1",
+ "get-value": "^2.0.6",
+ "has-value": "^1.0.0",
+ "isobject": "^3.0.1",
+ "set-value": "^2.0.0",
+ "to-object-path": "^0.3.0",
+ "union-value": "^1.0.0",
+ "unset-value": "^1.0.0"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ }
+ }
+ },
+ "callsites": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+ "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA="
+ },
+ "camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+ },
+ "capture-exit": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz",
+ "integrity": "sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=",
+ "requires": {
+ "rsvp": "^3.3.3"
+ }
+ },
+ "caseless": {
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ }
+ },
+ "charenc": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+ "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
+ },
+ "ci-info": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+ "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="
+ },
+ "class-utils": {
+ "version": "0.3.6",
+ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+ "requires": {
+ "arr-union": "^3.1.0",
+ "define-property": "^0.2.5",
+ "isobject": "^3.0.0",
+ "static-extend": "^0.1.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "requires": {
+ "is-descriptor": "^0.1.0"
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ }
+ }
+ },
+ "cliui": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+ "requires": {
+ "string-width": "^2.1.1",
+ "strip-ansi": "^4.0.0",
+ "wrap-ansi": "^2.0.0"
+ }
+ },
+ "co": {
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+ "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+ },
+ "code-point-at": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+ },
+ "collection-visit": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+ "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+ "requires": {
+ "map-visit": "^1.0.0",
+ "object-visit": "^1.0.0"
+ }
+ },
+ "color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "requires": {
+ "color-name": "1.1.3"
+ }
+ },
+ "color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+ },
+ "combined-stream": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "requires": {
+ "delayed-stream": "~1.0.0"
+ }
+ },
+ "component-emitter": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+ "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+ },
+ "concat-stream": {
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+ "requires": {
+ "buffer-from": "^1.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.2.2",
+ "typedarray": "^0.0.6"
+ }
+ },
+ "convert-source-map": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+ "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+ "requires": {
+ "safe-buffer": "~5.1.1"
+ }
+ },
+ "copy-descriptor": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+ },
+ "core-js": {
+ "version": "2.6.11",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+ "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
+ },
+ "core-util-is": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+ },
+ "cross-spawn": {
+ "version": "6.0.5",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+ "requires": {
+ "nice-try": "^1.0.4",
+ "path-key": "^2.0.1",
+ "semver": "^5.5.0",
+ "shebang-command": "^1.2.0",
+ "which": "^1.2.9"
+ }
+ },
+ "crypt": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+ "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
+ },
+ "cssom": {
+ "version": "0.3.8",
+ "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+ "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+ },
+ "cssstyle": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
+ "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
+ "requires": {
+ "cssom": "0.3.x"
+ }
+ },
+ "dashdash": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+ "requires": {
+ "assert-plus": "^1.0.0"
+ }
+ },
+ "data-urls": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
+ "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+ "requires": {
+ "abab": "^2.0.0",
+ "whatwg-mimetype": "^2.2.0",
+ "whatwg-url": "^7.0.0"
+ },
+ "dependencies": {
+ "whatwg-url": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
+ "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
+ "requires": {
+ "lodash.sortby": "^4.7.0",
+ "tr46": "^1.0.1",
+ "webidl-conversions": "^4.0.2"
+ }
+ }
+ }
+ },
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "decamelize": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+ },
+ "decode-uri-component": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+ },
+ "deep-is": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+ },
+ "default-require-extensions": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz",
+ "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
+ "requires": {
+ "strip-bom": "^2.0.0"
+ }
+ },
+ "define-properties": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+ "requires": {
+ "object-keys": "^1.0.12"
+ }
+ },
+ "define-property": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+ "requires": {
+ "is-descriptor": "^1.0.2",
+ "isobject": "^3.0.1"
+ },
+ "dependencies": {
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "requires": {
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ },
+ "kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+ }
+ }
+ },
+ "delayed-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+ },
+ "detect-indent": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+ "requires": {
+ "repeating": "^2.0.0"
+ }
+ },
+ "detect-newline": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
+ "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I="
+ },
+ "diff": {
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+ "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
+ },
+ "domexception": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
+ "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+ "requires": {
+ "webidl-conversions": "^4.0.2"
+ }
+ },
+ "dotenv": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+ "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="
+ },
+ "ecc-jsbn": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+ "requires": {
+ "jsbn": "~0.1.0",
+ "safer-buffer": "^2.1.0"
+ }
+ },
+ "end-of-stream": {
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+ "requires": {
+ "once": "^1.4.0"
+ }
+ },
+ "error-ex": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+ "requires": {
+ "is-arrayish": "^0.2.1"
+ }
+ },
+ "es-abstract": {
+ "version": "1.17.6",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+ "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+ "requires": {
+ "es-to-primitive": "^1.2.1",
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "has-symbols": "^1.0.1",
+ "is-callable": "^1.2.0",
+ "is-regex": "^1.1.0",
+ "object-inspect": "^1.7.0",
+ "object-keys": "^1.1.1",
+ "object.assign": "^4.1.0",
+ "string.prototype.trimend": "^1.0.1",
+ "string.prototype.trimstart": "^1.0.1"
+ }
+ },
+ "es-to-primitive": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+ "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+ "requires": {
+ "is-callable": "^1.1.4",
+ "is-date-object": "^1.0.1",
+ "is-symbol": "^1.0.2"
+ }
+ },
+ "es6-promise": {
+ "version": "4.2.8",
+ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+ "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+ },
+ "es6-promisify": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+ "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+ "requires": {
+ "es6-promise": "^4.0.3"
+ }
+ },
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+ },
+ "escodegen": {
+ "version": "1.14.3",
+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+ "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+ "requires": {
+ "esprima": "^4.0.1",
+ "estraverse": "^4.2.0",
+ "esutils": "^2.0.2",
+ "optionator": "^0.8.1",
+ "source-map": "~0.6.1"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "optional": true
+ }
+ }
+ },
+ "esprima": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+ },
+ "estraverse": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+ },
+ "esutils": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+ },
+ "exec-sh": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
+ "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
+ "requires": {
+ "merge": "^1.2.0"
+ }
+ },
+ "execa": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+ "requires": {
+ "cross-spawn": "^6.0.0",
+ "get-stream": "^4.0.0",
+ "is-stream": "^1.1.0",
+ "npm-run-path": "^2.0.0",
+ "p-finally": "^1.0.0",
+ "signal-exit": "^3.0.0",
+ "strip-eof": "^1.0.0"
+ }
+ },
+ "exit": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+ "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw="
+ },
+ "expand-brackets": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+ "requires": {
+ "is-posix-bracket": "^0.1.0"
+ }
+ },
+ "expand-range": {
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+ "requires": {
+ "fill-range": "^2.1.0"
+ }
+ },
+ "expect": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-23.6.0.tgz",
+ "integrity": "sha512-dgSoOHgmtn/aDGRVFWclQyPDKl2CQRq0hmIEoUAuQs/2rn2NcvCWcSCovm6BLeuB/7EZuLGu2QfnR+qRt5OM4w==",
+ "requires": {
+ "ansi-styles": "^3.2.0",
+ "jest-diff": "^23.6.0",
+ "jest-get-type": "^22.1.0",
+ "jest-matcher-utils": "^23.6.0",
+ "jest-message-util": "^23.4.0",
+ "jest-regex-util": "^23.3.0"
+ }
+ },
+ "extend": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+ },
+ "extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+ "requires": {
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
+ },
+ "dependencies": {
+ "is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "requires": {
+ "is-plain-object": "^2.0.4"
+ }
+ }
+ }
+ },
+ "extglob": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+ "requires": {
+ "is-extglob": "^1.0.0"
+ }
+ },
+ "extract-zip": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+ "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+ "requires": {
+ "concat-stream": "^1.6.2",
+ "debug": "^2.6.9",
+ "mkdirp": "^0.5.4",
+ "yauzl": "^2.10.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ }
+ }
+ },
+ "extsprintf": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+ },
+ "fast-deep-equal": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+ },
+ "fast-json-stable-stringify": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+ },
+ "fast-levenshtein": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+ },
+ "fb-watchman": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+ "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+ "requires": {
+ "bser": "2.1.1"
+ }
+ },
+ "fd-slicer": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+ "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+ "requires": {
+ "pend": "~1.2.0"
+ }
+ },
+ "file-uri-to-path": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+ "optional": true
+ },
+ "filename-regex": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+ "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
+ },
+ "fileset": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
+ "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
+ "requires": {
+ "glob": "^7.0.3",
+ "minimatch": "^3.0.3"
+ }
+ },
+ "fill-range": {
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+ "requires": {
+ "is-number": "^2.1.0",
+ "isobject": "^2.0.0",
+ "randomatic": "^3.0.0",
+ "repeat-element": "^1.1.2",
+ "repeat-string": "^1.5.2"
+ }
+ },
+ "find-up": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "requires": {
+ "locate-path": "^2.0.0"
+ }
+ },
+ "follow-redirects": {
+ "version": "1.5.10",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+ "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+ "requires": {
+ "debug": "=3.1.0"
+ }
+ },
+ "for-in": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
+ },
+ "for-own": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+ "requires": {
+ "for-in": "^1.0.1"
+ }
+ },
+ "forever-agent": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+ },
+ "form-data": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.6",
+ "mime-types": "^2.1.12"
+ }
+ },
+ "fragment-cache": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+ "requires": {
+ "map-cache": "^0.2.2"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+ },
+ "fsevents": {
+ "version": "1.2.13",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+ "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+ "optional": true,
+ "requires": {
+ "bindings": "^1.5.0",
+ "nan": "^2.12.1"
+ }
+ },
+ "function-bind": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+ },
+ "get-caller-file": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+ },
+ "get-stream": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+ "requires": {
+ "pump": "^3.0.0"
+ }
+ },
+ "get-value": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+ "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+ },
+ "getpass": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+ "requires": {
+ "assert-plus": "^1.0.0"
+ }
+ },
+ "glob": {
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ }
+ },
+ "glob-base": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+ "requires": {
+ "glob-parent": "^2.0.0",
+ "is-glob": "^2.0.0"
+ }
+ },
+ "glob-parent": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+ "requires": {
+ "is-glob": "^2.0.0"
+ }
+ },
+ "globals": {
+ "version": "9.18.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+ "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+ },
+ "growly": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+ "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
+ },
+ "handlebars": {
+ "version": "4.7.6",
+ "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
+ "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
+ "requires": {
+ "minimist": "^1.2.5",
+ "neo-async": "^2.6.0",
+ "source-map": "^0.6.1",
+ "uglify-js": "^3.1.4",
+ "wordwrap": "^1.0.0"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ }
+ }
+ },
+ "har-schema": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+ },
+ "har-validator": {
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+ "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+ "requires": {
+ "ajv": "^6.5.5",
+ "har-schema": "^2.0.0"
+ }
+ },
+ "has": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "requires": {
+ "function-bind": "^1.1.1"
+ }
+ },
+ "has-ansi": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+ "requires": {
+ "ansi-regex": "^2.0.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+ },
+ "has-symbols": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+ "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+ },
+ "has-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+ "requires": {
+ "get-value": "^2.0.6",
+ "has-values": "^1.0.0",
+ "isobject": "^3.0.0"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ }
+ }
+ },
+ "has-values": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+ "requires": {
+ "is-number": "^3.0.0",
+ "kind-of": "^4.0.0"
+ },
+ "dependencies": {
+ "is-buffer": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+ },
+ "is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "kind-of": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "home-or-tmp": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+ "requires": {
+ "os-homedir": "^1.0.0",
+ "os-tmpdir": "^1.0.1"
+ }
+ },
+ "hosted-git-info": {
+ "version": "2.8.8",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+ "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+ },
+ "html-encoding-sniffer": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+ "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+ "requires": {
+ "whatwg-encoding": "^1.0.1"
+ }
+ },
+ "http-signature": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+ "requires": {
+ "assert-plus": "^1.0.0",
+ "jsprim": "^1.2.2",
+ "sshpk": "^1.7.0"
+ }
+ },
+ "https-proxy-agent": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz",
+ "integrity": "sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==",
+ "requires": {
+ "agent-base": "^4.3.0",
+ "debug": "^3.1.0"
+ }
+ },
+ "iconv-lite": {
+ "version": "0.4.24",
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+ "requires": {
+ "safer-buffer": ">= 2.1.2 < 3"
+ }
+ },
+ "import-local": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz",
+ "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
+ "requires": {
+ "pkg-dir": "^2.0.0",
+ "resolve-cwd": "^2.0.0"
+ }
+ },
+ "imurmurhash": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+ "requires": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "invariant": {
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+ "requires": {
+ "loose-envify": "^1.0.0"
+ }
+ },
+ "invert-kv": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+ "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
+ },
+ "is-accessor-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ }
+ },
+ "is-arrayish": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+ },
+ "is-buffer": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+ "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
+ },
+ "is-callable": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+ "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
+ },
+ "is-ci": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+ "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
+ "requires": {
+ "ci-info": "^1.5.0"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ }
+ },
+ "is-date-object": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+ "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
+ },
+ "is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "requires": {
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+ }
+ }
+ },
+ "is-dotfile": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+ "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE="
+ },
+ "is-equal-shallow": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+ "requires": {
+ "is-primitive": "^2.0.0"
+ }
+ },
+ "is-extendable": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+ "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+ },
+ "is-extglob": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+ "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
+ },
+ "is-finite": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+ "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="
+ },
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+ },
+ "is-generator-fn": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz",
+ "integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go="
+ },
+ "is-glob": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+ "requires": {
+ "is-extglob": "^1.0.0"
+ }
+ },
+ "is-number": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ }
+ },
+ "is-plain-object": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+ "requires": {
+ "isobject": "^3.0.1"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ }
+ }
+ },
+ "is-posix-bracket": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+ "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
+ },
+ "is-primitive": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+ "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
+ },
+ "is-regex": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+ "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+ "requires": {
+ "has-symbols": "^1.0.1"
+ }
+ },
+ "is-stream": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+ },
+ "is-symbol": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+ "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+ "requires": {
+ "has-symbols": "^1.0.1"
+ }
+ },
+ "is-typedarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+ },
+ "is-utf8": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+ "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+ },
+ "is-windows": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
+ },
+ "is-wsl": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+ "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+ },
+ "isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+ },
+ "isobject": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+ "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+ "requires": {
+ "isarray": "1.0.0"
+ }
+ },
+ "isstream": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+ },
+ "istanbul-api": {
+ "version": "1.3.7",
+ "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.7.tgz",
+ "integrity": "sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==",
+ "requires": {
+ "async": "^2.1.4",
+ "fileset": "^2.0.2",
+ "istanbul-lib-coverage": "^1.2.1",
+ "istanbul-lib-hook": "^1.2.2",
+ "istanbul-lib-instrument": "^1.10.2",
+ "istanbul-lib-report": "^1.1.5",
+ "istanbul-lib-source-maps": "^1.2.6",
+ "istanbul-reports": "^1.5.1",
+ "js-yaml": "^3.7.0",
+ "mkdirp": "^0.5.1",
+ "once": "^1.4.0"
+ }
+ },
+ "istanbul-lib-coverage": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
+ "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ=="
+ },
+ "istanbul-lib-hook": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz",
+ "integrity": "sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==",
+ "requires": {
+ "append-transform": "^0.4.0"
+ }
+ },
+ "istanbul-lib-instrument": {
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
+ "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+ "requires": {
+ "babel-generator": "^6.18.0",
+ "babel-template": "^6.16.0",
+ "babel-traverse": "^6.18.0",
+ "babel-types": "^6.18.0",
+ "babylon": "^6.18.0",
+ "istanbul-lib-coverage": "^1.2.1",
+ "semver": "^5.3.0"
+ }
+ },
+ "istanbul-lib-report": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz",
+ "integrity": "sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==",
+ "requires": {
+ "istanbul-lib-coverage": "^1.2.1",
+ "mkdirp": "^0.5.1",
+ "path-parse": "^1.0.5",
+ "supports-color": "^3.1.2"
+ },
+ "dependencies": {
+ "has-flag": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+ "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+ },
+ "supports-color": {
+ "version": "3.2.3",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+ "requires": {
+ "has-flag": "^1.0.0"
+ }
+ }
+ }
+ },
+ "istanbul-lib-source-maps": {
+ "version": "1.2.6",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz",
+ "integrity": "sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==",
+ "requires": {
+ "debug": "^3.1.0",
+ "istanbul-lib-coverage": "^1.2.1",
+ "mkdirp": "^0.5.1",
+ "rimraf": "^2.6.1",
+ "source-map": "^0.5.3"
+ }
+ },
+ "istanbul-reports": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.5.1.tgz",
+ "integrity": "sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==",
+ "requires": {
+ "handlebars": "^4.0.3"
+ }
+ },
+ "jest": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest/-/jest-23.6.0.tgz",
+ "integrity": "sha512-lWzcd+HSiqeuxyhG+EnZds6iO3Y3ZEnMrfZq/OTGvF/C+Z4fPMCdhWTGSAiO2Oym9rbEXfwddHhh6jqrTF3+Lw==",
+ "requires": {
+ "import-local": "^1.0.0",
+ "jest-cli": "^23.6.0"
+ },
+ "dependencies": {
+ "jest-cli": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-23.6.0.tgz",
+ "integrity": "sha512-hgeD1zRUp1E1zsiyOXjEn4LzRLWdJBV//ukAHGlx6s5mfCNJTbhbHjgxnDUXA8fsKWN/HqFFF6X5XcCwC/IvYQ==",
+ "requires": {
+ "ansi-escapes": "^3.0.0",
+ "chalk": "^2.0.1",
+ "exit": "^0.1.2",
+ "glob": "^7.1.2",
+ "graceful-fs": "^4.1.11",
+ "import-local": "^1.0.0",
+ "is-ci": "^1.0.10",
+ "istanbul-api": "^1.3.1",
+ "istanbul-lib-coverage": "^1.2.0",
+ "istanbul-lib-instrument": "^1.10.1",
+ "istanbul-lib-source-maps": "^1.2.4",
+ "jest-changed-files": "^23.4.2",
+ "jest-config": "^23.6.0",
+ "jest-environment-jsdom": "^23.4.0",
+ "jest-get-type": "^22.1.0",
+ "jest-haste-map": "^23.6.0",
+ "jest-message-util": "^23.4.0",
+ "jest-regex-util": "^23.3.0",
+ "jest-resolve-dependencies": "^23.6.0",
+ "jest-runner": "^23.6.0",
+ "jest-runtime": "^23.6.0",
+ "jest-snapshot": "^23.6.0",
+ "jest-util": "^23.4.0",
+ "jest-validate": "^23.6.0",
+ "jest-watcher": "^23.4.0",
+ "jest-worker": "^23.2.0",
+ "micromatch": "^2.3.11",
+ "node-notifier": "^5.2.1",
+ "prompts": "^0.1.9",
+ "realpath-native": "^1.0.0",
+ "rimraf": "^2.5.4",
+ "slash": "^1.0.0",
+ "string-length": "^2.0.0",
+ "strip-ansi": "^4.0.0",
+ "which": "^1.2.12",
+ "yargs": "^11.0.0"
+ }
+ }
+ }
+ },
+ "jest-changed-files": {
+ "version": "23.4.2",
+ "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-23.4.2.tgz",
+ "integrity": "sha512-EyNhTAUWEfwnK0Is/09LxoqNDOn7mU7S3EHskG52djOFS/z+IT0jT3h3Ql61+dklcG7bJJitIWEMB4Sp1piHmA==",
+ "requires": {
+ "throat": "^4.0.0"
+ }
+ },
+ "jest-config": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-23.6.0.tgz",
+ "integrity": "sha512-i8V7z9BeDXab1+VNo78WM0AtWpBRXJLnkT+lyT+Slx/cbP5sZJ0+NDuLcmBE5hXAoK0aUp7vI+MOxR+R4d8SRQ==",
+ "requires": {
+ "babel-core": "^6.0.0",
+ "babel-jest": "^23.6.0",
+ "chalk": "^2.0.1",
+ "glob": "^7.1.1",
+ "jest-environment-jsdom": "^23.4.0",
+ "jest-environment-node": "^23.4.0",
+ "jest-get-type": "^22.1.0",
+ "jest-jasmine2": "^23.6.0",
+ "jest-regex-util": "^23.3.0",
+ "jest-resolve": "^23.6.0",
+ "jest-util": "^23.4.0",
+ "jest-validate": "^23.6.0",
+ "micromatch": "^2.3.11",
+ "pretty-format": "^23.6.0"
+ }
+ },
+ "jest-diff": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.6.0.tgz",
+ "integrity": "sha512-Gz9l5Ov+X3aL5L37IT+8hoCUsof1CVYBb2QEkOupK64XyRR3h+uRpYIm97K7sY8diFxowR8pIGEdyfMKTixo3g==",
+ "requires": {
+ "chalk": "^2.0.1",
+ "diff": "^3.2.0",
+ "jest-get-type": "^22.1.0",
+ "pretty-format": "^23.6.0"
+ }
+ },
+ "jest-docblock": {
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-23.2.0.tgz",
+ "integrity": "sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=",
+ "requires": {
+ "detect-newline": "^2.1.0"
+ }
+ },
+ "jest-each": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-23.6.0.tgz",
+ "integrity": "sha512-x7V6M/WGJo6/kLoissORuvLIeAoyo2YqLOoCDkohgJ4XOXSqOtyvr8FbInlAWS77ojBsZrafbozWoKVRdtxFCg==",
+ "requires": {
+ "chalk": "^2.0.1",
+ "pretty-format": "^23.6.0"
+ }
+ },
+ "jest-environment-jsdom": {
+ "version": "23.4.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz",
+ "integrity": "sha1-BWp5UrP+pROsYqFAosNox52eYCM=",
+ "requires": {
+ "jest-mock": "^23.2.0",
+ "jest-util": "^23.4.0",
+ "jsdom": "^11.5.1"
+ }
+ },
+ "jest-environment-node": {
+ "version": "23.4.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.4.0.tgz",
+ "integrity": "sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA=",
+ "requires": {
+ "jest-mock": "^23.2.0",
+ "jest-util": "^23.4.0"
+ }
+ },
+ "jest-get-type": {
+ "version": "22.4.3",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
+ "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w=="
+ },
+ "jest-haste-map": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-23.6.0.tgz",
+ "integrity": "sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg==",
+ "requires": {
+ "fb-watchman": "^2.0.0",
+ "graceful-fs": "^4.1.11",
+ "invariant": "^2.2.4",
+ "jest-docblock": "^23.2.0",
+ "jest-serializer": "^23.0.1",
+ "jest-worker": "^23.2.0",
+ "micromatch": "^2.3.11",
+ "sane": "^2.0.0"
+ }
+ },
+ "jest-jasmine2": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz",
+ "integrity": "sha512-pe2Ytgs1nyCs8IvsEJRiRTPC0eVYd8L/dXJGU08GFuBwZ4sYH/lmFDdOL3ZmvJR8QKqV9MFuwlsAi/EWkFUbsQ==",
+ "requires": {
+ "babel-traverse": "^6.0.0",
+ "chalk": "^2.0.1",
+ "co": "^4.6.0",
+ "expect": "^23.6.0",
+ "is-generator-fn": "^1.0.0",
+ "jest-diff": "^23.6.0",
+ "jest-each": "^23.6.0",
+ "jest-matcher-utils": "^23.6.0",
+ "jest-message-util": "^23.4.0",
+ "jest-snapshot": "^23.6.0",
+ "jest-util": "^23.4.0",
+ "pretty-format": "^23.6.0"
+ }
+ },
+ "jest-leak-detector": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz",
+ "integrity": "sha512-f/8zA04rsl1Nzj10HIyEsXvYlMpMPcy0QkQilVZDFOaPbv2ur71X5u2+C4ZQJGyV/xvVXtCCZ3wQ99IgQxftCg==",
+ "requires": {
+ "pretty-format": "^23.6.0"
+ }
+ },
+ "jest-matcher-utils": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz",
+ "integrity": "sha512-rosyCHQfBcol4NsckTn01cdelzWLU9Cq7aaigDf8VwwpIRvWE/9zLgX2bON+FkEW69/0UuYslUe22SOdEf2nog==",
+ "requires": {
+ "chalk": "^2.0.1",
+ "jest-get-type": "^22.1.0",
+ "pretty-format": "^23.6.0"
+ }
+ },
+ "jest-message-util": {
+ "version": "23.4.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.4.0.tgz",
+ "integrity": "sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8=",
+ "requires": {
+ "@babel/code-frame": "^7.0.0-beta.35",
+ "chalk": "^2.0.1",
+ "micromatch": "^2.3.11",
+ "slash": "^1.0.0",
+ "stack-utils": "^1.0.1"
+ }
+ },
+ "jest-mock": {
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-23.2.0.tgz",
+ "integrity": "sha1-rRxg8p6HGdR8JuETgJi20YsmETQ="
+ },
+ "jest-regex-util": {
+ "version": "23.3.0",
+ "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-23.3.0.tgz",
+ "integrity": "sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U="
+ },
+ "jest-resolve": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.6.0.tgz",
+ "integrity": "sha512-XyoRxNtO7YGpQDmtQCmZjum1MljDqUCob7XlZ6jy9gsMugHdN2hY4+Acz9Qvjz2mSsOnPSH7skBmDYCHXVZqkA==",
+ "requires": {
+ "browser-resolve": "^1.11.3",
+ "chalk": "^2.0.1",
+ "realpath-native": "^1.0.0"
+ }
+ },
+ "jest-resolve-dependencies": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz",
+ "integrity": "sha512-EkQWkFWjGKwRtRyIwRwI6rtPAEyPWlUC2MpzHissYnzJeHcyCn1Hc8j7Nn1xUVrS5C6W5+ZL37XTem4D4pLZdA==",
+ "requires": {
+ "jest-regex-util": "^23.3.0",
+ "jest-snapshot": "^23.6.0"
+ }
+ },
+ "jest-runner": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-23.6.0.tgz",
+ "integrity": "sha512-kw0+uj710dzSJKU6ygri851CObtCD9cN8aNkg8jWJf4ewFyEa6kwmiH/r/M1Ec5IL/6VFa0wnAk6w+gzUtjJzA==",
+ "requires": {
+ "exit": "^0.1.2",
+ "graceful-fs": "^4.1.11",
+ "jest-config": "^23.6.0",
+ "jest-docblock": "^23.2.0",
+ "jest-haste-map": "^23.6.0",
+ "jest-jasmine2": "^23.6.0",
+ "jest-leak-detector": "^23.6.0",
+ "jest-message-util": "^23.4.0",
+ "jest-runtime": "^23.6.0",
+ "jest-util": "^23.4.0",
+ "jest-worker": "^23.2.0",
+ "source-map-support": "^0.5.6",
+ "throat": "^4.0.0"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ },
+ "source-map-support": {
+ "version": "0.5.19",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+ "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+ "requires": {
+ "buffer-from": "^1.0.0",
+ "source-map": "^0.6.0"
+ }
+ }
+ }
+ },
+ "jest-runtime": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-23.6.0.tgz",
+ "integrity": "sha512-ycnLTNPT2Gv+TRhnAYAQ0B3SryEXhhRj1kA6hBPSeZaNQkJ7GbZsxOLUkwg6YmvWGdX3BB3PYKFLDQCAE1zNOw==",
+ "requires": {
+ "babel-core": "^6.0.0",
+ "babel-plugin-istanbul": "^4.1.6",
+ "chalk": "^2.0.1",
+ "convert-source-map": "^1.4.0",
+ "exit": "^0.1.2",
+ "fast-json-stable-stringify": "^2.0.0",
+ "graceful-fs": "^4.1.11",
+ "jest-config": "^23.6.0",
+ "jest-haste-map": "^23.6.0",
+ "jest-message-util": "^23.4.0",
+ "jest-regex-util": "^23.3.0",
+ "jest-resolve": "^23.6.0",
+ "jest-snapshot": "^23.6.0",
+ "jest-util": "^23.4.0",
+ "jest-validate": "^23.6.0",
+ "micromatch": "^2.3.11",
+ "realpath-native": "^1.0.0",
+ "slash": "^1.0.0",
+ "strip-bom": "3.0.0",
+ "write-file-atomic": "^2.1.0",
+ "yargs": "^11.0.0"
+ },
+ "dependencies": {
+ "strip-bom": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+ }
+ }
+ },
+ "jest-serializer": {
+ "version": "23.0.1",
+ "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-23.0.1.tgz",
+ "integrity": "sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU="
+ },
+ "jest-snapshot": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.6.0.tgz",
+ "integrity": "sha512-tM7/Bprftun6Cvj2Awh/ikS7zV3pVwjRYU2qNYS51VZHgaAMBs5l4o/69AiDHhQrj5+LA2Lq4VIvK7zYk/bswg==",
+ "requires": {
+ "babel-types": "^6.0.0",
+ "chalk": "^2.0.1",
+ "jest-diff": "^23.6.0",
+ "jest-matcher-utils": "^23.6.0",
+ "jest-message-util": "^23.4.0",
+ "jest-resolve": "^23.6.0",
+ "mkdirp": "^0.5.1",
+ "natural-compare": "^1.4.0",
+ "pretty-format": "^23.6.0",
+ "semver": "^5.5.0"
+ }
+ },
+ "jest-util": {
+ "version": "23.4.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-23.4.0.tgz",
+ "integrity": "sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE=",
+ "requires": {
+ "callsites": "^2.0.0",
+ "chalk": "^2.0.1",
+ "graceful-fs": "^4.1.11",
+ "is-ci": "^1.0.10",
+ "jest-message-util": "^23.4.0",
+ "mkdirp": "^0.5.1",
+ "slash": "^1.0.0",
+ "source-map": "^0.6.0"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ }
+ }
+ },
+ "jest-validate": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.6.0.tgz",
+ "integrity": "sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==",
+ "requires": {
+ "chalk": "^2.0.1",
+ "jest-get-type": "^22.1.0",
+ "leven": "^2.1.0",
+ "pretty-format": "^23.6.0"
+ }
+ },
+ "jest-watcher": {
+ "version": "23.4.0",
+ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-23.4.0.tgz",
+ "integrity": "sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=",
+ "requires": {
+ "ansi-escapes": "^3.0.0",
+ "chalk": "^2.0.1",
+ "string-length": "^2.0.0"
+ }
+ },
+ "jest-worker": {
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-23.2.0.tgz",
+ "integrity": "sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=",
+ "requires": {
+ "merge-stream": "^1.0.1"
+ }
+ },
+ "js-tokens": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+ "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+ },
+ "js-yaml": {
+ "version": "3.14.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+ "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+ "requires": {
+ "argparse": "^1.0.7",
+ "esprima": "^4.0.0"
+ }
+ },
+ "jsbn": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+ },
+ "jsdom": {
+ "version": "11.12.0",
+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
+ "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+ "requires": {
+ "abab": "^2.0.0",
+ "acorn": "^5.5.3",
+ "acorn-globals": "^4.1.0",
+ "array-equal": "^1.0.0",
+ "cssom": ">= 0.3.2 < 0.4.0",
+ "cssstyle": "^1.0.0",
+ "data-urls": "^1.0.0",
+ "domexception": "^1.0.1",
+ "escodegen": "^1.9.1",
+ "html-encoding-sniffer": "^1.0.2",
+ "left-pad": "^1.3.0",
+ "nwsapi": "^2.0.7",
+ "parse5": "4.0.0",
+ "pn": "^1.1.0",
+ "request": "^2.87.0",
+ "request-promise-native": "^1.0.5",
+ "sax": "^1.2.4",
+ "symbol-tree": "^3.2.2",
+ "tough-cookie": "^2.3.4",
+ "w3c-hr-time": "^1.0.1",
+ "webidl-conversions": "^4.0.2",
+ "whatwg-encoding": "^1.0.3",
+ "whatwg-mimetype": "^2.1.0",
+ "whatwg-url": "^6.4.1",
+ "ws": "^5.2.0",
+ "xml-name-validator": "^3.0.0"
+ }
+ },
+ "jsesc": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+ "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
+ },
+ "json-schema": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+ },
+ "json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+ },
+ "json-stringify-safe": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+ },
+ "json5": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+ "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
+ },
+ "jsprim": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+ "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+ "requires": {
+ "assert-plus": "1.0.0",
+ "extsprintf": "1.3.0",
+ "json-schema": "0.2.3",
+ "verror": "1.10.0"
+ }
+ },
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ },
+ "dependencies": {
+ "is-buffer": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+ }
+ }
+ },
+ "kleur": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/kleur/-/kleur-2.0.2.tgz",
+ "integrity": "sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ=="
+ },
+ "lcid": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+ "requires": {
+ "invert-kv": "^2.0.0"
+ }
+ },
+ "left-pad": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+ "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="
+ },
+ "leven": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
+ "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA="
+ },
+ "levn": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+ "requires": {
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2"
+ }
+ },
+ "load-json-file": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+ "requires": {
+ "graceful-fs": "^4.1.2",
+ "parse-json": "^2.2.0",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0",
+ "strip-bom": "^2.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+ "requires": {
+ "p-locate": "^2.0.0",
+ "path-exists": "^3.0.0"
+ }
+ },
+ "lodash": {
+ "version": "4.17.19",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+ "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
+ },
+ "lodash.sortby": {
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+ "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+ },
+ "loose-envify": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+ "requires": {
+ "js-tokens": "^3.0.0 || ^4.0.0"
+ }
+ },
+ "makeerror": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+ "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+ "requires": {
+ "tmpl": "1.0.x"
+ }
+ },
+ "map-age-cleaner": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+ "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+ "requires": {
+ "p-defer": "^1.0.0"
+ }
+ },
+ "map-cache": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
+ },
+ "map-visit": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+ "requires": {
+ "object-visit": "^1.0.0"
+ }
+ },
+ "math-random": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
+ "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="
+ },
+ "mem": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+ "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+ "requires": {
+ "map-age-cleaner": "^0.1.1",
+ "mimic-fn": "^2.0.0",
+ "p-is-promise": "^2.0.0"
+ }
+ },
+ "merge": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+ "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+ },
+ "merge-stream": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
+ "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
+ "requires": {
+ "readable-stream": "^2.0.1"
+ }
+ },
+ "micromatch": {
+ "version": "2.3.11",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+ "requires": {
+ "arr-diff": "^2.0.0",
+ "array-unique": "^0.2.1",
+ "braces": "^1.8.2",
+ "expand-brackets": "^0.1.4",
+ "extglob": "^0.3.1",
+ "filename-regex": "^2.0.0",
+ "is-extglob": "^1.0.0",
+ "is-glob": "^2.0.1",
+ "kind-of": "^3.0.2",
+ "normalize-path": "^2.0.1",
+ "object.omit": "^2.0.0",
+ "parse-glob": "^3.0.4",
+ "regex-cache": "^0.4.2"
+ }
+ },
+ "mime": {
+ "version": "2.4.6",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+ "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
+ },
+ "mime-db": {
+ "version": "1.44.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+ "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+ },
+ "mime-types": {
+ "version": "2.1.27",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+ "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+ "requires": {
+ "mime-db": "1.44.0"
+ }
+ },
+ "mimic-fn": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "requires": {
+ "brace-expansion": "^1.1.7"
+ }
+ },
+ "minimist": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+ },
+ "mixin-deep": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+ "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+ "requires": {
+ "for-in": "^1.0.2",
+ "is-extendable": "^1.0.1"
+ },
+ "dependencies": {
+ "is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "requires": {
+ "is-plain-object": "^2.0.4"
+ }
+ }
+ }
+ },
+ "mkdirp": {
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+ "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+ "requires": {
+ "minimist": "^1.2.5"
+ }
+ },
+ "moment": {
+ "version": "2.27.0",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
+ "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ },
+ "nan": {
+ "version": "2.14.1",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+ "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
+ "optional": true
+ },
+ "nanomatch": {
+ "version": "1.2.13",
+ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+ "requires": {
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "fragment-cache": "^0.2.1",
+ "is-windows": "^1.0.2",
+ "kind-of": "^6.0.2",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ },
+ "dependencies": {
+ "arr-diff": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+ "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+ },
+ "array-unique": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+ },
+ "kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+ }
+ }
+ },
+ "natural-compare": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+ },
+ "neo-async": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+ },
+ "nice-try": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+ },
+ "node-int64": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+ "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
+ },
+ "node-notifier": {
+ "version": "5.4.3",
+ "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
+ "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
+ "requires": {
+ "growly": "^1.3.0",
+ "is-wsl": "^1.1.0",
+ "semver": "^5.5.0",
+ "shellwords": "^0.1.1",
+ "which": "^1.3.0"
+ }
+ },
+ "normalize-package-data": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+ "requires": {
+ "hosted-git-info": "^2.1.4",
+ "resolve": "^1.10.0",
+ "semver": "2 || 3 || 4 || 5",
+ "validate-npm-package-license": "^3.0.1"
+ }
+ },
+ "normalize-path": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+ "requires": {
+ "remove-trailing-separator": "^1.0.1"
+ }
+ },
+ "npm-run-path": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+ "requires": {
+ "path-key": "^2.0.0"
+ }
+ },
+ "number-is-nan": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+ },
+ "nwsapi": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+ "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
+ },
+ "oauth-sign": {
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+ },
+ "object-assign": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+ },
+ "object-copy": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+ "requires": {
+ "copy-descriptor": "^0.1.0",
+ "define-property": "^0.2.5",
+ "kind-of": "^3.0.3"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "requires": {
+ "is-descriptor": "^0.1.0"
+ }
+ }
+ }
+ },
+ "object-inspect": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+ "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
+ },
+ "object-keys": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+ },
+ "object-visit": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+ "requires": {
+ "isobject": "^3.0.0"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ }
+ }
+ },
+ "object.assign": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+ "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+ "requires": {
+ "define-properties": "^1.1.2",
+ "function-bind": "^1.1.1",
+ "has-symbols": "^1.0.0",
+ "object-keys": "^1.0.11"
+ }
+ },
+ "object.getownpropertydescriptors": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+ "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
+ "requires": {
+ "define-properties": "^1.1.3",
+ "es-abstract": "^1.17.0-next.1"
+ }
+ },
+ "object.omit": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+ "requires": {
+ "for-own": "^0.1.4",
+ "is-extendable": "^0.1.1"
+ }
+ },
+ "object.pick": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+ "requires": {
+ "isobject": "^3.0.1"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ }
+ }
+ },
+ "once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+ "requires": {
+ "wrappy": "1"
+ }
+ },
+ "optionator": {
+ "version": "0.8.3",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+ "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+ "requires": {
+ "deep-is": "~0.1.3",
+ "fast-levenshtein": "~2.0.6",
+ "levn": "~0.3.0",
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2",
+ "word-wrap": "~1.2.3"
+ }
+ },
+ "os-homedir": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+ },
+ "os-locale": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+ "requires": {
+ "execa": "^1.0.0",
+ "lcid": "^2.0.0",
+ "mem": "^4.0.0"
+ }
+ },
+ "os-tmpdir": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+ },
+ "p-defer": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+ "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
+ },
+ "p-finally": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+ },
+ "p-is-promise": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
+ },
+ "p-limit": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+ "requires": {
+ "p-try": "^1.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+ "requires": {
+ "p-limit": "^1.1.0"
+ }
+ },
+ "p-try": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+ },
+ "parse-glob": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+ "requires": {
+ "glob-base": "^0.3.0",
+ "is-dotfile": "^1.0.0",
+ "is-extglob": "^1.0.0",
+ "is-glob": "^2.0.0"
+ }
+ },
+ "parse-json": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+ "requires": {
+ "error-ex": "^1.2.0"
+ }
+ },
+ "parse5": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+ "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
+ },
+ "pascalcase": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
+ },
+ "path-exists": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+ "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+ },
+ "path-key": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+ "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+ },
+ "path-parse": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+ },
+ "path-type": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+ "requires": {
+ "graceful-fs": "^4.1.2",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
+ }
+ },
+ "pend": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+ "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+ },
+ "performance-now": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+ },
+ "pify": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+ },
+ "pinkie": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+ "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+ },
+ "pinkie-promise": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+ "requires": {
+ "pinkie": "^2.0.0"
+ }
+ },
+ "pkg-dir": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+ "requires": {
+ "find-up": "^2.1.0"
+ }
+ },
+ "pn": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
+ "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="
+ },
+ "posix-character-classes": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
+ },
+ "prelude-ls": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+ },
+ "preserve": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+ "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
+ },
+ "pretty-format": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz",
+ "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==",
+ "requires": {
+ "ansi-regex": "^3.0.0",
+ "ansi-styles": "^3.2.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+ }
+ }
+ },
+ "private": {
+ "version": "0.1.8",
+ "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+ "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
+ },
+ "process-nextick-args": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+ },
+ "progress": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+ },
+ "prompts": {
+ "version": "0.1.14",
+ "resolved": "https://registry.npmjs.org/prompts/-/prompts-0.1.14.tgz",
+ "integrity": "sha512-rxkyiE9YH6zAz/rZpywySLKkpaj0NMVyNw1qhsubdbjjSgcayjTShDreZGlFMcGSu5sab3bAKPfFk78PB90+8w==",
+ "requires": {
+ "kleur": "^2.0.1",
+ "sisteransi": "^0.1.1"
+ }
+ },
+ "proxy-from-env": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+ },
+ "psl": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+ "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+ },
+ "pump": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+ "requires": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
+ "punycode": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+ },
+ "puppeteer": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.0.0.tgz",
+ "integrity": "sha512-t3MmTWzQxPRP71teU6l0jX47PHXlc4Z52sQv4LJQSZLq1ttkKS2yGM3gaI57uQwZkNaoGd0+HPPMELZkcyhlqA==",
+ "requires": {
+ "debug": "^4.1.0",
+ "extract-zip": "^1.6.6",
+ "https-proxy-agent": "^3.0.0",
+ "mime": "^2.0.3",
+ "progress": "^2.0.1",
+ "proxy-from-env": "^1.0.0",
+ "rimraf": "^2.6.1",
+ "ws": "^6.1.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+ },
+ "ws": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+ "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+ "requires": {
+ "async-limiter": "~1.0.0"
+ }
+ }
+ }
+ },
+ "qs": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+ },
+ "randomatic": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
+ "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+ "requires": {
+ "is-number": "^4.0.0",
+ "kind-of": "^6.0.0",
+ "math-random": "^1.0.1"
+ },
+ "dependencies": {
+ "is-number": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+ "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
+ },
+ "kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+ }
+ }
+ },
+ "read-pkg": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+ "requires": {
+ "load-json-file": "^1.0.0",
+ "normalize-package-data": "^2.3.2",
+ "path-type": "^1.0.0"
+ }
+ },
+ "read-pkg-up": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+ "requires": {
+ "find-up": "^1.0.0",
+ "read-pkg": "^1.0.0"
+ },
+ "dependencies": {
+ "find-up": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+ "requires": {
+ "path-exists": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
+ }
+ },
+ "path-exists": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+ "requires": {
+ "pinkie-promise": "^2.0.0"
+ }
+ }
+ }
+ },
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "realpath-native": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
+ "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
+ "requires": {
+ "util.promisify": "^1.0.0"
+ }
+ },
+ "regenerator-runtime": {
+ "version": "0.11.1",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+ "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+ },
+ "regex-cache": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+ "requires": {
+ "is-equal-shallow": "^0.1.3"
+ }
+ },
+ "regex-not": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+ "requires": {
+ "extend-shallow": "^3.0.2",
+ "safe-regex": "^1.1.0"
+ }
+ },
+ "remove-trailing-separator": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+ "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+ },
+ "repeat-element": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+ "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
+ },
+ "repeat-string": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+ },
+ "repeating": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+ "requires": {
+ "is-finite": "^1.0.0"
+ }
+ },
+ "request": {
+ "version": "2.88.2",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+ "requires": {
+ "aws-sign2": "~0.7.0",
+ "aws4": "^1.8.0",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.6",
+ "extend": "~3.0.2",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.3.2",
+ "har-validator": "~5.1.3",
+ "http-signature": "~1.2.0",
+ "is-typedarray": "~1.0.0",
+ "isstream": "~0.1.2",
+ "json-stringify-safe": "~5.0.1",
+ "mime-types": "~2.1.19",
+ "oauth-sign": "~0.9.0",
+ "performance-now": "^2.1.0",
+ "qs": "~6.5.2",
+ "safe-buffer": "^5.1.2",
+ "tough-cookie": "~2.5.0",
+ "tunnel-agent": "^0.6.0",
+ "uuid": "^3.3.2"
+ }
+ },
+ "request-promise-core": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
+ "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
+ "requires": {
+ "lodash": "^4.17.15"
+ }
+ },
+ "request-promise-native": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
+ "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
+ "requires": {
+ "request-promise-core": "1.1.3",
+ "stealthy-require": "^1.1.1",
+ "tough-cookie": "^2.3.3"
+ }
+ },
+ "require-directory": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+ },
+ "require-main-filename": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+ "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+ },
+ "resolve": {
+ "version": "1.17.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+ "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+ "requires": {
+ "path-parse": "^1.0.6"
+ }
+ },
+ "resolve-cwd": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+ "requires": {
+ "resolve-from": "^3.0.0"
+ }
+ },
+ "resolve-from": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
+ },
+ "resolve-url": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+ },
+ "ret": {
+ "version": "0.1.15",
+ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+ },
+ "rimraf": {
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+ "requires": {
+ "glob": "^7.1.3"
+ }
+ },
+ "rsvp": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+ "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
+ "safe-regex": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+ "requires": {
+ "ret": "~0.1.10"
+ }
+ },
+ "safer-buffer": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+ },
+ "sane": {
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz",
+ "integrity": "sha1-tNwYYcIbQn6SlQej51HiosuKs/o=",
+ "requires": {
+ "anymatch": "^2.0.0",
+ "capture-exit": "^1.2.0",
+ "exec-sh": "^0.2.0",
+ "fb-watchman": "^2.0.0",
+ "fsevents": "^1.2.3",
+ "micromatch": "^3.1.4",
+ "minimist": "^1.1.1",
+ "walker": "~1.0.5",
+ "watch": "~0.18.0"
+ },
+ "dependencies": {
+ "arr-diff": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+ "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+ },
+ "array-unique": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+ },
+ "braces": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+ "requires": {
+ "arr-flatten": "^1.1.0",
+ "array-unique": "^0.3.2",
+ "extend-shallow": "^2.0.1",
+ "fill-range": "^4.0.0",
+ "isobject": "^3.0.1",
+ "repeat-element": "^1.1.2",
+ "snapdragon": "^0.8.1",
+ "snapdragon-node": "^2.0.1",
+ "split-string": "^3.0.2",
+ "to-regex": "^3.0.1"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "expand-brackets": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+ "requires": {
+ "debug": "^2.3.3",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "posix-character-classes": "^0.1.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "requires": {
+ "is-descriptor": "^0.1.0"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "is-data-descriptor": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "requires": {
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
+ }
+ },
+ "kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+ }
+ }
+ },
+ "extglob": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+ "requires": {
+ "array-unique": "^0.3.2",
+ "define-property": "^1.0.0",
+ "expand-brackets": "^2.1.4",
+ "extend-shallow": "^2.0.1",
+ "fragment-cache": "^0.2.1",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "requires": {
+ "is-descriptor": "^1.0.0"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "fill-range": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+ "requires": {
+ "extend-shallow": "^2.0.1",
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1",
+ "to-regex-range": "^2.1.0"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-buffer": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "requires": {
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+ }
+ },
+ "is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ },
+ "kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+ },
+ "micromatch": {
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+ "requires": {
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "braces": "^2.3.1",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "extglob": "^2.0.4",
+ "fragment-cache": "^0.2.1",
+ "kind-of": "^6.0.2",
+ "nanomatch": "^1.2.9",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.2"
+ }
+ }
+ }
+ },
+ "sax": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+ },
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+ },
+ "set-blocking": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+ },
+ "set-value": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+ "requires": {
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.3",
+ "split-string": "^3.0.1"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "sha1": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/sha1/-/sha1-1.1.1.tgz",
+ "integrity": "sha1-rdqnqTFo85PxnrKxUJFhjicA+Eg=",
+ "requires": {
+ "charenc": ">= 0.0.1",
+ "crypt": ">= 0.0.1"
+ }
+ },
+ "shebang-command": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+ "requires": {
+ "shebang-regex": "^1.0.0"
+ }
+ },
+ "shebang-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+ },
+ "shellwords": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+ "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
+ },
+ "signal-exit": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+ "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+ },
+ "sisteransi": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-0.1.1.tgz",
+ "integrity": "sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g=="
+ },
+ "slash": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+ "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
+ },
+ "snapdragon": {
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+ "requires": {
+ "base": "^0.11.1",
+ "debug": "^2.2.0",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "map-cache": "^0.2.2",
+ "source-map": "^0.5.6",
+ "source-map-resolve": "^0.5.0",
+ "use": "^3.1.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "requires": {
+ "is-descriptor": "^0.1.0"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "snapdragon-node": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+ "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+ "requires": {
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.0",
+ "snapdragon-util": "^3.0.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "requires": {
+ "is-descriptor": "^1.0.0"
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "requires": {
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ },
+ "kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+ }
+ }
+ },
+ "snapdragon-util": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+ "requires": {
+ "kind-of": "^3.2.0"
+ }
+ },
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+ },
+ "source-map-resolve": {
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+ "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+ "requires": {
+ "atob": "^2.1.2",
+ "decode-uri-component": "^0.2.0",
+ "resolve-url": "^0.2.1",
+ "source-map-url": "^0.4.0",
+ "urix": "^0.1.0"
+ }
+ },
+ "source-map-support": {
+ "version": "0.4.18",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+ "requires": {
+ "source-map": "^0.5.6"
+ }
+ },
+ "source-map-url": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
+ },
+ "spdx-correct": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+ "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+ "requires": {
+ "spdx-expression-parse": "^3.0.0",
+ "spdx-license-ids": "^3.0.0"
+ }
+ },
+ "spdx-exceptions": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+ "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+ },
+ "spdx-expression-parse": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+ "requires": {
+ "spdx-exceptions": "^2.1.0",
+ "spdx-license-ids": "^3.0.0"
+ }
+ },
+ "spdx-license-ids": {
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+ "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
+ },
+ "split-string": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+ "requires": {
+ "extend-shallow": "^3.0.0"
+ }
+ },
+ "sprintf-js": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+ },
+ "sshpk": {
+ "version": "1.16.1",
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+ "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+ "requires": {
+ "asn1": "~0.2.3",
+ "assert-plus": "^1.0.0",
+ "bcrypt-pbkdf": "^1.0.0",
+ "dashdash": "^1.12.0",
+ "ecc-jsbn": "~0.1.1",
+ "getpass": "^0.1.1",
+ "jsbn": "~0.1.0",
+ "safer-buffer": "^2.0.2",
+ "tweetnacl": "~0.14.0"
+ }
+ },
+ "stack-utils": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
+ "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA=="
+ },
+ "static-extend": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+ "requires": {
+ "define-property": "^0.2.5",
+ "object-copy": "^0.1.0"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "requires": {
+ "is-descriptor": "^0.1.0"
+ }
+ }
+ }
+ },
+ "stealthy-require": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+ "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
+ },
+ "string-length": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
+ "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=",
+ "requires": {
+ "astral-regex": "^1.0.0",
+ "strip-ansi": "^4.0.0"
+ }
+ },
+ "string-width": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+ "requires": {
+ "is-fullwidth-code-point": "^2.0.0",
+ "strip-ansi": "^4.0.0"
+ }
+ },
+ "string.prototype.trimend": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+ "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+ "requires": {
+ "define-properties": "^1.1.3",
+ "es-abstract": "^1.17.5"
+ }
+ },
+ "string.prototype.trimstart": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+ "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+ "requires": {
+ "define-properties": "^1.1.3",
+ "es-abstract": "^1.17.5"
+ }
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "requires": {
+ "ansi-regex": "^3.0.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+ }
+ }
+ },
+ "strip-bom": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+ "requires": {
+ "is-utf8": "^0.2.0"
+ }
+ },
+ "strip-eof": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ },
+ "symbol-tree": {
+ "version": "3.2.4",
+ "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
+ },
+ "test-exclude": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.3.tgz",
+ "integrity": "sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==",
+ "requires": {
+ "arrify": "^1.0.1",
+ "micromatch": "^2.3.11",
+ "object-assign": "^4.1.0",
+ "read-pkg-up": "^1.0.1",
+ "require-main-filename": "^1.0.1"
+ }
+ },
+ "throat": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz",
+ "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo="
+ },
+ "tmpl": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+ "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE="
+ },
+ "to-fast-properties": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+ "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
+ },
+ "to-object-path": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ }
+ },
+ "to-regex": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+ "requires": {
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "regex-not": "^1.0.2",
+ "safe-regex": "^1.1.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+ "requires": {
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1"
+ },
+ "dependencies": {
+ "is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ }
+ }
+ }
+ },
+ "tough-cookie": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+ "requires": {
+ "psl": "^1.1.28",
+ "punycode": "^2.1.1"
+ }
+ },
+ "tr46": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+ "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+ "requires": {
+ "punycode": "^2.1.0"
+ }
+ },
+ "trim-right": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
+ },
+ "tunnel-agent": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+ "requires": {
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "tweetnacl": {
+ "version": "0.14.5",
+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+ },
+ "type-check": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+ "requires": {
+ "prelude-ls": "~1.1.2"
+ }
+ },
+ "typedarray": {
+ "version": "0.0.6",
+ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+ },
+ "uglify-js": {
+ "version": "3.10.0",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz",
+ "integrity": "sha512-Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA==",
+ "optional": true
+ },
+ "union-value": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+ "requires": {
+ "arr-union": "^3.1.0",
+ "get-value": "^2.0.6",
+ "is-extendable": "^0.1.1",
+ "set-value": "^2.0.1"
+ }
+ },
+ "unset-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+ "requires": {
+ "has-value": "^0.3.1",
+ "isobject": "^3.0.0"
+ },
+ "dependencies": {
+ "has-value": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+ "requires": {
+ "get-value": "^2.0.3",
+ "has-values": "^0.1.4",
+ "isobject": "^2.0.0"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+ "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+ "requires": {
+ "isarray": "1.0.0"
+ }
+ }
+ }
+ },
+ "has-values": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+ "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ }
+ }
+ },
+ "uri-js": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+ "requires": {
+ "punycode": "^2.1.0"
+ }
+ },
+ "urix": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+ },
+ "use": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+ },
+ "util.promisify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+ "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+ "requires": {
+ "define-properties": "^1.1.3",
+ "es-abstract": "^1.17.2",
+ "has-symbols": "^1.0.1",
+ "object.getownpropertydescriptors": "^2.1.0"
+ }
+ },
+ "uuid": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+ },
+ "validate-npm-package-license": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+ "requires": {
+ "spdx-correct": "^3.0.0",
+ "spdx-expression-parse": "^3.0.0"
+ }
+ },
+ "verror": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+ "requires": {
+ "assert-plus": "^1.0.0",
+ "core-util-is": "1.0.2",
+ "extsprintf": "^1.2.0"
+ }
+ },
+ "w3c-hr-time": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+ "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+ "requires": {
+ "browser-process-hrtime": "^1.0.0"
+ }
+ },
+ "walker": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+ "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+ "requires": {
+ "makeerror": "1.0.x"
+ }
+ },
+ "watch": {
+ "version": "0.18.0",
+ "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz",
+ "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=",
+ "requires": {
+ "exec-sh": "^0.2.0",
+ "minimist": "^1.2.0"
+ }
+ },
+ "webidl-conversions": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+ "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+ },
+ "whatwg-encoding": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+ "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+ "requires": {
+ "iconv-lite": "0.4.24"
+ }
+ },
+ "whatwg-mimetype": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+ "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
+ },
+ "whatwg-url": {
+ "version": "6.5.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+ "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+ "requires": {
+ "lodash.sortby": "^4.7.0",
+ "tr46": "^1.0.1",
+ "webidl-conversions": "^4.0.2"
+ }
+ },
+ "which": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+ "requires": {
+ "isexe": "^2.0.0"
+ }
+ },
+ "which-module": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+ },
+ "word-wrap": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+ },
+ "wordwrap": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+ "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+ },
+ "wrap-ansi": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+ "requires": {
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1"
+ },
+ "dependencies": {
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+ "requires": {
+ "number-is-nan": "^1.0.0"
+ }
+ },
+ "string-width": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+ "requires": {
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+ "requires": {
+ "ansi-regex": "^2.0.0"
+ }
+ }
+ }
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+ },
+ "write-file-atomic": {
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+ "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+ "requires": {
+ "graceful-fs": "^4.1.11",
+ "imurmurhash": "^0.1.4",
+ "signal-exit": "^3.0.2"
+ }
+ },
+ "ws": {
+ "version": "5.2.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+ "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+ "requires": {
+ "async-limiter": "~1.0.0"
+ }
+ },
+ "xml-name-validator": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+ "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
+ },
+ "y18n": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+ "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
+ },
+ "yargs": {
+ "version": "11.1.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
+ "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
+ "requires": {
+ "cliui": "^4.0.0",
+ "decamelize": "^1.1.1",
+ "find-up": "^2.1.0",
+ "get-caller-file": "^1.0.1",
+ "os-locale": "^3.1.0",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^1.0.1",
+ "set-blocking": "^2.0.0",
+ "string-width": "^2.0.0",
+ "which-module": "^2.0.0",
+ "y18n": "^3.2.1",
+ "yargs-parser": "^9.0.2"
+ }
+ },
+ "yargs-parser": {
+ "version": "9.0.2",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
+ "requires": {
+ "camelcase": "^4.1.0"
+ }
+ },
+ "yauzl": {
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+ "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+ "requires": {
+ "buffer-crc32": "~0.2.3",
+ "fd-slicer": "~1.1.0"
+ }
+ }
+ }
+}
diff --git a/bigbluebutton-html5/tests/puppeteer/presentation.test.js b/bigbluebutton-html5/tests/puppeteer/presentation.test.js
index 562c1fce4101aa616c3faae6f6d3e1af8dbde4b4..45d9bc751774707991e403d258c28e01c42165dc 100644
--- a/bigbluebutton-html5/tests/puppeteer/presentation.test.js
+++ b/bigbluebutton-html5/tests/puppeteer/presentation.test.js
@@ -3,11 +3,16 @@ const Slide = require('./presentation/slide');
const Upload = require('./presentation/upload');
describe('Presentation', () => {
+ beforeEach(() => {
+ jest.setTimeout(30000);
+ });
+
test('Skip slide', async () => {
const test = new Slide();
let response;
try {
await test.init(Page.getArgs());
+ await test.closeAudioModal();
response = await test.test();
} catch (e) {
console.log(e);
@@ -22,6 +27,7 @@ describe('Presentation', () => {
let response;
try {
await test.init(Page.getArgs());
+ await test.closeAudioModal();
response = await test.test();
} catch (e) {
console.log(e);
diff --git a/bigbluebutton-html5/tests/puppeteer/screenshare.test.js b/bigbluebutton-html5/tests/puppeteer/screenshare.test.js
index 6f27a13eab1a287f02d8f2c27b80491349e6c631..e1de8577ceb24afc2030ec61d7521ec9bf67bcc1 100644
--- a/bigbluebutton-html5/tests/puppeteer/screenshare.test.js
+++ b/bigbluebutton-html5/tests/puppeteer/screenshare.test.js
@@ -2,11 +2,16 @@ const ShareScreen = require('./screenshare/screenshare');
const Page = require('./core/page');
describe('Screen Share', () => {
+ beforeEach(() => {
+ jest.setTimeout(30000);
+ });
+
test('Share screen', async () => {
const test = new ShareScreen();
let response;
try {
await test.init(Page.getArgsWithVideo());
+ await test.closeAudioModal();
response = await test.test();
} catch (e) {
console.log(e);
diff --git a/bigbluebutton-html5/tests/puppeteer/screenshare/screenshare.js b/bigbluebutton-html5/tests/puppeteer/screenshare/screenshare.js
index 521367e3c3e6be8327207f092ba77db47ce805fa..b68bbd642c91d94d0a8d805fc54718438209c68a 100644
--- a/bigbluebutton-html5/tests/puppeteer/screenshare/screenshare.js
+++ b/bigbluebutton-html5/tests/puppeteer/screenshare/screenshare.js
@@ -15,12 +15,6 @@ class ShareScreen extends Page {
const response = await util.getScreenShareContainer(this.page);
return response;
}
-
- async toast(page) {
- await util.startScreenshare(page);
- const response = await utilNotifications.getLastToastValue(page);
- return response;
- }
}
module.exports = exports = ShareScreen;
diff --git a/bigbluebutton-html5/tests/puppeteer/screenshare/util.js b/bigbluebutton-html5/tests/puppeteer/screenshare/util.js
index e9a1935b561a2be09eee8d54633db56e0bdbf972..bfebef2a93dce77367bcf38888457635ca96ebd3 100644
--- a/bigbluebutton-html5/tests/puppeteer/screenshare/util.js
+++ b/bigbluebutton-html5/tests/puppeteer/screenshare/util.js
@@ -11,7 +11,7 @@ async function getTestElement(element) {
async function getScreenShareContainer(test) {
await test.waitForSelector(e.screenShareVideo);
- const screenShareContainer = await test.evaluate(getTestElement, e.screenshareVideo);
+ const screenShareContainer = await test.evaluate(getTestElement, e.screenShareVideo);
const response = screenShareContainer !== null;
return response;
}
diff --git a/bigbluebutton-html5/tests/puppeteer/sharednotes.test.js b/bigbluebutton-html5/tests/puppeteer/sharednotes.test.js
index 67aad3cd7cc6da8d446bbb73211c0768a6bd6e50..b366f579c4e18732e7201325f09b92d82942f908 100644
--- a/bigbluebutton-html5/tests/puppeteer/sharednotes.test.js
+++ b/bigbluebutton-html5/tests/puppeteer/sharednotes.test.js
@@ -1,11 +1,17 @@
const SharedNotes = require('./notes/sharednotes');
describe('Shared notes', () => {
+ beforeEach(() => {
+ jest.setTimeout(30000);
+ });
+
test('Open Shared notes', async () => {
const test = new SharedNotes();
let response;
try {
await test.init();
+ await test.page1.closeAudioModal();
+ await test.page2.closeAudioModal();
response = await test.test();
} catch (e) {
console.log(e);
diff --git a/bigbluebutton-html5/tests/puppeteer/user.test.js b/bigbluebutton-html5/tests/puppeteer/user.test.js
index 7ae783f2fbe21510e7bc211a17ea3f70d0908334..91025cc63e3a2a8422c405a6474b77fcf1e43c99 100644
--- a/bigbluebutton-html5/tests/puppeteer/user.test.js
+++ b/bigbluebutton-html5/tests/puppeteer/user.test.js
@@ -3,11 +3,16 @@ const Status = require('./user/status');
const MultiUsers = require('./user/multiusers');
describe('User', () => {
+ beforeEach(() => {
+ jest.setTimeout(30000);
+ });
+
test('Change status', async () => {
const test = new Status();
let response;
try {
await test.init(Page.getArgs());
+ await test.closeAudioModal();
response = await test.test();
} catch (e) {
console.log(e);
@@ -22,11 +27,13 @@ describe('User', () => {
let response;
try {
await test.init();
+ await test.page1.closeAudioModal();
+ await test.page2.closeAudioModal();
response = await test.test();
} catch (err) {
console.log(err);
} finally {
- await test.close();
+ await test.close(test.page1, test.page2);
}
expect(response).toBe(true);
});
diff --git a/bigbluebutton-html5/tests/puppeteer/user/multiusers.js b/bigbluebutton-html5/tests/puppeteer/user/multiusers.js
index b6b7aebdfcc7e80f563d736e8e71228835c9ec7d..e86df4b17d55358125ab1c1fe70db5d05f41ac5d 100644
--- a/bigbluebutton-html5/tests/puppeteer/user/multiusers.js
+++ b/bigbluebutton-html5/tests/puppeteer/user/multiusers.js
@@ -46,9 +46,9 @@ class MultiUsers {
}
// Close all Pages
- async close() {
- await this.page1.close();
- await this.page2.close();
+ async close(page1, page2) {
+ await page1.close();
+ await page2.close();
}
async closePage(page) {
diff --git a/bigbluebutton-html5/tests/puppeteer/virtualizedlist/virtualize.js b/bigbluebutton-html5/tests/puppeteer/virtualizedlist/virtualize.js
index 1cd08e1918db9673fe2627fd5fd45411d6a9054b..93f61ae34e6c3e1f7ed37c736edb0aaea80d2e76 100644
--- a/bigbluebutton-html5/tests/puppeteer/virtualizedlist/virtualize.js
+++ b/bigbluebutton-html5/tests/puppeteer/virtualizedlist/virtualize.js
@@ -11,10 +11,12 @@ class VirtualizeList {
async init(meetingId) {
try {
await this.page1.init(Page.getArgs(), meetingId, { ...params, fullName: 'BroadCaster1' });
+ await this.page1.closeAudioModal();
await this.page1.waitForSelector('[data-test^="userListItem"]');
for (let i = 1; i <= parseInt(process.env.USER_LIST_VLIST_BOTS_LISTENING); i++) {
const viewerPage = new Page();
await viewerPage.init(Page.getArgs(), this.page1.meetingId, { ...params, fullName: `Viewer${i}`, moderatorPW: '' });
+ await viewerPage.closeAudioModal();
await this.pagesArray.push(viewerPage);
await this.page1.getMetrics();
diff --git a/bigbluebutton-html5/tests/puppeteer/webcam.test.js b/bigbluebutton-html5/tests/puppeteer/webcam.test.js
index a7fdf455720ea4ff4997eaeb548623e82745dff9..de311de7310e19a6d66ebc4aec7515ce6518518c 100644
--- a/bigbluebutton-html5/tests/puppeteer/webcam.test.js
+++ b/bigbluebutton-html5/tests/puppeteer/webcam.test.js
@@ -3,6 +3,10 @@ const Check = require('./webcam/check');
const Page = require('./core/page');
describe('Webcam', () => {
+ beforeEach(() => {
+ jest.setTimeout(30000);
+ });
+
test('Shares webcam', async () => {
const test = new Share();
let response;
diff --git a/bigbluebutton-html5/tests/puppeteer/webcam/check.js b/bigbluebutton-html5/tests/puppeteer/webcam/check.js
index 85af2504aa78f2507e96be83f64cbdcb5fcb15ed..cc6f986e58e155d56f77c1fd96cb989bcbc08168 100644
--- a/bigbluebutton-html5/tests/puppeteer/webcam/check.js
+++ b/bigbluebutton-html5/tests/puppeteer/webcam/check.js
@@ -3,12 +3,12 @@ const util = require('./util');
class Check extends Share {
constructor() {
- super('check-webcam-content');
+ super('webcam-check-content-test');
}
async test() {
- await util.enableWebcam(this.page);
- const respUser = await util.webcamContentCheck(this.page);
+ await util.enableWebcam(this);
+ const respUser = await util.webcamContentCheck(this);
return respUser === true;
}
}
diff --git a/bigbluebutton-html5/tests/puppeteer/webcam/elements.js b/bigbluebutton-html5/tests/puppeteer/webcam/elements.js
index d265160154120fe4846ccc7eb04b63c9f2e0182b..b63e4b4bbebef8ac6ef49ed33a5ccb1ad2569d2c 100644
--- a/bigbluebutton-html5/tests/puppeteer/webcam/elements.js
+++ b/bigbluebutton-html5/tests/puppeteer/webcam/elements.js
@@ -1,5 +1,6 @@
-exports.joinVideo = 'button[data-test="joinVideo"]';
-exports.videoPreview = 'video[data-test="videoPreview"]';
-exports.startSharingWebcam = 'button[data-test="startSharingWebcam"]';
-exports.videoContainer = 'video[data-test="videoContainer"]';
-exports.webcamConnecting = '[data-test="webcamConnecting"]';
+exports.joinVideo = 'button[aria-label="Share webcam"]';
+exports.videoPreview = 'video[id="preview"]';
+exports.startSharingWebcam = 'button[aria-label="Start sharing"]';
+exports.videoContainer = 'div[class^="videoListItem"]';
+exports.webcamConnecting = '[class^="connecting-"]';
+exports.presentationFullscreenButton = 'button[data-test="presentationFullscreenButton"]';
diff --git a/bigbluebutton-html5/tests/puppeteer/webcam/share.js b/bigbluebutton-html5/tests/puppeteer/webcam/share.js
index 42c52313814e0d69f5c2f37fa4c3d5144f0941f1..6f140550b2e9727e4e6e1f8a8157b34268067416 100644
--- a/bigbluebutton-html5/tests/puppeteer/webcam/share.js
+++ b/bigbluebutton-html5/tests/puppeteer/webcam/share.js
@@ -1,14 +1,14 @@
const Page = require('../core/page');
const util = require('./util');
-class Share extends Page{
+class Share extends Page {
constructor() {
- super('webcam-test');
+ super('webcam-share-test');
}
async test() {
- await util.enableWebcam(this.page);
- const response = await util.evaluateCheck(this.page);
+ await util.enableWebcam(this);
+ const response = await util.evaluateCheck(this);
return response;
}
}
diff --git a/bigbluebutton-html5/tests/puppeteer/webcam/util.js b/bigbluebutton-html5/tests/puppeteer/webcam/util.js
index c9a429d6a2c7a6165dcfa9e6e34b2ca4acaadd42..c2c84263dcae778112668700bd36ead9803ec2ee 100644
--- a/bigbluebutton-html5/tests/puppeteer/webcam/util.js
+++ b/bigbluebutton-html5/tests/puppeteer/webcam/util.js
@@ -3,20 +3,20 @@ const we = require('./elements');
async function enableWebcam(test) {
// Enabling webcam
await test.waitForSelector(we.joinVideo);
- await test.click(we.joinVideo);
+ await test.page.evaluate(clickTestElement, we.joinVideo);
await test.waitForSelector(we.videoPreview);
await test.waitForSelector(we.startSharingWebcam);
- await test.click(we.startSharingWebcam);
+ await test.page.evaluate(clickTestElement, we.startSharingWebcam);
}
-async function getTestElement(element) {
- (await document.querySelectorAll(element)[0]) !== null;
+async function getFullScreenWebcamButton(element) {
+ return await document.querySelectorAll(element)[1] !== null;
}
async function evaluateCheck(test) {
await test.waitForSelector(we.videoContainer);
- const videoContainer = await test.evaluate(getTestElement, we.presentationFullscreenButton);
- const response = videoContainer !== null;
+ const videoContainer = await test.page.evaluate(getFullScreenWebcamButton, we.presentationFullscreenButton);
+ const response = videoContainer !== false;
return response;
}
@@ -28,8 +28,7 @@ async function startAndCheckForWebcams(test) {
async function webcamContentCheck(test) {
await test.waitForSelector(we.videoContainer);
- await test.waitForFunction(() => !document.querySelector('[data-test="webcamConnecting"]'));
-
+ await test.elementRemoved(we.webcamConnecting);
const repeats = 5;
let check;
for (let i = repeats; i >= 1; i--) {
@@ -57,14 +56,18 @@ async function webcamContentCheck(test) {
}
};
- check = await test.evaluate(checkCameras, i);
- await test.waitFor(parseInt(process.env.LOOP_INTERVAL));
+ check = await test.page.evaluate(checkCameras, i);
+ await test.page.waitFor(parseInt(process.env.LOOP_INTERVAL));
}
return check === true;
}
+async function clickTestElement(element) {
+ document.querySelectorAll(element)[0].click();
+}
+
exports.startAndCheckForWebcams = startAndCheckForWebcams;
exports.webcamContentCheck = webcamContentCheck;
exports.evaluateCheck = evaluateCheck;
-exports.getTestElement = getTestElement;
+exports.getFullScreenWebcamButton = getFullScreenWebcamButton;
exports.enableWebcam = enableWebcam;
diff --git a/bigbluebutton-html5/tests/puppeteer/whiteboard.test.js b/bigbluebutton-html5/tests/puppeteer/whiteboard.test.js
index 7171126c448022f7885bf5f2f6171279965c0814..7dedf21410e72ca0eceae144a9b8d48468359ddc 100644
--- a/bigbluebutton-html5/tests/puppeteer/whiteboard.test.js
+++ b/bigbluebutton-html5/tests/puppeteer/whiteboard.test.js
@@ -2,11 +2,16 @@ const Page = require('./core/page');
const Draw = require('./whiteboard/draw');
describe('Whiteboard', () => {
+ beforeEach(() => {
+ jest.setTimeout(30000);
+ });
+
test('Draw rectangle', async () => {
const test = new Draw();
let response;
try {
await test.init(Page.getArgs());
+ await test.closeAudioModal();
response = await test.test();
} catch (e) {
console.log(e);
diff --git a/bigbluebutton-web/Dockerfile b/bigbluebutton-web/Dockerfile
index a980f59723ee51b198144ccc7e16ca46f36322f3..74a4d6837ff48e3ad577592b08f8a95405dd299f 100644
--- a/bigbluebutton-web/Dockerfile
+++ b/bigbluebutton-web/Dockerfile
@@ -2,7 +2,7 @@ FROM bbb-common-web AS builder
RUN mkdir -p /root/tools \
&& cd /root/tools \
- && wget http://services.gradle.org/distributions/gradle-2.12-bin.zip \
+ && wget https://services.gradle.org/distributions/gradle-2.12-bin.zip \
&& unzip gradle-2.12-bin.zip \
&& ln -s gradle-2.12 gradle
diff --git a/bigbluebutton-web/build.gradle b/bigbluebutton-web/build.gradle
index 51b1082fbfb2b4aa9f59b29b9ef2c681b8df01bc..08317a990b544f7b919da12a357674320ce5df1b 100755
--- a/bigbluebutton-web/build.gradle
+++ b/bigbluebutton-web/build.gradle
@@ -76,13 +76,9 @@ dependencies {
compile "org.freemarker:freemarker:2.3.28"
compile "com.google.code.gson:gson:2.8.5"
compile "org.json:json:20180813"
- compile "org.jodconverter:jodconverter-local:4.2.1"
+ compile "org.jodconverter:jodconverter-local:4.3.0"
compile "com.zaxxer:nuprocess:1.2.4"
compile "net.java.dev.jna:jna:4.5.1"
- compile "org.libreoffice:unoil:5.4.2"
- compile "org.libreoffice:ridl:5.4.2"
- compile "org.libreoffice:juh:5.4.2"
- compile "org.libreoffice:jurt:5.4.2"
// https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload
compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.4'
diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
index 9c0327a999bb952c5673a7fb61fba6a2ad3c5a57..0d79486ed4505e9c814558852dc1833ee16bfdd0 100755
--- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
+++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
@@ -48,6 +48,21 @@ presCheckExec=/usr/share/prescheck/prescheck.sh
# Office doc to PDF right away.
skipOfficePrecheck=true
+#----------------------------------------------------
+# Number of soffice processes that are running on this machine
+sofficeManagers=4
+
+#----------------------------------------------------
+# Port number of the first soffice process
+sofficeBasePort=8201
+
+#----------------------------------------------------
+# Working directory prefix for each soffice process.
+# The value of this is appended with the number of the
+# soffice process (starting at 1), padded to two digits
+# (e.g. /var/tmp/soffice_01 for the first process).
+sofficeWorkingDirBase=/var/tmp/soffice_
+
#----------------------------------------------------
# These will be copied in cases where the conversion process
# fails to generate a slide from the uploaded presentation
@@ -213,7 +228,7 @@ muteOnStart=false
allowModsToUnmuteUsers=false
# Saves meeting events even if the meeting is not recorded
-keepEvents=false
+keepEvents=true
#----------------------------------------------------
# This URL is where the BBB client is accessible. When a user sucessfully
@@ -261,6 +276,7 @@ apiVersion=2.0
# Salt which is used by 3rd-party apps to authenticate api calls
securitySalt=330a8b08c3b4c61533e1d0c5ce1ac88f
+
# Directory where we drop the <meeting-id-recorded>.done file
recordStatusDir=/var/bigbluebutton/recording/status/recorded
diff --git a/bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml b/bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
index 6658ebc5ef3987a60141af5273dbbf3514b746ac..e7bc7f34c408b550e5576ddc7e50d3a3fcf95311 100755
--- a/bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
+++ b/bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
@@ -39,6 +39,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
init-method="start" destroy-method="stop">
<property name="officeDocumentValidator" ref="officeDocumentValidator"/>
<property name="skipOfficePrecheck" value="${skipOfficePrecheck}"/>
+ <property name="sofficeBasePort" value="${sofficeBasePort:8201}"/>
+ <property name="sofficeManagers" value="${sofficeManagers:4}"/>
+ <property name="sofficeWorkingDirBase" value="${sofficeWorkingDirBase:/var/tmp/soffice_}"/>
</bean>
<bean id="pageExtractor" class="org.bigbluebutton.presentation.imp.PageExtractorImp"/>
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
index 6cec8cc2f2a4f0fae0b586c56e00efc2dcbc2105..94b49905d80adb4bbf36f3a3028c6f602bb80c12 100755
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -131,6 +131,20 @@ class ApiController {
return
}
+ // Ensure unique TelVoice. Uniqueness is not guaranteed by paramsProcessorUtil.
+ if (!params.voiceBridge) {
+ // Try up to 10 times. We should find a valid telVoice quickly unless
+ // the server hosts ~100k meetings (default 5-digit telVoice)
+ for (int i in 1..10) {
+ String telVoice = paramsProcessorUtil.processTelVoice("");
+ if (!meetingService.getNotEndedMeetingWithTelVoice(telVoice)) {
+ params.voiceBridge = telVoice;
+ break;
+ }
+ }
+ // Still no unique voiceBridge found? Let createMeeting handle it.
+ }
+
Meeting newMeeting = paramsProcessorUtil.processCreateParams(params)
if (meetingService.createMeeting(newMeeting)) {
@@ -162,6 +176,14 @@ class ApiController {
}
return
+ } else {
+ Meeting existingTelVoice = meetingService.getNotEndedMeetingWithTelVoice(newMeeting.getTelVoice());
+ Meeting existingWebVoice = meetingService.getNotEndedMeetingWithWebVoice(newMeeting.getWebVoice());
+ if (existingTelVoice != null || existingWebVoice != null) {
+ log.error "VoiceBridge already in use by another meeting (different meetingId)"
+ errors.nonUniqueVoiceBridgeError()
+ respondWithErrors(errors)
+ }
}
}
}
@@ -2103,6 +2125,10 @@ class ApiController {
uploadFailReasons.add("failed_to_download_file")
uploadFailed = true
}
+ } else {
+ log.error("Null presentation directory meeting=[${meetingId}], presentationDir=[${presentationDir}], presId=[${presId}]")
+ uploadFailReasons.add("null_presentation_dir")
+ uploadFailed = true
}
}
diff --git a/bigbluebutton-web/run.sh b/bigbluebutton-web/run.sh
index 80d6820071907209febf2817cbed963b30dc83f9..4772aea81fb55f6af79707f58516239b7f7a8340 100755
--- a/bigbluebutton-web/run.sh
+++ b/bigbluebutton-web/run.sh
@@ -1,2 +1,14 @@
#!/usr/bin/env bash
+IS_BBB_WEB_RUNNING=`netstat -an | grep LISTEN | grep 8090 > /dev/null && echo 1 || echo 0`
+
+if [ "$IS_BBB_WEB_RUNNING" = "1" ]; then
+ echo "bbb-web is running, exiting"
+ exit 1
+fi
+
+if [ "`whoami`" != "bigbluebutton" ]; then
+ echo "ERROR: bbb-web must run as bigbluebutton user ( because of the uploaded files permissions )"
+ exit 1
+fi
+
grails prod run-app --port 8090
diff --git a/record-and-playback/core/Gemfile b/record-and-playback/core/Gemfile
index 812234423eaeee8f3463c6e1e9505350ed6a8526..fb2092dc33c0c270d232900a7878c1522533dc10 100644
--- a/record-and-playback/core/Gemfile
+++ b/record-and-playback/core/Gemfile
@@ -34,6 +34,7 @@ gem 'redis', '~> 4.1'
gem 'rubyzip', '~> 2.0'
gem 'trollop', '2.1.3'
gem 'resque', '~> 2.0.0'
+gem 'bbbevents', '~> 1.2'
group :test, optional: true do
gem 'rubocop', '~> 0.79.0'
diff --git a/record-and-playback/core/Gemfile.lock b/record-and-playback/core/Gemfile.lock
index 7d3453290f1f531df8d1f5776856496d9ede1119..83ad2a8a428d52e8dc5da4ed2fd04b707b8540c7 100644
--- a/record-and-playback/core/Gemfile.lock
+++ b/record-and-playback/core/Gemfile.lock
@@ -2,12 +2,22 @@ GEM
remote: https://rubygems.org/
specs:
absolute_time (1.0.0)
+ activesupport (5.2.4.3)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 0.7, < 2)
+ minitest (~> 5.1)
+ tzinfo (~> 1.1)
ast (2.4.0)
+ bbbevents (1.2.0)
+ activesupport (~> 5.0, >= 5.0.0.1)
builder (3.2.4)
+ concurrent-ruby (1.1.6)
crass (1.0.6)
fastimage (2.1.7)
ffi (1.12.1)
fnv (0.2.0)
+ i18n (1.8.3)
+ concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
java_properties (0.0.4)
journald-logger (3.0.0)
@@ -19,6 +29,7 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mini_portile2 (2.4.0)
+ minitest (5.14.1)
mono_logger (1.1.0)
multi_json (1.14.1)
mustermann (1.1.1)
@@ -29,7 +40,7 @@ GEM
parallel (1.19.1)
parser (2.7.0.2)
ast (~> 2.4.0)
- rack (2.1.1)
+ rack (2.2.3)
rack-protection (2.0.8.1)
rack
rainbow (3.0.0)
@@ -59,8 +70,11 @@ GEM
rack (~> 2.0)
rack-protection (= 2.0.8.1)
tilt (~> 2.0)
+ thread_safe (0.3.6)
tilt (2.0.10)
trollop (2.1.3)
+ tzinfo (1.2.7)
+ thread_safe (~> 0.1)
unicode-display_width (1.6.1)
vegas (0.1.11)
rack (>= 1.0.0)
@@ -70,6 +84,7 @@ PLATFORMS
DEPENDENCIES
absolute_time (~> 1.0)
+ bbbevents (~> 1.2)
builder (~> 3.2)
fastimage (~> 2.1)
fnv (~> 0.2)
@@ -88,4 +103,4 @@ DEPENDENCIES
trollop (= 2.1.3)
BUNDLED WITH
- 2.0.2
+ 2.1.4
diff --git a/record-and-playback/core/lib/recordandplayback.rb b/record-and-playback/core/lib/recordandplayback.rb
index 0a5b1506f272785510a28323eb278bb93bf0e4cf..fed223b72a3c69102fe83d91fcd252ae0716d34a 100644
--- a/record-and-playback/core/lib/recordandplayback.rb
+++ b/record-and-playback/core/lib/recordandplayback.rb
@@ -201,7 +201,7 @@ module BigBlueButton
def self.add_tag_to_xml(xml_filename, parent_xpath, tag, content)
if File.exist? xml_filename
- doc = Nokogiri::XML(File.open(xml_filename)) {|x| x.noblanks}
+ doc = Nokogiri::XML(File.read(xml_filename)) {|x| x.noblanks}
node = doc.at_xpath("#{parent_xpath}/#{tag}")
node.remove if not node.nil?
diff --git a/record-and-playback/core/lib/recordandplayback/generators/events.rb b/record-and-playback/core/lib/recordandplayback/generators/events.rb
index f425b7d44ca1d6938050360cd0b8cd64fe691e5d..236c95d229215a7ed8768a3e6e008a833a2c9947 100755
--- a/record-and-playback/core/lib/recordandplayback/generators/events.rb
+++ b/record-and-playback/core/lib/recordandplayback/generators/events.rb
@@ -36,11 +36,11 @@ module BigBlueButton
userId = joinEvent.at_xpath("userId").text
#removing "_N" at the end of userId
- userId.gsub(/_\d*$/, "")
+ userId.gsub!(/_\d*$/, "")
participants_ids.add(userId)
end
- return participants_ids.length
+ participants_ids.length
end
# Get the meeting metadata
diff --git a/record-and-playback/core/lib/recordandplayback/workers/publish_worker.rb b/record-and-playback/core/lib/recordandplayback/workers/publish_worker.rb
index 1ee0da5bb723fa1c8b61c1f0aa1ccda8e7b67082..982e7d61fbe2a70a95e760688812f9549f82e190 100644
--- a/record-and-playback/core/lib/recordandplayback/workers/publish_worker.rb
+++ b/record-and-playback/core/lib/recordandplayback/workers/publish_worker.rb
@@ -60,7 +60,7 @@ module BigBlueButton
metadata_xml_path = "#{published_dir}/#{@format_name}/#{@full_id}/metadata.xml"
if File.exist?(metadata_xml_path)
begin
- doc = Hash.from_xml(File.open(metadata_xml_path))
+ doc = Hash.from_xml(File.read(metadata_xml_path))
playback = doc[:recording][:playback] unless doc[:recording][:playback].nil?
metadata = doc[:recording][:meta] unless doc[:recording][:meta].nil?
download = doc[:recording][:download] unless doc[:recording][:download].nil?
diff --git a/record-and-playback/core/lib/recordandplayback/workers/sanity_worker.rb b/record-and-playback/core/lib/recordandplayback/workers/sanity_worker.rb
index b5cdf533bbd7dc7e371ccea49b25db47c639c148..16e7e5874c7ed91c9316714b1fc4619df33e05a3 100644
--- a/record-and-playback/core/lib/recordandplayback/workers/sanity_worker.rb
+++ b/record-and-playback/core/lib/recordandplayback/workers/sanity_worker.rb
@@ -47,7 +47,10 @@ module BigBlueButton
FileUtils.touch(@sanity_fail)
end
- step_succeeded
+ # Avoid the regular process flow if it's a norecord meeting
+ process = !File.exist?(@archived_norecord)
+
+ step_succeeded && process
end
end
@@ -60,6 +63,7 @@ module BigBlueButton
super(opts)
@step_name = 'sanity'
@post_scripts_path = File.join(BigBlueButton.rap_scripts_path, 'post_archive')
+ @archived_norecord = "#{@recording_dir}/status/archived/#{@full_id}.norecord"
@sanity_fail = "#{@recording_dir}/status/sanity/#{@full_id}.fail"
@sanity_done = "#{@recording_dir}/status/sanity/#{@full_id}.done"
end
diff --git a/record-and-playback/core/scripts/post_events/post_events.rb.example b/record-and-playback/core/scripts/post_events/post_events.rb.example
new file mode 100644
index 0000000000000000000000000000000000000000..05bff3cfa1b1c6aa177cbe79ea69e91411fc328c
--- /dev/null
+++ b/record-and-playback/core/scripts/post_events/post_events.rb.example
@@ -0,0 +1,72 @@
+#!/usr/bin/ruby
+# encoding: UTF-8
+
+#
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+#
+# Copyright (c) 2020 BigBlueButton Inc. and by respective authors (see below).
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3.0 of the License, or (at your option)
+# any later version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+#
+
+require '../../core/lib/recordandplayback'
+require 'rubygems'
+require 'optparse'
+require 'yaml'
+
+require File.expand_path('../../../lib/recordandplayback', __FILE__)
+
+file = File.open('/var/log/bigbluebutton/post_events.log', File::WRONLY | File::APPEND | File::CREAT)
+logger = Logger.new(file, 'weekly' )
+logger.level = Logger::INFO
+BigBlueButton.logger = logger
+
+options = {}
+OptionParser.new do |opts|
+ opts.banner = 'Usage: ruby post_events/post_events.rb -m <meeting_id>'
+
+ opts.on('-m', '--meeting-id MEETING_ID', 'meeting_id (required)') do |m|
+ options[:meeting_id] = m
+ end
+end.parse!
+
+raise 'Missing required -m option.' if options[:meeting_id].nil?
+
+meeting_id = options[:meeting_id]
+
+# This script lives in scripts/post_events
+# while properties.yaml lives in scripts/
+props = YAML.safe_load(File.open('../../core/scripts/bigbluebutton.yml'))
+
+recording_dir = props['recording_dir']
+events_dir = props['events_dir']
+meeting_events_dir = "#{events_dir}/#{meeting_id}"
+process_dir = "#{recording_dir}/process/events/#{meeting_id}"
+
+#
+# Put your code here
+#
+BigBlueButton.logger.info("Post Events for [#{meeting_id}] starts")
+
+begin
+ raise 'events.xml file is missing from recording' unless File.exist?("#{meeting_events_dir}/events.xml")
+
+rescue => e
+ BigBlueButton.logger.info("Rescued")
+ BigBlueButton.logger.info(e.to_s)
+end
+
+BigBlueButton.logger.info("Post Events for [#{meeting_id}] ends")
+
+exit 0
diff --git a/record-and-playback/core/scripts/post_events/post_events_analytics_callback.rb b/record-and-playback/core/scripts/post_events/post_events_analytics_callback.rb
new file mode 100755
index 0000000000000000000000000000000000000000..d60bee9037d52b35d0b9b9e43b8cf208b007ad90
--- /dev/null
+++ b/record-and-playback/core/scripts/post_events/post_events_analytics_callback.rb
@@ -0,0 +1,193 @@
+#!/usr/bin/ruby
+# encoding: UTF-8
+
+#
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+#
+# Copyright (c) 2020 BigBlueButton Inc. and by respective authors (see below).
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3.0 of the License, or (at your option)
+# any later version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+#
+
+require '../../core/lib/recordandplayback'
+require 'bbbevents'
+require "java_properties"
+require "jwt"
+require 'net/http'
+require 'optparse'
+require 'rubygems'
+require 'socket'
+require 'yaml'
+
+require File.expand_path('../../../lib/recordandplayback', __FILE__)
+
+file = File.open('/var/log/bigbluebutton/post_events_analytics_callback.log', File::WRONLY | File::APPEND | File::CREAT)
+logger = Logger.new(file, 'weekly' )
+logger.level = Logger::INFO
+BigBlueButton.logger = logger
+
+options = {}
+OptionParser.new do |opts|
+ opts.banner = 'Usage: ruby post_events/post_events.rb -m <meeting_id>'
+
+ opts.on('-m', '--meeting-id MEETING_ID', 'meeting_id (required)') do |m|
+ options[:meeting_id] = m
+ end
+end.parse!
+
+raise 'Missing required -m option.' if options[:meeting_id].nil?
+
+meeting_id = options[:meeting_id]
+
+# This script lives in scripts/post_events
+# while properties.yaml lives in scripts/
+props = YAML.safe_load(File.open('../../core/scripts/bigbluebutton.yml'))
+
+recording_dir = props['recording_dir']
+events_dir = props['events_dir']
+meeting_events_dir = "#{events_dir}/#{meeting_id}"
+process_dir = "#{recording_dir}/process/events/#{meeting_id}"
+
+def send_data(analytics_url, secret, payload)
+ # Setup a token that expires in 24hrs
+ exp = Time.now.to_i + 24 * 3600
+ exp_payload = { :exp => exp }
+ token = JWT.encode exp_payload, secret, 'HS512', { typ: 'JWT' }
+
+ uri = URI.parse(analytics_url)
+ http = Net::HTTP.new(uri.host, uri.port)
+ http.use_ssl = (uri.scheme == 'https')
+
+ # Setup a request and attach our JWT token
+ request = Net::HTTP::Post.new(uri.request_uri, {
+ 'Content-Type' => 'application/json',
+ 'Authorization' => "Bearer #{token}",
+ 'User-Agent' => 'BigBlueButton Analytics Callback'
+ })
+
+ # Send out data as json body
+ request.body = payload.to_json
+
+ # Display debug results
+ #http.set_debug_output($stdout)
+
+ response = http.request(request)
+ code = response.code.to_i
+ BigBlueButton.logger.info(response.body)
+
+ if code < 200 || code >= 300
+ BigBlueButton.logger.info("Failed when calling #{uri.request_uri}")
+ else
+ BigBlueButton.logger.info("Success")
+ end
+end
+
+def format_analytics_data!(data)
+ tmp_metadata = data["metadata"]
+ array_keys = tmp_metadata.keys
+ array_keys.each { |item|
+ if item.start_with?("gl_")
+ tmp_metadata = tmp_metadata.tap { |hs|
+ hs.delete(item)
+ }
+ end
+ }
+
+ # Remove meeting id as we don't want it passed to 3rd party inside metadata
+ tmp_metadata.delete("meeting_id")
+
+ # Remove the internal meeting id generated by bbbevents gem
+ data = data.tap { |hs|
+ hs.delete("meeting_id")
+ }
+
+ # Convert CamelCase keys to snake_keys. This is done in bbbevents gem
+ # but we do it here too anyways.
+ tmp_metadata.deep_transform_keys! do |key|
+ k = key.to_s.underscore rescue key
+ k.to_sym rescue key
+ end
+
+ # Remove all internal user ids
+ attendees = data["attendees"]
+ attendees.each { |attendee|
+ attendee.delete("id")
+ }
+end
+
+#
+# Main
+#
+BigBlueButton.logger.info("Analytics Post Events for [#{meeting_id}] starts")
+
+begin
+ raise 'events.xml file is missing from recording' unless File.exist?("#{meeting_events_dir}/events.xml")
+
+ events_xml_path = "#{meeting_events_dir}/events.xml"
+ data_json_path = "#{meeting_events_dir}/data.json"
+
+ # Only process meetings that include analytics_callback_url
+ events_xml = File.open(events_xml_path, 'r') { |io| Nokogiri::XML(io) }
+ metadata = events_xml.at_xpath('/recording/metadata')
+
+ analytics_callback_url = metadata.attributes['analytics-callback-url']&.content
+ # analytics_callback_url = metadata.key?("analytics-callback-url") ? metadata["analytics-callback-url"].value : nil
+ unless analytics_callback_url.nil?
+ BigBlueButton.logger.info("Processing events for analytics...")
+
+ bbb_props = JavaProperties::Properties.new("/usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties")
+ secret = bbb_props[:securitySalt]
+ external_meeting_id = metadata.attributes['meetingId']&.content
+
+ # Parse the events.xml.
+ events_data = BBBEvents.parse(events_xml_path)
+
+ # Write JSON data to file.
+ File.open(data_json_path, 'w') do |f|
+ f.write(events_data.to_json)
+ end
+
+ json_file = File.open(data_json_path)
+ data = JSON.load(json_file)
+
+ format_analytics_data!(data)
+
+ data_version_format = "1.0"
+
+ payload = { version: data_version_format,
+ ext_meeting_id: external_meeting_id,
+ meeting_id: meeting_id,
+ data: data
+ }
+
+ # Convert CamelCase keys to snake_keys for the whole payload.
+ # This is a sledgehammer to force keys to be consistent.
+ payload.deep_transform_keys! do |key|
+ k = key.to_s.underscore rescue key
+ k.to_sym rescue key
+ end
+
+ BigBlueButton.logger.info(payload.to_json)
+
+ send_data(analytics_callback_url, secret, payload)
+ end
+
+rescue => e
+ BigBlueButton.logger.info("Rescued")
+ BigBlueButton.logger.info(e.to_s)
+end
+
+BigBlueButton.logger.info("Analytics Post Events for [#{meeting_id}] ends")
+
+exit 0
diff --git a/record-and-playback/core/scripts/rap-process-worker.rb b/record-and-playback/core/scripts/rap-process-worker.rb
new file mode 100755
index 0000000000000000000000000000000000000000..d3082c865543518a537f3fd7205fdf2c90563fb9
--- /dev/null
+++ b/record-and-playback/core/scripts/rap-process-worker.rb
@@ -0,0 +1,164 @@
+#!/usr/bin/ruby
+# encoding: UTF-8
+
+# Copyright â“’ 2017 BigBlueButton Inc. and by respective authors.
+#
+# This file is part of BigBlueButton open source conferencing system.
+#
+# BigBlueButton is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BigBlueButton. If not, see <http://www.gnu.org/licenses/>.
+
+require '../lib/recordandplayback'
+require 'rubygems'
+require 'yaml'
+require 'fileutils'
+
+def process_archived_meetings(recording_dir)
+ sanity_done_files = Dir.glob("#{recording_dir}/status/sanity/*.done")
+
+ FileUtils.mkdir_p("#{recording_dir}/status/processed")
+ sanity_done_files.sort{ |a,b| BigBlueButton.done_to_timestamp(a) <=> BigBlueButton.done_to_timestamp(b) }.each do |sanity_done|
+ done_base = File.basename(sanity_done, '.done')
+ meeting_id = nil
+ break_timestamp = nil
+
+ if match = /^([0-9a-f]+-[0-9]+)$/.match(done_base)
+ meeting_id = match[1]
+ elsif match = /^([0-9a-f]+-[0-9]+)-([0-9]+)$/.match(done_base)
+ meeting_id = match[1]
+ break_timestamp = match[2]
+ else
+ BigBlueButton.logger.warn("Sanity done file for #{done_base} has invalid format")
+ next
+ end
+
+ step_succeeded = true
+
+ # Generate captions
+ ret = BigBlueButton.exec_ret('ruby', 'utils/captions.rb', '-m', meeting_id)
+ if ret != 0
+ BigBlueButton.logger.warn("Failed to generate caption files #{ret}")
+ end
+
+ # Iterate over the list of recording processing scripts to find available
+ # types. For now, we look for the ".rb" extension - TODO other scripting
+ # languages?
+ Dir.glob("process/*.rb").sort.each do |process_script|
+ match2 = /([^\/]*).rb$/.match(process_script)
+ process_type = match2[1]
+
+ processed_done = "#{recording_dir}/status/processed/#{done_base}-#{process_type}.done"
+ next if File.exists?(processed_done)
+
+ processed_fail = "#{recording_dir}/status/processed/#{done_base}-#{process_type}.fail"
+ if File.exists?(processed_fail)
+ step_succeeded = false
+ next
+ end
+
+ BigBlueButton.redis_publisher.put_process_started(process_type, meeting_id)
+
+ # If the process directory exists, the script does nothing
+ process_dir = "#{recording_dir}/process/#{process_type}/#{done_base}"
+ FileUtils.rm_rf(process_dir)
+
+ step_start_time = BigBlueButton.monotonic_clock
+ if !break_timestamp.nil?
+ ret = BigBlueButton.exec_ret('ruby', process_script,
+ '-m', meeting_id, '-b', break_timestamp)
+ else
+ ret = BigBlueButton.exec_ret('ruby', process_script, '-m', meeting_id)
+ end
+ step_stop_time = BigBlueButton.monotonic_clock
+ step_time = step_stop_time - step_start_time
+
+ if File.directory?(process_dir)
+ IO.write("#{process_dir}/processing_time", step_time)
+ end
+
+ step_succeeded = (ret == 0 and File.exists?(processed_done))
+
+ BigBlueButton.redis_publisher.put_process_ended(process_type, meeting_id, {
+ "success" => step_succeeded,
+ "step_time" => step_time
+ })
+
+ if step_succeeded
+ BigBlueButton.logger.info("Process format #{process_type} succeeded for #{meeting_id} break #{break_timestamp}")
+ BigBlueButton.logger.info("Process took #{step_time}ms")
+ else
+ BigBlueButton.logger.info("Process format #{process_type} failed for #{meeting_id} break #{break_timestamp}")
+ BigBlueButton.logger.info("Process took #{step_time}ms")
+ FileUtils.touch(processed_fail)
+ step_succeeded = false
+ end
+ end
+
+ if step_succeeded
+ post_process(meeting_id)
+ FileUtils.rm_f(sanity_done)
+ end
+ end
+end
+
+def post_process(meeting_id)
+ Dir.glob("post_process/*.rb").sort.each do |post_process_script|
+ match = /([^\/]*).rb$/.match(post_process_script)
+ post_type = match[1]
+ BigBlueButton.logger.info("Running post process script #{post_type}")
+
+ BigBlueButton.redis_publisher.put_post_process_started post_type, meeting_id
+
+ step_start_time = BigBlueButton.monotonic_clock
+ ret = BigBlueButton.exec_ret("ruby", post_process_script, "-m", meeting_id)
+ step_stop_time = BigBlueButton.monotonic_clock
+ step_time = step_stop_time - step_start_time
+ step_succeeded = (ret == 0)
+
+ BigBlueButton.redis_publisher.put_post_process_ended post_type, meeting_id, {
+ "success" => step_succeeded,
+ "step_time" => step_time
+ }
+
+ if not step_succeeded
+ BigBlueButton.logger.warn("Post process script #{post_process_script} failed")
+ end
+ end
+end
+
+begin
+ props = YAML::load(File.open('bigbluebutton.yml'))
+ redis_host = props['redis_host']
+ redis_port = props['redis_port']
+ redis_password = props['redis_password']
+ BigBlueButton.redis_publisher = BigBlueButton::RedisWrapper.new(redis_host, redis_port, redis_password)
+
+ log_dir = props['log_dir']
+ recording_dir = props['recording_dir']
+
+ logger = Logger.new("#{log_dir}/bbb-rap-worker.log")
+ logger.level = Logger::INFO
+ BigBlueButton.logger = logger
+
+ BigBlueButton.logger.debug("Running rap-process-worker...")
+
+ process_archived_meetings(recording_dir)
+
+ BigBlueButton.logger.debug("rap-process-worker done")
+
+rescue Exception => e
+ BigBlueButton.logger.error(e.message)
+ e.backtrace.each do |traceline|
+ BigBlueButton.logger.error(traceline)
+ end
+end
diff --git a/record-and-playback/presentation/scripts/process/presentation.rb b/record-and-playback/presentation/scripts/process/presentation.rb
index be381036acf276c9f68b974e7ca982d45fe83c0f..cad51610e52bb824fe0ef4ffbe390ab86facc04c 100755
--- a/record-and-playback/presentation/scripts/process/presentation.rb
+++ b/record-and-playback/presentation/scripts/process/presentation.rb
@@ -89,7 +89,7 @@ if not FileTest.directory?(target_dir)
FileUtils.mkdir_p processed_pres_dir
# Get the real-time start and end timestamp
- @doc = Nokogiri::XML(File.open("#{target_dir}/events.xml"))
+ @doc = Nokogiri::XML(File.read("#{target_dir}/events.xml"))
meeting_start = @doc.xpath("//event")[0][:timestamp]
meeting_end = @doc.xpath("//event").last()[:timestamp]
@@ -101,7 +101,7 @@ if not FileTest.directory?(target_dir)
# Add start_time, end_time and meta to metadata.xml
## Load metadata.xml
- metadata = Nokogiri::XML(File.open("#{target_dir}/metadata.xml"))
+ metadata = Nokogiri::XML(File.read("#{target_dir}/metadata.xml"))
## Add start_time and end_time
recording = metadata.root
### Date Format for recordings: Thu Mar 04 14:05:56 UTC 2010
@@ -195,7 +195,7 @@ if not FileTest.directory?(target_dir)
end
# Copy thumbnails from raw files
- FileUtils.cp_r("#{pres_dir}/thumbnails", "#{target_pres_dir}/thumbnails")
+ FileUtils.cp_r("#{pres_dir}/thumbnails", "#{target_pres_dir}/thumbnails") if File.exist?("#{pres_dir}/thumbnails")
end
BigBlueButton.logger.info("Generating closed captions")
@@ -243,7 +243,7 @@ if not FileTest.directory?(target_dir)
# Update state in metadata.xml
## Load metadata.xml
- metadata = Nokogiri::XML(File.open("#{target_dir}/metadata.xml"))
+ metadata = Nokogiri::XML(File.read("#{target_dir}/metadata.xml"))
## Update status
recording = metadata.root
state = recording.at_xpath("state")
diff --git a/record-and-playback/presentation/scripts/publish/presentation.rb b/record-and-playback/presentation/scripts/publish/presentation.rb
index c8902dfd957c07ef190f858232603032cfda7481..b86779583ea87bbe0052dea1962f48eac5a1609e 100755
--- a/record-and-playback/presentation/scripts/publish/presentation.rb
+++ b/record-and-playback/presentation/scripts/publish/presentation.rb
@@ -805,17 +805,20 @@ def events_get_image_info(slide)
slide[:text] = "presentation/#{slide[:presentation]}/textfiles/slide-#{slide[:slide] + 1}.txt"
end
image_path = "#{$process_dir}/#{slide[:src]}"
- if !File.exist?(image_path)
+
+ unless File.exist?(image_path)
BigBlueButton.logger.warn("Missing image file #{image_path}!")
# Emergency last-ditch blank image creation
FileUtils.mkdir_p(File.dirname(image_path))
- if slide[:deskshare]
- command = "convert -size #{$presentation_props['deskshare_output_width']}x#{$presentation_props['deskshare_output_height']} xc:transparent -background transparent #{image_path}"
- else
- command = "convert -size 1600x1200 xc:transparent -background transparent -quality 90 +dither -depth 8 -colors 256 #{image_path}"
- end
- BigBlueButton.execute(command)
+ command = \
+ if slide[:deskshare]
+ ['convert', '-size', "#{$presentation_props['deskshare_output_width']}x#{$presentation_props['deskshare_output_height']}", 'xc:transparent', '-background', 'transparent', image_path]
+ else
+ ['convert', '-size', '1600x1200', 'xc:transparent', '-background', 'transparent', '-quality', '90', '+dither', '-depth', '8', '-colors', '256', image_path]
+ end
+ BigBlueButton.exec_ret(*command) || raise("Unable to generate blank image for #{image_path}")
end
+
slide[:width], slide[:height] = FastImage.size(image_path)
BigBlueButton.logger.info("Image size is #{slide[:width]}x#{slide[:height]}")
end