BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,579 Commits 13 Branches 260 Tags 1.1 GiB
81dec8363a
Commit Graph

26579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Beckmann
c3f0447105 Integration of PR #9292 (by weeman1337) and PR #9658 (by mantridereso) 2020-05-26 15:07:37 +02:00
Anton Georgiev
f4742e8a9f
Merge pull request #9683 from KDSBrowne/issue-9679 
Fix non userData defined shortcuts not functioning
 2020-05-26 08:57:48 -04:00
KDSBrowne
4e68ea07fd fix non userData shortcuts not functioning 2020-05-26 12:12:57 +00:00
Fred Dixon
dc4cc11a8a Use the specified ESL password 2020-05-24 11:20:25 -05:00
Anton Georgiev
2f665bb114
Bump up to to a "safe" version number 2020-05-24 08:26:40 -04:00
Anton Georgiev
f3199c8292
Merge pull request #9662 from antobinary/do-not-return-on-missing-meetingId-in-header 
Logging with JSON stringify was leading to crashes. Reverting, need t…
 2020-05-24 08:25:35 -04:00
Anton Georgiev
4a38524778 Logging with JSON stringify was leading to crashes. Reverting, need to investigate further 2020-05-24 08:22:10 -04:00
Martin Beckmann
ea3926e8ef attempt to introduce an additional UserSettings parameter 'bbb_show_public_chat_on_login' as a co-parameter of 'bbb_show_participants_on_login' (the former intended to only have an effect if the latter is 'true') 2020-05-23 22:28:56 +02:00
Martin Beckmann
d6956a5516 test... 2020-05-23 21:43:26 +02:00
Martin Beckmann
f9c7c20d5a test... 2020-05-23 21:40:39 +02:00
Martin Beckmann
51d3b3a94d test... 2020-05-23 20:44:11 +02:00
Felipe Cecagno
fc95e052a6 Sort sanity files so it processes older recordings first 2020-05-23 01:28:43 -03:00
Fred Dixon
755d161393
Merge pull request #9597 from basisbit/patch-4 
Workaround for freeswitch clock out of sync problems
 2020-05-22 22:55:26 -04:00
Anton Georgiev
54fe878a05
Merge pull request #9643 from jfsiebel/save-settings-on-start 
Prevent userChangedLocalSettings call failing at start
 2020-05-22 14:52:50 -04:00
Joao Siebel
7d9f4c70ad Prevent userChangedLocalSettings call failing at start 2020-05-22 13:54:00 -03:00
Anton Georgiev
9afb42aadf
Merge pull request #9642 from KDSBrowne/remove-user-style-updates 
Update message / style for remove user confirmation
 2020-05-22 12:45:49 -04:00
KDSBrowne
03d0931c1c add style / message updates 2020-05-22 16:39:54 +00:00
Anton Georgiev
ede8d82384
Merge pull request #9641 from antobinary/locales-may-22 
Pulled HTML5 locales May 22, 2020
 2020-05-22 11:55:19 -04:00
Anton Georgiev
c9faef96c9 Pulled HTML5 locales May 22, 2020 2020-05-22 11:48:11 -04:00
Anton Georgiev
fdcccbbc29
Merge pull request #9640 from antobinary/ban-eject-user 
Distinguish between eject and ban for Remove user
 2020-05-22 11:37:11 -04:00
Anton Georgiev
b6194f96cb Add log in akka-apps to show whether user was banned or simply ejected 2020-05-22 11:12:19 -04:00
Anton Georgiev
ca9ae8d861 cleanup 2020-05-22 10:55:11 -04:00
KDSBrowne
afe995393e remove className 2020-05-22 10:47:22 -04:00
KDSBrowne
274335cc9d add checkbox toremove user modal 2020-05-22 10:47:03 -04:00
Anton Georgiev
e7917994d5 add banUser field in EjectUserFromMeetingCmdMsgBody 2020-05-22 10:45:28 -04:00
Anton Georgiev
aeeac803c7
Merge pull request #9620 from antobinary/simplify-publish 
Simplify the code used for promote-demote subscriptions
 2020-05-21 17:14:16 -04:00
