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 72d9e53 [OPENMEETINGS-2455] kurento, bcprov 72d9e53 is described below commit 72d9e53e1d84c35cc471f09a7fe91c66456b716c Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Fri Nov 6 10:05:42 2020 +0700 [OPENMEETINGS-2455] kurento, bcprov --- openmeetings-web/pom.xml | 4 ++-- .../web/pages/auth/ForgetPasswordDialog.java | 3 ++- .../org/apache/openmeetings/web/room/kurento-utils.js | 18 +++++++++--------- pom.xml | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml index 13e1695..97b3823 100644 --- a/openmeetings-web/pom.xml +++ b/openmeetings-web/pom.xml @@ -39,8 +39,8 @@ <id>mysql</id> <properties> <db>mysql</db> - <db_user>root</db_user> - <db_pass></db_pass> + <db_user>om_db_admin</db_user> + <db_pass>12345</db_pass> </properties> <dependencies> <dependency> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java index 7923aa2..845f086 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java @@ -29,6 +29,7 @@ import org.apache.openmeetings.core.mail.MailHandler; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.service.mail.template.ResetPasswordTemplate; +import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.common.Captcha; import org.apache.openmeetings.web.common.OmModalCloseButton; import org.apache.openmeetings.web.pages.ResetPage; @@ -185,7 +186,7 @@ public class ForgetPasswordDialog extends Modal<String> { String template = ResetPasswordTemplate.getEmail(resetLink); - mailHandler.send(email, getString("517"), template); + mailHandler.send(email, Application.getString("517"), template); // Application should be used here to fill placeholder } private class ForgetPasswordForm extends Form<String> { diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js index 7a1a416..0567c9a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js @@ -310,6 +310,10 @@ function WebRtcPeer(mode, options, callback) { if (useVideo) { pc.addTransceiver('video', { direction: 'recvonly' }); } + } else if (mode === 'sendonly') { + pc.getTransceivers().forEach(function (transceiver) { + transceiver.direction = 'sendonly'; + }); } if (typeof AdapterJS !== 'undefined' && AdapterJS.webrtcDetectedBrowser === 'IE' && AdapterJS.webrtcDetectedVersion >= 9) { var setLocalDescriptionOnSuccess = function () { @@ -461,10 +465,6 @@ function WebRtcPeer(mode, options, callback) { pc.addTrack(track, audioStream); }); } - var browser = parser.getBrowser(); - if (mode === 'sendonly' && (browser.name === 'Chrome' || browser.name === 'Chromium') && browser.major === 39) { - mode = 'sendrecv'; - } callback(); } if (mode !== 'recvonly' && !videoStream && !audioStream) { @@ -3241,7 +3241,7 @@ exports.parse = function(sdp) { },{"sdp-transform":14}],21:[function(require,module,exports){ /*! - * UAParser.js v0.7.21 + * UAParser.js v0.7.22 * Lightweight JavaScript-based User-Agent string parser * https://github.com/faisalman/ua-parser-js * @@ -3258,7 +3258,7 @@ exports.parse = function(sdp) { ///////////// - var LIBVERSION = '0.7.21', + var LIBVERSION = '0.7.22', EMPTY = '', UNKNOWN = '?', FUNC_TYPE = 'function', @@ -3732,7 +3732,7 @@ exports.parse = function(sdp) { ], [MODEL, [VENDOR, 'HTC'], [TYPE, TABLET]], [ /d\/huawei([\w\s-]+)[;\)]/i, - /(nexus\s6p|vog-l29|ane-lx1|eml-l29)/i // Huawei + /(nexus\s6p|vog-l29|ane-lx1|eml-l29|ele-l29)/i // Huawei ], [MODEL, [VENDOR, 'Huawei'], [TYPE, MOBILE]], [ /android.+(bah2?-a?[lw]\d{2})/i // Huawei MediaPad @@ -3827,9 +3827,9 @@ exports.parse = function(sdp) { /android.+(hm[\s\-_]*note?[\s_]*(?:\d\w)?)\s+build/i, // Xiaomi Hongmi /android.+(mi[\s\-_]*(?:a\d|one|one[\s_]plus|note lte)?[\s_]*(?:\d?\w?)[\s_]*(?:plus)?)\s+build/i, // Xiaomi Mi - /android.+(redmi[\s\-_]*(?:note)?(?:[\s_]*[\w\s]+))\s+build/i // Redmi Phones + /android.+(redmi[\s\-_]*(?:note)?(?:[\s_]?[\w\s]+))\s+build/i // Redmi Phones ], [[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, MOBILE]], [ - /android.+(mi[\s\-_]*(?:pad)(?:[\s_]*[\w\s]+))\s+build/i // Mi Pad tablets + /android.+(mi[\s\-_]*(?:pad)(?:[\s_]?[\w\s]+))\s+build/i // Mi Pad tablets ],[[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, TABLET]], [ /android.+;\s(m[1-5]\snote)\sbuild/i // Meizu ], [MODEL, [VENDOR, 'Meizu'], [TYPE, MOBILE]], [ diff --git a/pom.xml b/pom.xml index 7bd0e12..551633d 100644 --- a/pom.xml +++ b/pom.xml @@ -113,10 +113,10 @@ <logback.version>1.2.3</logback.version> <jetty.version>9.4.33.v20201020</jetty.version> <license.excludedScopes>test</license.excludedScopes> - <bcprov-jdk15on.version>1.66</bcprov-jdk15on.version> + <bcprov-jdk15on.version>1.67</bcprov-jdk15on.version> <mockito.version>3.6.0</mockito.version> <quartz.version>2.3.2</quartz.version> - <kurento.version>6.14.0</kurento.version> + <kurento.version>6.15.0</kurento.version> <jain-sip.version>1.2.307</jain-sip.version><!-- other versions are broken! --> <!-- Exclude all generated code --> <sonar.exclusions>file:**/generated-sources/**, file:**/jquery-ui.css, file:**/fabric.js, file:**/cssemoticons.js, file:**/adapter-latest.js, file:**/kurento-utils.js, file:**/NoSleep.js, file:**/fileinput*.js, file:**/MathJax.js, file:**/network.js</sonar.exclusions>