Michael Zinsmeister
81d5129084
Merge with upstream
2021-03-07 15:28:39 +01:00
Michael Zinsmeister
214b236701
Merge with upstream
2021-03-07 15:12:49 +01:00
hiroshisuga
190bde3320
Fix slide size problem at fullscreen <-> window-mode transition #2 ( #11540 )
...
Replaces the PR #10604 , which has been temporarily fixed a problem in 2.3a2, that is, the slide size gets crazy when turning on and off fullscreen mode. Since #10604 was just a workaround, I tried to fix it in a way making more sense.
### Closes Issue(s)
closes #10459 (already closed by #10604 ) and #10589
### Motivation
#10604 is fixing the problem by calling "slide change" event, although the slide has not been changed actually. I tried to fix the same problem by adding a "full screen change" event listener in the layout manager, which I think is more elegant.
2021-03-05 11:01:47 -05:00
Anton Georgiev
68cfcd0215
Merge pull request #11544 from pedrobmarin/guest-doorbell
...
Waiting users audio and push alerts
2021-03-05 09:13:29 -05:00
Anton Georgiev
01ca99208f
Merge pull request #11529 from ramonlsouza/issue-11071
...
Fix openPanel errors related to polling and shared notes
2021-03-05 09:01:45 -05:00
Ramon Souza
4d59f9d23e
fix new found errors
2021-03-05 10:49:28 -03:00
Anton Georgiev
c9bbcebe59
Revert "Add reconnection and sync handler"
2021-03-05 03:53:36 -05:00
Anton Georgiev
e89faec1cd
Revert "Fix clear chat for single message"
2021-03-05 03:51:07 -05:00
Anton Georgiev
5953f21196
Merge pull request #11558 from antobinary/march4-merge
...
Merge 2.2.[32..35] into 'develop'
2021-03-04 17:09:22 -05:00
Anton Georgiev
228bad03d5
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into march4-merge
2021-03-04 21:25:47 +00:00
Anton Georgiev
d5a7846020
Merge pull request #11550 from KDSBrowne/bbb-11291x2
...
Add avatar back to chat poll result message
2021-03-04 15:05:58 -05:00
Anton Georgiev
7b58f0b269
Merge pull request #11556 from ramonlsouza/quick-poll-fix
...
Quick poll improvements
2021-03-04 15:01:10 -05:00
Ramon Souza
ce5f0c04f3
changes to match issue #8197 tests
2021-03-04 15:00:21 -03:00
Anton Georgiev
c7f6b819a5
Merge pull request #11553 from Tainan404/issue-11530
...
Fix clear chat for single message
2021-03-04 12:22:00 -05:00
Tainan Felipe
51c45e1595
Fix crashing after second clean
2021-03-04 14:16:26 -03:00
Ramon Souza
47a21dfd98
quick poll fix
2021-03-04 13:34:23 -03:00
Tainan Felipe
21045abf16
Merge remote-tracking branch 'upstream/develop' into issue-11438
2021-03-04 11:29:01 -03:00
Tainan Felipe
b983c8e1b4
Fix clear chat for single message
2021-03-04 10:20:18 -03:00
Tainan Felipe
53a7abe4c6
Fix clear chat timeout
2021-03-04 10:09:18 -03:00
KDSBrowne
2880613138
add avatar to chat poll result message
2021-03-04 04:22:19 +00:00
Pedro Beschorner Marin
e08af4b43e
Include waiting users push alert in settings
...
Since we added audio alert notifications in settings controls there was an ampty
grid gap reserved for the push alerts.
2021-03-03 16:26:15 -03:00
Ramon Souza
0a1516c36e
fix svg width error
2021-03-03 15:59:34 -03:00
Pedro Beschorner Marin
e0bbe6e189
Using the correct constant value
2021-03-03 15:48:17 -03:00
Vitor Vanacor
1b218d4730
Change guest waiting bell debounce to throttle
...
Debounce could make the behaviour of "not always ringing when a guest
enters" feel "buggy". Throttle makes it clearer that it happens to
prevent it from ringing too frequently.
Also move Throttle time from magic number to constant for
a meaningful variable name.
2021-03-03 15:26:50 -03:00
Vitor Vanacor
f2e40d3286
guestWaitingAudioAlert moved to settings
2021-03-03 15:24:54 -03:00
Vitor Vanacor
55092a9de6
Use doorbell sound as waiting guest notification
2021-03-03 15:03:24 -03:00
Vitor Vanacor
d9007d2ce6
Add sound notification for waiting guest
...
Both debounce or throttle could be used to prevent a spammer from
annoying the moderators.
With debounce, a spammer won't even be noticed by the mods, but
there won't be new notifications for legit guests during the spam.
With throttle, a spammer could still annoy the mods, we would only make
the interval between notifications bigger.
It is a tradeoff. An ideal solution would be preventing spamming from
the same user, but probably unnecessarily complex.
2021-03-03 15:03:00 -03:00
Anton Georgiev
6c238dd240
Merge pull request #11537 from antobinary/backport-11477
...
Update handleClick condition (fix text-area for FireFox)
2021-03-02 15:02:02 -05:00
KDSBrowne
ccf12c268e
update handleClick condition (fix text-area for FireFox)
2021-03-02 14:55:51 -05:00
Anton Georgiev
eba2d0ab58
Merge pull request #11535 from pedrobmarin/etherpad-patch
...
Rework padIds and turn bbb-web pad aware
2021-03-02 14:48:34 -05:00
Anton Georgiev
17fa7ffea3
Merge pull request #11514 from daminebenq/add-tests-recording-to-video
...
Adds tests recording + updates some outdated tests + linting
2021-03-02 12:00:05 -05:00
Tainan Felipe
71e0ca9d92
Add sync and reconnection handler
2021-03-02 11:35:26 -03:00
Anton Georgiev
879c54981e
Merge pull request #11447 from antobinary/external-video-sync-lucas-amguirado73
...
External video events propagated through akka-apps
2021-03-02 08:53:09 -05:00
Ramon Souza
c1efb6e6b4
fix openPanel errors related to polling and shared notes
2021-03-02 09:36:44 -03:00
Mohamed Amine Ben Salah
8daa4443cb
Merge remote-tracking branch 'upstream/develop' into add-tests-recording-to-video
2021-03-01 18:47:35 -03:00
Mohamed Amine Ben Salah
2c9d8e4380
updates and adds specifications for polling
2021-03-01 18:47:08 -03:00
Anton Georgiev
f6147d4425
Merge pull request #11526 from ramonlsouza/issue-11354
...
Fix chat textarea resizing bug
2021-03-01 13:43:23 -05:00
Anton Georgiev
b6ead0baa4
Merge pull request #11524 from ramonlsouza/issue-11461
...
Fix chat messages timestamp
2021-03-01 13:37:59 -05:00
Ramon Souza
2dedf197e0
fix textarea resizing bug
2021-03-01 15:36:09 -03:00
Ramon Souza
984c3d515c
fix chat messages timestamp
2021-03-01 14:21:54 -03:00
Mario Jr
629b6c901c
Do not join microphone when user is already in breakout
...
Fixes #11511
Related to the feature implemented in c451666d52
2021-02-28 17:13:10 -03:00
Mario Jr
fc1401ab53
Do not try to recover mute state when joining listenonly
...
Prevent toggleMute api call to be called for listenonly
This has no effect to the end user, but avoids unnecessary server calls
2021-02-26 15:52:11 -03:00
Mario Jr
ad23e9c0af
Cleanup joinedAudioOnly state when user disconnects or reconnect microphone
...
Fixes #11490
2021-02-26 15:05:17 -03:00
Mohamed Amine Ben Salah
4dc679d000
Adds tests recording + updates some outdated tests + linting
2021-02-26 12:52:17 -03:00
Ramon Souza
cbb20b7375
resync breakout room timer
2021-02-26 11:09:44 -03:00
Pedro Beschorner Marin
d69ed72b54
Fixing eventName overriding
2021-02-26 01:03:05 +00:00
Lucas Fialho Zawacki
ddc7a974bf
Register external video playback events to Redis
2021-02-25 21:58:43 +00:00
Anton Georgiev
89057d64ce
Merge pull request #11505 from mariogasparoni/develop
...
Recover mute state for moderator when returning from breakout's audio transfer
2021-02-25 15:01:39 -05:00
Mario Jr
404d65d7a4
Recover mute state for moderator when returning from breakout's audio transfer
...
Fixes #11489
2021-02-25 15:38:41 -03:00
Ramon Souza
09fef2f139
fix for userlist menu on tablets
2021-02-25 14:18:12 -03:00
