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

28738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Jr
9bc656d173 Merge remote-tracking branch 'origin/v2.2.x-release' into develop 2021-03-05 12:26:53 -03: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
859520fe2c
Merge pull request #11560 from mariogasparoni/backport-audio-improvements-from-2.3 
Backport audio improvements from 2.3
 2021-03-05 08:39:23 -05:00
Anton Georgiev
dc5357253e
Merge pull request #11563 from bigbluebutton/revert-11531-issue-11438 
Revert "Add reconnection and sync handler"
 2021-03-05 03:55:36 -05:00
Anton Georgiev
c9bbcebe59
Revert "Add reconnection and sync handler" 2021-03-05 03:53:36 -05:00
Anton Georgiev
26124deb49
Merge pull request #11562 from bigbluebutton/revert-11553-issue-11530 
Revert "Fix clear chat for single message"
 2021-03-05 03:53:15 -05:00
Anton Georgiev
e89faec1cd
Revert "Fix clear chat for single message" 2021-03-05 03:51:07 -05:00
Mario Jr
209b06db2e Avoid setting an unknown input deviceId 
Without 'exact' match, the browser fallbacks to the default inputDeviceId

This prevents the error (input device error)  when breakout is ended and we try
to skipCheck the microphone when user returns to main room (assuming the
user had the microphone active before joining breakout room).
 2021-03-05 00:33:54 -03: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
Aron Engineer
cae124aed7 feat: pubsub send and receive statuses added to health endpoint 2021-03-04 21:16:48 +00:00
Anton Georgiev
088c3cde44
Merge pull request #11533 from mariogasparoni/fix-11399 
Fix audio and push alerts for user join
 2021-03-04 15:47:17 -05: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
204b3c6fec add value to setState 2021-03-04 19:23:19 +00:00
gersti07
ae25bb4895 add locales 2021-03-04 19:22:13 +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
Anton Georgiev
5307f0807e
Merge pull request #11531 from Tainan404/issue-11438 
Add reconnection and sync handler
 2021-03-04 12:16:53 -05:00
Tainan Felipe
51c45e1595 Fix crashing after second clean 2021-03-04 14:16:26 -03:00
Tainan Felipe
51f073197b put enable to top 2021-03-04 14:10:08 -03:00
Ramon Souza
47a21dfd98 quick poll fix 2021-03-04 13:34:23 -03:00
Daniel Schreiber
b69754ec43 Merge branch 'grails-config' of github.com:schrd/bigbluebutton into grails-config 2021-03-04 16:30:38 +01: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
Fred Dixon
b5d1d2f159
Merge pull request #11549 from bigbluebutton/ffdixon-patch-5 
Bump to 2.2.35
 2021-03-03 20:53:27 -04:00
Fred Dixon
e60f6ca82e
Bump to 2.2.35 2021-03-03 20:52:22 -04:00
Fred Dixon
08ae7a0c97
Merge pull request #11547 from pedrobmarin/fix-401-pad-export 
Fix padId getter
 2021-03-03 19:49:26 -04:00
Pedro Beschorner Marin
f02384bb1f Fix padId getter 
Pad exporter uses this same location to serve pad's downloaded content
but the the match was failing because padId is not the last element
of the URL on that scenario.

Pattern follows /pad/p/<padID>[/export/(format)]?<query>.
 2021-03-03 20:36:19 -03:00
Anton Georgiev
fba6c3c505
Merge pull request #11532 from hiroshisuga/patch-25 
numUsersVideo being undefined breaks layout
 2021-03-03 16:23:49 -05:00
Anton Georgiev
27f3cd631c
Merge pull request #11543 from ramonlsouza/issue-11270-svg 
Fix svg width error
 2021-03-03 14:39:40 -05: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