Commit Graph

27152 Commits

Author SHA1 Message Date
Anton Georgiev
a3f01721fc
Update bigbluebutton-html5/imports/api/voice-users/server/publishers.js 2020-06-19 16:53:59 -04:00
Anton Georgiev
e7d3487b5d
Merge pull request #9878 from lfzawacki/ending-time-alerts
Make meeting/breakout ending time alerts configurable
2020-06-19 16:25:50 -04:00
Anton Georgiev
af21f695ee
Update bigbluebutton-html5/private/locales/en.json 2020-06-19 16:25:24 -04:00
Anton Georgiev
c23611ac01
Update bigbluebutton-html5/private/locales/en.json 2020-06-19 16:25:16 -04:00
Tainan Felipe
7ddaac38c1 Add implici true for wasMuted 2020-06-19 17:20:36 -03:00
Tainan Felipe
9fa1986611 Add implicit toggle for toggle voice call 2020-06-19 17:07:11 -03:00
Tainan Felipe
b504101827 Add a listener to voice user ejecting user from audion on socket disconnection 2020-06-19 16:40:50 -03:00
Anton Georgiev
511d9ad753
Merge pull request #9863 from daminebenq/notifications-test
bbb notifications automated test
2020-06-19 15:09:52 -04:00
Anton Georgiev
b32691152d
Merge pull request #9846 from daminebenq/custom-parameters-autotest
Custom parameters autotest
2020-06-19 13:59:40 -04:00
Anton Georgiev
6eb7d55163
Merge pull request #9828 from SRCF/patch1
Enable mirroring for video streams
2020-06-19 13:56:45 -04:00
Anton Georgiev
75cd8c2ea3
Merge pull request #9741 from jfsiebel/prevent-680-error-screen
Show correct screen when user leaves meeting
2020-06-19 13:30:17 -04:00
Anton Georgiev
789a7cb581
Merge pull request #9754 from KDSBrowne/issue-9451
Fix poll annotation error with large presentations
2020-06-19 13:25:36 -04:00
Anton Georgiev
4d23da4a57
Merge pull request #9755 from KDSBrowne/issue-9730
Close whiteboard toolbar sub menu on mousedown
2020-06-19 13:22:12 -04:00
Joao Siebel
e227ecca83 Merge remote-tracking branch 'upstream/v2.2.x-release' into prevent-680-error-screen 2020-06-19 14:06:49 -03:00
KDSBrowne
6cf519bfb4 add touch start event handler / update handleMouseDown 2020-06-19 16:37:48 +00:00
Anton Georgiev
3e774a75c7
Merge pull request #9771 from KDSBrowne/issue-9766
Fix poll vote not incrementing when - is used as a custom option
2020-06-19 11:09:47 -04:00
Anton Georgiev
566d95d17c
Merge pull request #9756 from KDSBrowne/issue-9731
Add debounce to talking indicator mute function
2020-06-19 10:59:07 -04:00
Anton Georgiev
cd96a2f484
Merge pull request #9753 from KDSBrowne/issue-9410
Handle userData autoSwap and hidePresentation params
2020-06-19 10:58:28 -04:00
Anton Georgiev
9c1d39b99e
Merge pull request #9873 from SRCF/patch-3
Fix regex issue in bbb-conf
2020-06-19 09:53:40 -04:00
Anton Georgiev
b68c79b8ea
Merge pull request #9885 from jfsiebel/ban-user-error-screen
Remove Log In back button in error screen
2020-06-19 09:29:28 -04:00
Joao Siebel
c8820da6fe Change text order 2020-06-19 10:01:30 -03:00
Joao Siebel
a6f3ea80be Clean code 2020-06-19 09:51:14 -03:00
Joao Siebel
38bad0a9d8 Remove button in ErrorScreen component 2020-06-19 09:49:07 -03:00
Anton Georgiev
9edf4b6a0c
Merge pull request #9757 from KDSBrowne/issue-9661
Prevent drag and drop of files closing session
2020-06-18 16:49:05 -04:00
Anton Georgiev
b786eb8f18
Merge pull request #9882 from antobinary/locales-2020-06-18
Pulled HTML5 locales on June 18, 2020
2020-06-18 16:41:12 -04:00
Anton Georgiev
0a0af871fc Pulled HTML5 locales on June 18, 2020 2020-06-18 20:39:25 +00:00
Lucas Zawacki
3f16d894c3 Configurable ending time and alert values 2020-06-18 15:11:33 -03:00
Lucas Zawacki
a586c7db55 Configuration for remaining time 2020-06-18 15:11:26 -03:00
Anton Georgiev
118990885c
Merge pull request #9876 from amassaro/centralize-clean-base-button-props
centralize base prop cleaning / deletion
2020-06-18 13:55:35 -04:00
amassaro
888fe0b040 centralize base prop cleaning / deletion 2020-06-18 08:47:52 -07:00
Joao Siebel
6ac739732c Remove button in error screen when user was banned 2020-06-18 12:12:22 -03:00
mw781
eb29e5b973 Remove trailing whitespace 2020-06-18 13:32:49 +01:00
mw781
fb031c1690 Fix regex issue with firewall troubleshooting 2020-06-18 13:31:10 +01:00
Anton Georgiev
0cb7759cb2
Merge pull request #9824 from jfsiebel/fix-banned-users-join-try
Prevent banned user from trying to validateAuthToken multiple times
2020-06-17 17:09:40 -04:00
Anton Georgiev
c33ed683f3
Merge pull request #9855 from pedrobmarin/fix-voice-bridge-compare
Fix voice bridge compare
2020-06-17 14:15:53 -04:00
Anton Georgiev
962dbf29dc
Merge pull request #9860 from KDSBrowne/issue-9853
Disable chat option with dial in users
2020-06-17 14:15:02 -04:00
Mohamed Amine Ben Salah
5668cf1668 updates and fixes notifications test 2020-06-17 12:29:43 -03:00
KDSBrowne
4386248c9b remove chat option for dial in users 2020-06-17 12:37:09 +00:00
Fred Dixon
44dcfc6e65
Merge pull request #9857 from SRCF/patch-2
Ensure that files are handled safely in recording scripts
2020-06-17 06:37:57 -04:00
mw781
f60059c983 Ensure that files are handled safely 2 2020-06-17 11:13:07 +01:00
mw781
fea0ff3204 Ensure that files are handled safely
This commit fixes an issue with reading and writing files.
File.open is used which means that a file will remain open
unless explicilty closed or the program exit. This doesn't work
for an NFS mount as the scripts try to "rm -rf" when the file
is still open. This commit fixes that by replacing all .opens
with .reads
2020-06-17 11:09:09 +01:00
Anton Georgiev
778695b4d9
Merge pull request #9758 from jfsiebel/clear-video-streams
Clear video streams collection
2020-06-16 16:20:56 -04:00
Pedro Beschorner Marin
de40885768 Define API's voice bridge error 2020-06-16 17:01:57 -03:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
Pedro Beschorner Marin
d8183b3abd Fix string compare 2020-06-16 16:28:27 -03:00
Anton Georgiev
8d27ec90bb
Merge pull request #9845 from lkiesow/external-video-sharing-note
Update Note About Sharing External Video
2020-06-16 08:46:12 -04:00
Lars Kiesow
91e629b453
Update Note About Sharing External Video
This patch updates the note about which external videos can be shared
by looking at what react-player supports. Most notably, external video
URLs are added.

This also fixes the misspelled name of Dailymotion.
2020-06-16 00:59:16 +02:00
mw781
2da9028c0b Extract constant for convenience 2020-06-15 21:51:46 +01:00
mw781
f4dc8d9d69 Fix critical issue with video-preview arguments
After the code to mirror the video-preview component was added
I noticed that I improperly used the userId property of an undefined
argument as the video-preview does not have a user as a prop. This
commit decouples the logic to verify if the webcam should be mirrored
and whether the webcam belongs to that user. In the latter, we verify
if the user parameter exists and use it in a conditional, otherwise
we simply return true (applies with the video preview component),
where there is only one video stream.
2020-06-15 21:49:00 +01:00
Mohamed Amine Ben Salah
b0b2602547 fixes audio test args 2020-06-15 17:00:35 -03:00