BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,997 Commits 13 Branches 260 Tags 1.1 GiB
c57c45399c
Commit Graph

5713 Commits

Author SHA1 Message Date
Anton Georgiev
e673fb2cf4
Merge pull request #11630 from prlanzarin/u23-sculptor 
listenonly,video-provider,screenshare: remove ICE gathering pre-flight check
 2021-03-12 12:58:43 -05:00
Pedro Beschorner Marin
dbb19b79a4 Avoid guest policy change inside breakout rooms 2021-03-12 09:56:04 -03:00
Pedro Beschorner Marin
af64232e45 Change guest policy 2021-03-12 09:19:22 -03:00
Anton Georgiev
9f841bd64b
Merge pull request #11622 from prlanzarin/u23-ilgiardino 
[screenshare] Rewrite SFU/Kurento screensharing bridge (+reconnections|audio sharing|QoL, was #11025)
 2021-03-12 05:13:11 -05:00
prlanzarin
ab17b10c38 listenonly,video-provider,screenshare: remove ICE gathering pre-flight check 2021-03-12 02:51:45 +00:00
prlanzarin
35f519206b Revert additional indentation to actions-bar component 
I must have messed this up in the 2.2 - 2.3 merge or with vim somehow, mea culpa
 2021-03-12 01:47:05 +00:00
prlanzarin
ef4ad8820d screenshare: adapt shutdown on breakout room joins, only stop sharers 
Adapted the breakout room screen sharing shutdown to use the new refactor calls

Also changed the behaviour a bit to only trigger the stop code for presenters/sharers, mimicking the camera behaviour and not leaving viewer with stuck screens
 2021-03-12 01:31:46 +00:00
prlanzarin
775cbf4124 screenshare: move end alert sound to a reliable place 2021-03-12 00:44:38 +00:00
Anton Georgiev
a165d3a7e3
Merge pull request #11606 from prlanzarin/u22-sadl1 
video-provider: add video pagination UI toggle (was #10970)
 2021-03-11 16:05:33 -05:00
Mohamed Amine Ben Salah
5fe7a18db4 Merge remote-tracking branch 'upstream/develop' into update-and-add-polling-specs 2021-03-11 17:38:49 -03:00
Ramon Souza
17cfd8c9bd fix guest openPanel 2021-03-11 17:00:54 -03:00
Ramon Souza
55a2bc2d02 fix captions openPanel 2021-03-11 16:12:35 -03:00
prlanzarin
7eb91f9273 Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino 2021-03-11 18:49:14 +00:00
Anton Georgiev
73979f1cba
Merge pull request #11621 from ramonlsouza/fix-captions 
Fix locales url settings + captions locales order
 2021-03-11 13:44:56 -05:00
Ramon Souza
150bedf16d fix locales url settings + captions locales order 2021-03-11 15:33:48 -03:00
Anton Georgiev
8a640877b2
Merge pull request #11611 from BrentBaccala/audio-prompt 
don't prompt for "Microphone" if that's the only option presented to the user
 2021-03-11 13:27:31 -05:00
Anton Georgiev
9cc78ca4a5
Merge pull request #11620 from ramonlsouza/issue-11578 
Submit typed polling response by pressing enter
 2021-03-11 13:01:22 -05:00
Anton Georgiev
6a96bbfb93
Merge pull request #11612 from prlanzarin/u23-planF 
video-provider: add inbound/recvonly video reconnection (was #11233)
 2021-03-11 13:00:14 -05:00
Ramon Souza
15fccf0ba1 submit typed polling response by pressing enter 2021-03-11 14:45:48 -03:00
Tainan Felipe
87ebdbd02a Merge remote-tracking branch 'upstream/develop' into fix-chat-issues 2021-03-11 10:07:16 -03:00
Tainan Felipe
1c21fcc4ff Fix loading on clear 2021-03-11 10:02:16 -03:00
prlanzarin
d00e8e0436 Merge remote-tracking branch 'origin/develop' into u22-sadl1 2021-03-11 12:31:10 +00:00
Mohamed Amine Ben Salah
36ba0c5bb6 Merge remote-tracking branch 'upstream/develop' into update-and-add-polling-specs 2021-03-11 09:16:55 -03:00
Ramón Souza
0105373cee
Applies changes needed to serve locale files as static content (#11234) 
* moving locales folder to /public and applying changes needed to serve locales as static files

* better dev/prod check

* transifex pull script changes to match new locales directory + ignore locales with less than 100 lines

* fix local/prod locales path

* merge fallback messages

* applies new locale changes to legacy client

`bbb-html5.nginx` file content should also be changed to the following:

```
location /html5client/locales {
  alias /usr/share/meteor/bundle/programs/web.browser/app/locales;
}

location /html5client/compatibility {
  alias /usr/share/meteor/bundle/programs/web.browser/app/compatibility;
}

location /html5client/resources {
  alias /usr/share/meteor/bundle/programs/web.browser/app/resources;
}

location /html5client/svgs {
  alias /usr/share/meteor/bundle/programs/web.browser/app/svgs;
}

location /html5client/fonts {
  alias /usr/share/meteor/bundle/programs/web.browser/app/fonts;
}

location /html5client {
  # proxy_pass http://127.0.0.1:4100; # use for development
  proxy_pass http://poolhtml5servers; # use for production
  proxy_http_version 1.1;
  proxy_set_header Upgrade $http_upgrade;
  proxy_set_header Connection "Upgrade";
}
```
 2021-03-11 06:42:41 -05:00
Brent Baccala
e5e3b5532b don't prompt for "Microphone" if that's the only option presented to the user 2021-03-10 16:44:41 -05:00
Anton Georgiev
c280769ebf
Merge pull request #11559 from MaximKhlobystov/dragndrop-poll-23 
Editing poll options via drag and drop
 2021-03-10 16:40:00 -05:00
Anton Georgiev
a630099cc6
Merge pull request #11595 from ramonlsouza/presentation-container-fix 
Fixes presentation invisible box appearing if presentation is hidden
 2021-03-10 16:37:53 -05:00
prlanzarin
f9f58cb91d video-provider: make sure the provider is unmounted if meteor disconnects 
This is a workaround that shaves off some edge cases around wrongfully done camera reconnections and outbound cameras getting stuck in the UI even though they arent being shared anymore
 2021-03-10 20:21:08 +00:00
prlanzarin
db15d1b280 video-provider: fix setReconnectionTimeout race condition that caused webcams to drop 
Problem: setReconnectionTimeout was being called in the first candidate generation to set the negotiation/reconnection timeout up. That caused some browsers or specific scenarios (mainly envs without STUN) to establish the negotiation (playStart) before generating any useful out-of-band candidates (relay). That would cause the timeout to be set AFTER it is supposed to be cleared due to success (playStart), making the webcam drop after a while

So I moved the setReconnectionTimeout call to a safer spot: right after the first negotiation requisition goes out to bbb-webrtc-sfu
 2021-03-10 20:09:55 +00:00
prlanzarin
6418d0f556 video-provider: more logging improvements, clean up playStart restart timers reset 2021-03-10 20:09:00 +00:00
prlanzarin
f85b5dfa5b video-provider: quick logging cleanup 
Reduce logging volume and payload size, perf
 2021-03-10 20:08:40 +00:00
prlanzarin
ee142501ab video-provider: fix inbound/recvonly video reconnection 2021-03-10 20:08:29 +00:00
Pedro Beschorner Marin
c120dc2859 Avoid dispatching fallback error toast message 
There's some scenarios that video errors triggers multiple toast notifications
that don't have any mapped defined message feedback so they all drop to the default
permission error. This leaves the impression that something is broken at the toast
container.

Since those messages don't bring up much information about the problem we can avoid sending
them until we don't have a more informative one to notify the user.
 2021-03-10 19:47:25 +00:00
prlanzarin
cf8b5e422f video-provider: add pagination settings toggle 2021-03-10 18:44:23 +00:00
Maxim Khlobystov
619c5ed176 Make the poll drag and drop feature optional 2021-03-10 18:23:25 +00:00
Anton Georgiev
bbec7efb57
Merge pull request #11593 from pedrobmarin/2.3-lobby-message 
Add guest lobby messages
 2021-03-10 11:35:35 -05:00
Ramon Souza
45421b1276 fix an error that might happen if PR 11529 is applied to an ongoing meeting 2021-03-10 09:16:31 -03:00
Anton Georgiev
65fd2d434a
Merge pull request #11584 from ramonlsouza/issue-9856 
When a moderator ends a meeting, indicate to viewers who ended the meeting
 2021-03-10 05:59:43 -05:00
Tainan Felipe
927e2167bc Re-implements chat sync and clear 2021-03-09 17:52:20 -03:00
Ramon Souza
4445d4e309 fix invisible box appearing if presentation is hidden 2021-03-09 16:43:51 -03:00
Pedro Beschorner Marin
0365018e92 Add guest lobby messages 
Moderators are able to send a message to the meeting's guest lobby. This new
event reaches bbb-web and is sent to the guest user with her/his status response
while polling. All guest users that are waiting for acceptance will be able to
read this message.

enableGuestLobbyMessage is disabled by default.
 2021-03-09 11:02:25 -03:00
Mohamed Amine Ben Salah
982ddc56a1 adds YNA and UR polling cases 2021-03-08 18:11:36 -03:00
Ramon Souza
826c420788 update meetingEndedBy with information coming from bbb core 2021-03-08 16:45:09 -03:00
Ramon Souza
0a09112f80 split end meeting message in two parts 2021-03-08 16:14:09 -03:00
Ramon Souza
78095f830d 'active users' message change on ending meeting 2021-03-08 15:11:31 -03:00
Mario Jr
1c7c1d5076 Change breakout-audio-transfer-status function signature 
We now update breakout'a audio transfer status by using an object
 2021-03-08 14:55:15 -03:00
Mario Jr
ff6cba8d53 Store information about user status during breakout room audio transfer 
Currently this information is lost everytime breakout-room component is
unmounted, causing the panel to shows wrong information during next renders
Fixes #11333
 2021-03-08 14:55:05 -03:00
Ramon Souza
c9ac737207 display name of the user who ended the meeting 2021-03-08 13:05:33 -03:00
Ramon Souza
2923ea1641 fix 'restore presentation' button when presentation is disabled 2021-03-08 09:33:25 -03:00
Mohamed Amine Ben Salah
620183d5d3 added True/False, A/B/C/D polling cases WIP 2021-03-07 20:53:58 -03: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
Mario Jr
39780c6a50 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-03-05 00:23:20 -03:00
Mario Jr
c0625e2ee1 Cleanup joinedAudioOnly state when user disconnects or reconnect microphone 
Fixes #11490
 2021-03-05 00:06:19 -03:00
Mario Jr
e16566de9d Recover mute state for moderator when returning from breakout's audio transfer 
Fixes #11489
 2021-03-05 00:02:31 -03: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
Maxim Khlobystov
e3ec0da0a9 Deleted unused code left from the 2.2 implementation of the drag and drop for poll options 2021-03-04 22:04:38 +00: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
Maxim Khlobystov
e8229726f2 Make the drag-and-drop properly work with 2.3 polling 2021-03-04 19:43:43 +00:00
gersti07
3fae071001 Update styles.scss 2021-03-04 19:26:18 +00:00
gersti07
885a8f2598 improved button style 2021-03-04 19:25:53 +00:00
gersti07
09e8e7353d removed unused code 2021-03-04 19:25:22 +00:00
gersti07
dd68990c7b removed unused code from styles.scss 2021-03-04 19:24:47 +00:00
gersti07
6011eb524a refactor drag handling 2021-03-04 19:24:07 +00:00
gersti07
b36042babd implemented add polloptions via drag and drop 
(merging with 2.3)
 2021-03-04 19:20:17 +00: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
Anton Georgiev
23e65e6f40
Merge pull request #11500 from ramonlsouza/mobile-whiteboard-fix 
Fix whiteboard use for iPad and other landscape mobile devices
 2021-02-25 08:54:04 -05:00
Anton Georgiev
2948eca9e9
Merge pull request #11502 from ramonlsouza/connection-status-modal 
Visual changes on connection status modal
 2021-02-25 08:42:48 -05:00
Ramon Souza
319ab71826 stats help url check + text center on connection modal 2021-02-25 10:14:09 -03:00
Ramon Souza
65ca979e7e fix whiteboard use for ipad and other landscape mobile devices 2021-02-25 08:15:20 -03:00
Anton Georgiev
875f9c1ca9
Merge pull request #11477 from KDSBrowne/bbb-10774 
Fix whiteboard text-area not allowing input on Firefox
 2021-02-24 10:20:36 -05:00
Ramon Souza
ea59f59376 fix many re-renders 2021-02-24 12:06:49 -03:00
Anton Georgiev
e0db693ffd
Merge pull request #11483 from ramonlsouza/issue-11445 
Add break-word to system messages
 2021-02-24 10:03:48 -05:00
Anton Georgiev
6472ff8533
Merge pull request #11480 from ramonlsouza/issue-11475 
Fix moderator welcome message closing border
 2021-02-24 08:56:21 -05:00
Ramon Souza
b66a7e20fd add break-word on system messages 2021-02-24 10:33:47 -03:00
Ramon Souza
bf914dd7ff fix moderator message closing border 2021-02-24 09:07:27 -03:00
KDSBrowne
d2c36c1c94 update handleClick condition (fix text-area for FireFox) 2021-02-24 02:05:23 +00:00
Mario Jr
19c1626c39 Do not return empty array when groupChats is empty 
Instead, return empty array when both users and groupChats arrays are empty.
The public chat and user chats may be active when groupChats array is empty.
Fixes #11476
 2021-02-23 17:52:19 -03:00
Anton Georgiev
416eb512e1
Merge pull request #11426 from Tainan404/fix-nav-bar-notification 
Fix nav-bar unread message indicator
 2021-02-23 13:53:16 -05:00
Anton Georgiev
3c4212cdb2
Merge pull request #10613 from hiroshisuga/fsshortcuthelp 
Shortcut help for toggle fullscreen
 2021-02-23 12:45:48 -05:00
Anton Georgiev
91b09418f7
Merge pull request #11471 from ramonlsouza/pr-11408 
Show polling button over the full-screened shared-screen
 2021-02-23 12:41:10 -05:00
Ramon Souza
08067e905f polling component also checks if screenshare is fullscreen 2021-02-23 14:04:00 -03:00
Anton Georgiev
4b1ae5e63f
Merge pull request #11398 from hiroshisuga/patch-18 
Enable arrow keys immediately after fullscreen
 2021-02-23 10:35:15 -05:00
Anton Georgiev
bfd564233d
Merge pull request #11468 from mariogasparoni/fix-11029 
Prevent ejecting user from them main room when leaving breakout room
 2021-02-23 10:22:03 -05:00
Ramon Souza
76c4bb6c85 Merge remote-tracking branch 'upstream/develop' into pr-11408 2021-02-23 11:35:21 -03:00
Anton Georgiev
777bf01e8b
Merge pull request #11451 from hiroshisuga/patch-23 
Show modals overlaid on full-screen slide or shared screen
 2021-02-23 09:18:50 -05:00
Mario Jr
2e92de8010 Clean up HTMLAudioElement used for notification sounds 
After ending the notification playback, we set the ".src" property to null, which immediately stop the internal player of mobile browser (tested on Chrome for Android -  device list is on #11458).
For the specific list of devices, this prevents the internal buffer error "-61" described in #11458.
Fixes #11458.
 2021-02-23 11:12:37 -03:00
Anton Georgiev
111109674e
Merge pull request #11247 from ramonlsouza/language-dropdown 
Reduces the number of options displayed on locale settings dropdown
 2021-02-22 15:44:29 -05:00
Ramon Souza
b01246f23f rework on echo test flow 2021-02-22 15:09:14 -03:00
Ramon Souza
11d924af70 fix bbb_skip_check_audio_on_first_join 2021-02-22 10:43:58 -03:00
hiroshisuga
f6b7ca779f
show modal over fullscreen 2021-02-22 18:30:33 +09:00
Anton Georgiev
0b6496618c Merge branch 'develop' of github.com:amguirado73/bigbluebutton into external-video-sync-lucas 2021-02-21 11:04:39 +00:00
Mario Jr
6508674d38 Prevent ejecting user from them main room when leaving breakout room 
When user observing changes, we must guarantee these changes are from main room, and not from breakout one.
Fixes #11029
 2021-02-21 01:07:25 -03:00
KDSBrowne
babaf1b578 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-per-user-wb 2021-02-21 00:04:36 +00:00
Anton Georgiev
100d089246
Merge pull request #11437 from ramonlsouza/new-poll-results 
Fix user-sent poll result messages
 2021-02-19 10:38:34 -05:00
Anton Georgiev
d3a33382fe
Propagate typo fix from #11432 
Needed for https://github.com/bigbluebutton/bigbluebutton/pull/11432
 2021-02-19 10:34:20 -05:00
Ramon Souza
043fa4bac8 fix user-sent poll result messages 2021-02-19 10:57:11 -03:00
Anton Georgiev
35ea07b4cd
Merge pull request #11429 from antobinary/feb18-merge 
Remove duplicate import of throttle
 2021-02-18 15:54:29 -05:00
Anton Georgiev
58be3d42ef remove duplicate import of throttle 2021-02-18 20:52:23 +00:00
Anton Georgiev
d30f0dc710
Merge pull request #11428 from antobinary/feb18-merge 
Merge 2.2 into 'develop'
 2021-02-18 15:46:45 -05:00
Anton Georgiev
b3b905fd40
Merge pull request #11420 from Tainan404/develop+pr10919+pr10838 
Fix user status in chat
 2021-02-18 15:44:13 -05:00
Anton Georgiev
55e8de4357 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb18-merge 2021-02-18 20:33:19 +00:00
Tainan Felipe
271736b30f Fix nav bar unread message indicator 2021-02-18 17:11:02 -03:00
Anton Georgiev
d686f0b04d
Merge pull request #11417 from KDSBrowne/bbb-11097 
Skip publishing poll annotation to whiteboard if presentation swapped
 2021-02-18 13:26:08 -05:00
Tainan Felipe
8825cd3789 remove uneeded log 2021-02-18 13:37:10 -03:00
KDSBrowne
9aff7ea22b add yes / no / abstention poll btn 2021-02-18 16:06:21 +00:00
Anton Georgiev
e966d6c7b6
Merge pull request #11366 from MaximKhlobystov/updating-poll-ui 
Updated poll UI: question field and typed responses
 2021-02-18 10:32:33 -05:00