This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 05ec20a [OPENMEETINGS-2087] fixes issue #32 error 'https is required'
is displayed
05ec20a is described below
commit 05ec20ab184f4c0341e0f3d2c184731cc8a0effe
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Jul 18 22:01:17 2019 +0700
[OPENMEETINGS-2087] fixes issue #32 error 'https is required' is displayed
---
.../java/org/apache/openmeetings/web/app/Application.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_ar.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_bg.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_bn.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_ca.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_cs.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_da.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_de.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_el.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_es.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_fa.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_fi.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_fr.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_gl.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_he.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_hu.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_in.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_it.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_ja.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_ko.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_nl.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_pl.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_pt.properties.xml | 1 +
.../apache/openmeetings/web/app/Application_pt_BR.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_ru.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_sk.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_sv.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_th.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_tr.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_uk.properties.xml | 1 +
.../apache/openmeetings/web/app/Application_zh_CN.properties.xml | 1 +
.../apache/openmeetings/web/app/Application_zh_TW.properties.xml | 1 +
.../main/java/org/apache/openmeetings/web/room/VideoSettings.html | 1 +
.../src/main/java/org/apache/openmeetings/web/room/raw-settings.js | 6 ++++++
.../java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java | 5 +++++
.../src/test/java/org/apache/openmeetings/ldap/TestLdap.java | 2 +-
36 files changed, 45 insertions(+), 1 deletion(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index 81c47c4..bdc150f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Choose a file]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 810aa3a..3ada484 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[اختر ملف]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 47985a6..fd5aa18 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Избор на файл]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
index 654e9ce..8509ee6 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[একটি ফাইল নির্বাচন
করুন]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index 165fd9b..561b784 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Seleccioni un
fitxer]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 752f12c..0b912ff 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Vyber soubor]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index 4f81ba5..45ac3fc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Vælg en fil]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index 73bd6dd..3f41a5f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -1002,4 +1002,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="upload.dlg.choose.title"><![CDATA[Datei auswählen]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index 9e5bb8e..efd69bc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Επιλογή Αρχείου]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index f005460..54ecb42 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -995,4 +995,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Seleccione un
archivo]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index 42b6f62..0a50131 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -989,4 +989,5 @@ target="_blank">Custom Crypt Mechanism</a>
<entry key="upload.dlg.choose.title"><![CDATA[انتخاب یک فایل]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 6944831..1d9dd1f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Valitse
tiedosto]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 7860021..dc5d54b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Choisir un
fichier]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 090b672..6b0adc4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Seleccione un
ficheiro]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
index 81c47c4..bdc150f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Choose a file]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index 5a658b8..ece8d78 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -985,4 +985,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Fájl választás]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
index 310d094..927f887 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Pilih file]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index 35718b7..843dc73 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Scegli un file]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index 375b031..2eff887 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[フィル選択]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 706c8d1..d84768c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Choose a file]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 122b136..d6b6613 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Kies een
bestand]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 390a749..b8067d3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Wybierz plik]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index 0083106..d4c6809 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Escolha um
arquivo]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index 3487be6..06d769a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Escolha um
arquivo]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index 105df4c..aba4413 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Выбор файла]]></entry>
<entry
key="upload.dlg.convert.title"><![CDATA[Преобразование...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Настройки доски]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Камера/Микрофон
скорее всего не будут работать без HTTPS.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 79f1567..09e2d7c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Vybrať súbor]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 0d4a81f..c6d46a8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Välj en fil]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 9eafa62..889d34c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[เลือกไฟล์]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index b89c1bd..037e9bb 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Bir dosya seçin]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index 671df6d..b72d325 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -996,4 +996,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[Вибрати файл]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 6932941..d268c4e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[选择文件]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 5b60c91..83c0aac 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -997,4 +997,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="upload.dlg.choose.title"><![CDATA[選擇一個文件]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard
Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone
most probably will not work in insecure environment.]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
index 52bff8c..1186b1a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
@@ -94,6 +94,7 @@
<option id="settings-option-loading" value="-2"
data-class="ui-icon-refresh"><wicket:message key="230"/></option>
<option id="settings-option-disabled" value="-1"
data-class="ui-icon-closethick"><wicket:message key="159"/></option>
</select>
+ <div id="settings-https-required"><wicket:message
key="video.settings.https.required"/></div>
</div>
</wicket:panel>
</html>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index 1888847..9438788 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -1,4 +1,7 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
+if (window.hasOwnProperty('isSecureContext') === false) {
+ window.isSecureContext = window.location.protocol == 'https:' ||
["localhost", "127.0.0.1"].indexOf(window.location.hostname) !== -1;
+}
$.widget('openmeetings.iconselectmenu', $.ui.selectmenu, {
_renderItem: function(ul, item) {
ul.addClass('settings-menu');
@@ -403,6 +406,9 @@ var VideoSettings = (function() {
});
}
function _initDevices() {
+ if (window.isSecureContext === false) {
+ OmUtil.error($('#settings-https-required').text());
+ }
if (!navigator.mediaDevices ||
!navigator.mediaDevices.enumerateDevices) {
OmUtil.error('enumerateDevices() not supported.');
return;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java
index 463cd1b..7b8b26c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java
@@ -53,6 +53,11 @@ public abstract class AbstractWbPanel extends Panel {
return this;
}
+ /**
+ * This method have to be overridden to handle reload WB
+ *
+ * @param handler {@link IPartialPageRequestHandler} to perform
necessary actions
+ */
public void reloadWb(IPartialPageRequestHandler handler) {
//designed to be empty
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
index 6ac218b..4d4c9a9 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
@@ -128,7 +128,7 @@ public class TestLdap extends AbstractWicketTester {
}
@Test
- public void testSbndSessionLoginBadPassword() throws OmException {
+ public void testSbndSessionLoginBadPassword() {
LdapConfig cfg = CFG_MAP.get(CFG_SEARCH_BIND);
assertThrows(OmException.class, () ->
WebSession.get().signIn(USER1, BAD_PASSWORD, User.Type.ldap, cfg.getId()));
}
