ATTENTION: we are currently upgrading gitlabs storage backend for repositories. This may cause unavailability and in unlikely cases also data loss. Therefore, we recommend to keep local copies of all repos. Issues, Milestones, and other features of gitlab are not affected.

Commit 07ff03e9 authored by Joerg Domaschka's avatar Joerg Domaschka

Merge branch 'management-136' into v2.2.x

parents 86765020 9bd8954e
Pipeline #94974 canceled with stage
in 1 minute and 6 seconds
......@@ -216,6 +216,16 @@ allowModsToUnmuteUsers=false
# Saves meeting events even if the meeting is not recorded
keepEvents=false
# Timeout (millis) to remove a joined user after her/his left event without a rejoin
# e.g. regular user left event
# Default 60s
usersTimeout=60000
# Timeout (millis) to remove users that called the enter API but did not join
# e.g. user's client hanged between the enter call and join event
# Default 45s
enteredUsersTimeout=45000
#----------------------------------------------------
# This URL is where the BBB client is accessible. When a user sucessfully
# enters a name and password, she is redirected here to load the client.
......
......@@ -11,12 +11,15 @@ public:
appName: BigBlueButton (Ulm University) HTML5 Client
bbbServerVersion: 2.2
copyright: "©2020 BigBlueButton Inc., Ulm University 2020"
html5ClientBuild: 1032
html5ClientBuild: 1058
helpLink: https://www.uni-ulm.de/index.php?id=113758
lockOnJoin: true
cdn: ""
basename: "/html5client"
askForFeedbackOnLogout: false
# the default logoutUrl matches window.location.origin i.e. bigbluebutton.org for demo.bigbluebutton.org
# in some cases we want only custom logoutUrl to be used when provided on meeting create. Default value: true
allowDefaultLogoutUrl: true
allowUserLookup: false
enableNetworkInformation: true
enableLimitOfViewersInWebcam: true
......@@ -280,7 +283,7 @@ public:
callHangupMaximumRetries: 10
echoTestNumber: "echo"
relayOnlyOnReconnect: false
listenOnlyCallTimeout: 15000
listenOnlyCallTimeout: 25000
presentation:
defaultPresentationFile: default.pdf
panZoomThrottle: 32
......@@ -475,6 +478,8 @@ private:
version: Infinity
- browser: ie
version: Infinity
- browser: SamsungInternet
version: 10
- browser: safari
version: [12, 1]
- browser: mobileSafari
......
......@@ -2,12 +2,12 @@
set -x
CONTAINER_ID=b72b9637f8c3
OLD_HOSTNAME=1599f2348162
OLD_SALT=yQfxnrp7HY9t1YSaojFW76wAPDCmclhqtdwuKW6Q
OLD_IP=172.17.0.5
OLD_API_KEY=K0kmNge9yspYmr307lsUMHdiwnz8HGBAFxcFbxLntEZ6KvF49muPoJieKPt7L
OLD_ESL_PASSWORD=2ecc868167571ad9
CONTAINER_ID=5abbb801167f
OLD_HOSTNAME=06a2219cc7e2
OLD_SALT=VHvvFbiFjhYqKF8z7l2UnENYbLt0hy8j5tAywPpcl0
OLD_IP=172.17.0.13
OLD_API_KEY=lsXEMuGi388l1GbZyamwgfGYgkdSIWHdHz51XZtku5NKsLY6JcjcHf4tFjrD3
OLD_ESL_PASSWORD=bc4a30065fa1a264
LOCALDIR=$(dirname $0)
......
......@@ -215,6 +215,16 @@ allowModsToUnmuteUsers=false
# Saves meeting events even if the meeting is not recorded
keepEvents=false
# Timeout (millis) to remove a joined user after her/his left event without a rejoin
# e.g. regular user left event
# Default 60s
usersTimeout=60000
# Timeout (millis) to remove users that called the enter API but did not join
# e.g. user's client hanged between the enter call and join event
# Default 45s
enteredUsersTimeout=45000
#----------------------------------------------------
# This URL is where the BBB client is accessible. When a user sucessfully
# enters a name and password, she is redirected here to load the client.
......
......@@ -11,12 +11,15 @@ public:
appName: BigBlueButton HTML5 Client
bbbServerVersion: 2.2
copyright: "©2020 BigBlueButton Inc."
html5ClientBuild: 1032
html5ClientBuild: 1058
helpLink: https://bigbluebutton.org/html5/
lockOnJoin: true
cdn: ""
basename: "/html5client"
askForFeedbackOnLogout: false
# the default logoutUrl matches window.location.origin i.e. bigbluebutton.org for demo.bigbluebutton.org
# in some cases we want only custom logoutUrl to be used when provided on meeting create. Default value: true
allowDefaultLogoutUrl: true
allowUserLookup: false
enableNetworkInformation: false
enableLimitOfViewersInWebcam: false
......@@ -280,7 +283,7 @@ public:
callHangupMaximumRetries: 10
echoTestNumber: 'echo'
relayOnlyOnReconnect: false
listenOnlyCallTimeout: 15000
listenOnlyCallTimeout: 25000
presentation:
defaultPresentationFile: default.pdf
panZoomThrottle: 32
......@@ -475,5 +478,7 @@ private:
version: 50
- browser: electron
version: [0, 36]
- browser: SamsungInternet
version: 10
- browser: YandexBrowser
version: 19
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment