BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,877 Commits 13 Branches 260 Tags 1.1 GiB
8855c996b8
Commit Graph

80 Commits

Author SHA1 Message Date
Anton Georgiev
52984d455a fix: handle case of freeJoin breakout with no users 2021-08-05 13:56:01 +00:00
Pedro Beschorner Marin
b23c1b411c Merge branch 'develop' into non-ascii-sorting 2021-04-08 21:55:30 -03:00
Pedro Beschorner Marin
6d717e1770 Extend user's name sorting to use non-ASCII characters 
Some languages rely on non-ASCII characters and this should be considered,
at least at name's sorting.
 2021-04-08 17:16:36 -03:00
Ramon Souza
5fe5705ac0 auto-reconnect webcam after leaving breakout room 2021-03-26 16:54:58 -03:00
Mario Jr
af4f9dbf26 Merge branch 'v2.2.x-release' into merge-2.2-develop 2021-03-23 17:10:28 -03: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
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
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
Mario Jr
ad23e9c0af Cleanup joinedAudioOnly state when user disconnects or reconnect microphone 
Fixes #11490
 2021-02-26 15:05:17 -03:00
Ramon Souza
cbb20b7375 resync breakout room timer 2021-02-26 11:09:44 -03: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
Anton Georgiev
adefc6a20c
Merge pull request #11341 from ramonlsouza/breakout-invitation-settings 
Add property to settings.yml to enable/disable breakout invitations to moderators
 2021-02-09 15:50:24 -05:00
Ramon Souza
54f983f250 stop screenshare on joining breakout room 2021-02-09 17:22:39 -03:00
Ramon Souza
a3780209f3 Add property to settings.yml to enable/disable breakout invitations to moderators 2021-02-08 14:40:03 -03:00
Anton Georgiev
0c7ead1916 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge 2020-10-21 14:48:02 +00:00
Pedro Beschorner Marin
d0645983f5 Fix the UI state on breakout room audio join 
Users must return their audio to the main room before joining a different one.
Since the audio transfer and the UI state manager doesn't provide a shortcut for
jumping from a breakout room to another, avoid making this opiton available.
 2020-10-07 09:23:13 -03:00
Anton Georgiev
377dc27a8d Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 09-16-merge 2020-09-17 14:37:28 +00:00
mvasylenko
7ba421cc4a Configurable max number of breakout rooms 
Use this wisely: breakoutRoomLimit parameter was introduced to controll max number of breakout rooms.
 2020-09-10 11:59:21 -03:00
KDSBrowne
77b71a4d1f fix duplicate css variables being loaded (improve imports) 2020-09-01 18:46:13 +00:00
Vitor Mateus De Almeida
34108014f9 Fix exceptions and layout size when panels change 2020-07-20 16:22:41 -03:00
Anton Georgiev
7535e6fa59
Revert "Create layout context and add a layout manager" 2020-07-15 12:44:59 -04:00
Anton Georgiev
b9b4490d8c
Merge branch 'develop' into layout 2020-07-14 10:32:24 -04:00
Vitor Mateus De Almeida
7f7e96ee79 Drop webcam when join a breakout room by clicking 'Join room' 2020-07-09 16:49:42 -03:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
Vitor Mateus De Almeida
2454440a8d Fix exceptions and layout size when panels change 2020-06-20 02:46:10 -03:00
Lucas Zawacki
3f16d894c3 Configurable ending time and alert values 2020-06-18 15:11:33 -03:00
Mohamed Amine Ben Salah
d2db75e9bb adds join Breakoutrooms Test Spec 2020-02-21 15:06:05 -03:00
Tainan Felipe
9fbd0a2be2 Show right breakout room in free join mode 2020-01-30 15:14:27 -03:00
Tainan Felipe
b0034308a3 Add a rule to don't show breakout invitation for moderators 2020-01-22 17:13:53 -03:00
KDSBrowne
e242d26f2d remove bold text from .joinedUserNames in breakoutroom panel 2019-11-04 15:08:44 +00:00
KDSBrowne
6b556c6d1b make audio exit when moderator joins breakoutroom via panel btn 2019-10-17 20:42:14 +00:00
Chad Pilkey
f8dedc1538 remove redundant lookups to Breakouts 2019-09-27 22:59:55 +00:00
Chad Pilkey
1695352300 Merge remote-tracking branch 'upstream/master' into fix-breakout-start-stop-notify 2019-09-27 22:40:38 +00:00
Chad Pilkey
64c3bcce13
Merge pull request #8158 from capilkey/bo-user-list 
List users in a breakout in the breakout panel
 2019-09-27 18:35:17 -04:00
Chad Pilkey
6a4cd316ed fix breakout panel bg and simplify sort 2019-09-27 22:33:18 +00:00
Tainan Felipe
9f360a3181 Add comma to join paramenter, key for breakout item and fix class typo 2019-09-27 16:45:55 -03:00
Chad Pilkey
0a9854aa59 fix issues related to breakouts start/stop and page reload 2019-09-18 13:11:25 -07:00
Joao Siebel
feec32313b Add key property to button 2019-09-18 17:00:32 -03:00
Joao Siebel
07ff12ce53 Prevent user to connect multiple times in a breakout room 
Disable the option to join a room in breakout room panel
if the user is already connected to the breakout room

close #8029
 2019-09-18 15:55:06 -03:00
Tainan Felipe
6b78a203b9 Fix typos and user list service export function 2019-09-18 09:32:00 -03:00
Tainan Felipe
4ebe787c76 Add breakout room members under the breakout room name 2019-09-17 16:36:39 -03:00
Chad Pilkey
7d04a33993 restore breakout name in invitation modal 2019-09-10 16:26:54 -07:00
Anton Georgiev
4a335a1db6 reduce db probes for getAvailableActions; simplify SaveUsernames 2019-09-06 16:28:02 -04:00
Chad Pilkey
304bb2c103
Merge pull request #8030 from antobinary/chat-ids-2 
Reduced client load via slight refactor
 2019-09-05 13:23:37 -04:00
Anton Georgiev
c5856d43c8 moved static code outside of tracker 2019-09-04 14:32:58 -04:00
Anton Georgiev
841e04fa0f pass count of breakout users rather than calculate on component 2019-08-30 16:14:42 -04:00
KDSBrowne
e535d890d0 switch to moderator_action to user_action 2019-08-28 20:42:55 +00:00
Anton Georgiev
892336632f added "fields:{...}", removed most mapUser 2019-08-28 16:32:55 -04:00