Anton Georgiev
c290c9ee60 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into ban-eject-user 2020-05-21 16:54:31 -04:00
Anton Georgiev
1874cf8392 Add visuals for banning vs ejecting user 2020-05-21 16:40:08 -04:00
Anton Georgiev
b6524e66c7
Fix typo closing parenthesis 2020-05-21 15:11:11 -04:00
Anton Georgiev
e08ee31338
Merge pull request #9629 from KDSBrowne/issue-9569 
Update shared note item style
 2020-05-21 15:06:45 -04:00
Anton Georgiev
66f11468ac
Merge pull request #9631 from KDSBrowne/issue-9592 
Fix userData-shortcuts causing client crash
 2020-05-21 15:01:49 -04:00
Anton Georgiev
8609418cda
Merge pull request #9630 from KDSBrowne/issue-9543 
Change prompt message when screen share not supported
 2020-05-21 14:58:07 -04:00
Anton Georgiev
be81b20ff1
Merge pull request #9632 from antobinary/lock-breakouts 
Do not display "Lock viewers" option in breakouts
 2020-05-21 14:57:21 -04:00
Anton Georgiev
33156f8bc5 Do not display "Lock viewers" option in breakouts 2020-05-21 14:55:32 -04:00
KDSBrowne
51c3543826 fix shortcuts not working when helper is passed an array 2020-05-21 18:43:34 +00:00
Anton Georgiev
ead986e3e2
Merge pull request #9542 from prlanzarin/upstream-2.2-safari-ss 
Screenshare: add support on Safari 13+ and make constraints configurable
 2020-05-21 14:38:32 -04:00
Anton Georgiev
2d16e020d8
Merge pull request #9593 from lfzawacki/2.2-external-video 
Attempt to fix external video syncing
 2020-05-21 14:34:52 -04:00
KDSBrowne
8fc32bc7dc update message in media container 2020-05-21 18:26:47 +00:00
Anton Georgiev
92d7975978
Merge pull request #9619 from antobinary/modOnlyMessage 
Only provide modOnlyMessage to moderators
 2020-05-21 13:55:09 -04:00
Anton Georgiev
b972232c13
Merge pull request #9627 from ritzalam/separate-conf-num-with-space 
Format conference num
 2020-05-21 12:38:16 -04:00
Richard Alam
6943fef65c Format conference num 
- separate conf num with space instead of dash

 Initial work on more flexible formatting is being done in
  https://github.com/ritzalam/bigbluebutton/tree/format-voice-conf-number

 This just addresses complaints on mailing list that separating using '-'
 is confusing.
 2020-05-21 05:01:21 -07:00
Fred Dixon
684f8339ff
Merge pull request #9623 from prlanzarin/upstream-2.2-ssturn 
Refactor STUN/TURN fetch, remove 3rd party fallback STUNs, ...
 2020-05-21 06:38:16 -04:00
prlanzarin
2cba85e866 html5: refactor STUN/TURN fetch, add fallback STUN, fix deadlock in audio join 
Refactored STUN/TURN fetch to be done only once, when successful, per session and cache it in mem to avoid too many reqs. Current way is a bit dumb, this should increase reliability a bit more. The caching is configurable so folks who want to use very short lived TURN credentials can disable it

Add a fallback STUN config option to be used when the default STUN/TURN fetch fails

Clean the safari/no candidate generation pre flight check from 3rd party STUNs

Fix deadlock in audio join when STUN/TURN fetch failed
 2020-05-21 04:35:17 +00:00
prlanzarin
8eb6235b1e sip.js/kurento-utils: remove default 3rd party STUN servers 
Removing 3rd party default STUN servers from those dependencies as to prevent unexpected behaviour
 2020-05-21 04:31:40 +00:00
Anton Georgiev
5238d81193 Simplify the code used for promote-demote subscriptions 2020-05-20 17:07:36 -04:00
Anton Georgiev
201fa2902e Only provide modOnlyMessage to moderators. Promoted mod requires refresh to see it 2020-05-20 15:56:44 -04:00
Anton Georgiev
da9489c9dd
Merge pull request #9617 from pedrobmarin/guest-promotion 
Avoid guest promotion
 2020-05-20 10:57:34 -04:00
KDSBrowne
13cf0799a1 fix shortcuts passed as userData not activating 2020-05-20 13:47:04 +00:00
Pedro Beschorner Marin
73085ee88c Avoid guest promotion 2020-05-20 09:34:53 -03:00
Fred Dixon
facb235039
Merge pull request #9611 from bigbluebutton/ffdixon-patch-2 
Update bigbluebutton-release
 2020-05-19 17:56:15 -04:00