Commit Graph

258 Commits

Author SHA1 Message Date
Ramón Souza
7145d37066 move toast component to common folder 2022-02-15 17:57:50 +00:00
Ramón Souza
1d1375b3cf move modal component to common folder 2022-02-15 15:54:55 +00:00
Ramón Souza
246e3b3e8f move button component to common folder 2022-02-14 20:20:50 +00:00
Joao Victor
e9cd895c29 Fix duplicated function 2022-02-11 13:45:55 -03:00
Joao Victor
45a873876f Add import and fix function call 2022-02-11 13:37:22 -03:00
Joao Victor
88930d6776 Rename function for logging 2022-02-11 13:32:02 -03:00
Joao Victor
3e7a44033b Move out rejoinAudio function to container 2022-02-11 13:27:34 -03:00
Joao Victor
5128a773a7 Mute user after rejoining audio 2022-02-10 09:30:43 -03:00
Joao Victor
9db73b8aac Fix error log and add some linting 2022-02-09 14:03:35 -03:00
Ramón Souza
dba04834c7 Merge remote-tracking branch 'upstream/v2.4.x-release' into 2524-feb08 2022-02-09 15:52:42 +00:00
Joao Victor
507ec568d2 Error handling and variable name change 2022-02-09 11:43:54 -03:00
Joao Victor
7fc8f91a61 Restore audio within main room after leaving breakout room 2022-02-09 10:09:27 -03:00
Anton Georgiev
68f9c36d8e
Merge pull request #14228 from gustavotrott/breakouts-message-to-all
feat: Send a chat message to all breakouts simultaneously
2022-02-03 10:25:20 -05:00
Gustavo Trott
38b256dba5 Remove unnecessary codes 2022-01-28 15:00:17 -03:00
Gustavo Trott
eb567eb106 Handle message to all breakouts sent 2022-01-28 14:41:10 -03:00
Anton Georgiev
46cb753c44 Merge branch 'dev-24-0125' of github.com:ramonlsouza/bigbluebutton into merge-jan-27 2022-01-27 16:03:12 +00:00
Gustavo Trott
759535eb62 Implements message to all breakout rooms 2022-01-26 17:02:38 -03:00
Ramón Souza
16cd3c4ebb Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125 2022-01-25 16:56:52 +00:00
Anton Georgiev
116b99e469
Merge pull request #14159 from antonbsa/tests-reorganization-and-fix-selectors
test: Improves organization, fixes selectors and adds/improves tests
2022-01-25 08:54:32 -05:00
Anton Georgiev
14c7baef21
refactor: Switch user_action logs from debug to info 2022-01-24 12:02:16 -05:00
Ramón Souza
115ba187b5 remove unused imports/variables 2022-01-24 13:12:37 +00:00
Anton
7f075be033 fix all test selectors 2022-01-20 10:03:18 -03:00
Ramón Souza
f6e65f58c5 merge 2.4 into develop and resolve conflicts - partial 2022-01-12 16:40:45 +00:00
Ramón Souza
dacbb7c0ef prevent multiple window open on breakout join 2021-12-13 17:37:09 +00:00
Gustavo Trott
54d510bae1 Merge remote-tracking branch 'upstream/develop' into fix-breakout-freejoin-assignments 2021-12-02 11:10:58 -03:00
Gustavo Trott
fe944c1bdb Fix breakouts assignments when freeJoin is true 2021-12-02 11:05:42 -03:00
Gustavo Trott
0b6ab8ccc7
Merge branch 'develop' into breakouts-n-groups-assignments-2.5 2021-11-25 11:16:34 -03:00
Ramón Souza
cbda4c24ae breakout room isPresenter calls rework 2021-11-23 16:41:37 +00:00
Gustavo Trott
a300b4c66d use the absolute path 2021-11-22 11:25:21 -03:00
Gustavo Trott
0458212531 Merge remote-tracking branch 'upstream/develop' into breakouts-n-groups-assignments-2.5 2021-11-19 16:16:00 -03:00
Anton Georgiev
542db847ff
Merge pull request #13574 from Tainan404/smooth-reconnection-25
Improve data structure to not break on reconnections
2021-11-17 15:55:21 -05:00
Gustavo Trott
8555187df3 Resolve conflicts with Develop branch 2021-11-11 14:02:03 -03:00
Gustavo Trott
e919e24b38 Auto assign breakout names and users using lastBreakout or groups 2021-11-11 10:10:31 -03:00
Ramón Souza
ea38609fc2 remove .scss files 2021-11-11 12:38:09 +00:00
Tainan Felipe
f5eef03f3f Improve data structure to not break on reconnections 2021-11-03 14:37:54 -03:00
Ramón Souza
7283bba818 convert breakout-room component 2021-10-28 17:26:15 +00:00
Anton Georgiev
719afa6cd2 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-14 15:14:22 +00:00
Anton Georgiev
24d672a832 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-14 15:13:17 +00:00
Anton Georgiev
0f05cd91a0
Merge pull request #13428 from antonbsa/add-stress-test-breakout-invitation
test: Add breakout room invitation stress test
2021-10-14 11:10:42 -04:00
Tainan Felipe
1de8e0779d Add server side reactivity to publications 2021-10-13 15:00:52 -03:00
Gustavo Trott
c2b3e0d263 Let bbb try to open BreakoutRoom link automatically 2021-10-07 11:25:33 -03:00
Gustavo Trott
e51cb3d723 Set label to generate BreakoutRoom url more friendly 2021-10-07 10:01:11 -03:00
Anton Barboza
fcd60a76b6 add brekout room invitation stress test 2021-10-06 17:19:46 -03:00
Anton Georgiev
59fc722529 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-23-24 2021-10-05 17:14:46 +00:00
Gustavo Trott
923045950d Small fix comparing old url insertedTime 2021-10-01 13:37:37 -03:00
Gustavo Trott
b07012df16 Removes prop users from BreakoutModel and add prop url_ instead 2021-10-01 13:19:01 -03:00
Gustavo Trott
be4f0bcebf Removes prop users from BreakoutModel and add prop url_ instead 2021-10-01 10:44:01 -03:00
Anton Barboza
5065166456 fix extend breakout rooms time button to attendee users 2021-09-27 17:08:45 -03:00
Anton Georgiev
aa2089887c Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.4 2021-09-25 14:59:22 +00:00
Ramon Souza
47a71a9f3f fix multiple getBreakoutURL calls - breakout join 2021-09-22 14:07:05 -03:00
Anton Georgiev
ab845b3078 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-rc-1-into-dev 2021-09-22 15:28:13 +00:00
KDSBrowne
4c6f84d954 update aria-label with room name 2021-09-11 16:01:50 +00:00
KDSBrowne
75073842fd move focus to breakout-room panel on open 2021-09-11 16:01:40 +00:00
Ramon Souza
098826c70a rename layout functions 2021-09-10 17:48:52 -03:00
Ramon Souza
981e707612 add selector to containers, remove old layoutContext + convert base component into function 2021-09-10 14:21:04 -03:00
Ramon Souza
829d62ddbb add different labels for when the user does not have breakout url 2021-09-03 08:52:42 -03:00
Tainan Felipe
fd917e3146 Fix pop-up blocking when joining a breakout room 2021-08-12 10:21:49 -03:00
Vitor Mateus De Almeida
145ca61d40 linting some files 2021-08-09 11:24:02 -03:00
Anton Georgiev
5cfb723e07 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into aug6-merge 2021-08-06 15:23:36 +00:00
Anton Georgiev
52984d455a fix: handle case of freeJoin breakout with no users 2021-08-05 13:56:01 +00:00
Vitor Mateus De Almeida
1b18977eac rename all NewLayout.. to Layout.. 2021-08-05 08:03:24 -03:00
Ramon Souza
d024ed0bad close breakout panel when breakouts end 2021-07-16 11:42:31 -03:00
Anton Georgiev
a432c365fc
Merge pull request #12758 from mariogasparoni/fix-8175
fix(audio): ending breakouts interrupts echo test
2021-07-14 13:04:43 -04:00
Gustavo Trott
5c602fd2b0
Merge branch 'develop' into breakoutrooms-set-name 2021-07-12 16:31:38 -03:00
Gustavo Trott
03d81fb987 Style improvements to avoid long breakout names break layout 2021-07-12 16:05:52 -03:00
Gustavo Trott
b81b669c92 Style improvements to avoid long breakout names break layout 2021-07-12 16:03:27 -03:00
Ramon Souza
efc15d89ae remove unused code 2021-06-23 16:52:52 -03:00
Ramon Souza
4535d5594b remove unused code in new Layout Manager 2021-06-18 09:09:46 -03:00
Gustavo Trott
37dea2215b Translates dynamically breakout room Names when default name is being used 2021-06-14 16:59:27 -03:00
Anton Georgiev
169670a36d
Merge branch 'develop' into breakoutrooms-set-name 2021-06-11 16:39:53 -04:00
Gustavo Trott
61b99b7f7b Adds possibility to give to breakout rooms a name 2021-06-11 16:06:56 -03:00
Gustavo Trott
5b579d3a16 Avoid extend breakout rooms time exceed parent meeting remaining time 2021-06-07 14:19:20 -03:00
Gustavo Trott
02ef1186be Avoid set negative values in Extend time for breakout rooms 2021-06-02 17:36:43 -03:00
Gustavo Trott
2551f71d7c
code fix: use 0 instead of string
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2021-06-02 16:16:35 -03:00
Gustavo Trott
fd2ef393ed Code fixes in Breakoutroom extend time parts 2021-06-02 15:38:26 -03:00
Gustavo Trott
a312557461 Adds extend breakout room time functionality 2021-06-02 15:29:40 -03:00
Mario Jr
8dc239df76 fix(audio): ending breakouts interrupts echo test
Closes #8175
2021-06-01 18:00:50 -03:00
Vitor Mateus De Almeida
047b573d10 Fix auto resize when open/close panels 2021-05-19 19:29:03 -03:00
Vitor Mateus De Almeida
1326f3f791 Add New Layout Manager 2021-05-17 17:25:07 -03: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
KDSBrowne
aaac4efd13 add logs for moderator audio actions 2019-08-21 17:38:04 +00:00
Joao Siebel
8f0783d34f update variable name 2019-06-26 13:29:34 -03:00
Joao Siebel
6aed3fd037 disabled other UI items 2019-06-24 15:06:02 -03:00
Diego Benetti
2845bec4c4 Creates component for breakout invitation 2019-06-07 10:49:50 -03:00
Tainan Felipe
83fba75652 Fix brakout showing wrong message in breakout start 2019-05-28 17:29:04 -03:00
Ghazi Triki
1f6326f7fd Change layout direction for RTL languages.
Update styles for RTL layout.
2019-05-14 14:17:19 +01:00
Tainan Felipe
0f08df23cb Fix breakout room with incorrect last state 2019-05-07 15:22:51 -03:00
Tainan Felipe
b43043e56c Fix breakout room notification with intial state wrong 2019-05-07 15:15:34 -03:00
Tainan Felipe
94e9a2518f Fix user count using users collection 2019-04-24 09:50:45 -03:00
KDSBrowne
83127bcdae fix animations not working on iOS 12.3 beta 2019-04-11 15:04:10 +00:00
Tainan Felipe
b4062b5056 Open breakout room in new tab automatically when request new join url 2019-04-04 14:40:07 -03:00
Tainan Felipe
c7a8e7715c Fix user counter in breakout room panel 2019-03-27 15:24:00 -03:00
Tainan Felipe
8a10657b83 Fix weird number in breakout user counter 2019-03-18 09:22:25 -03:00
Anton Georgiev
5fe8d6a2c0
Merge pull request #6930 from Tainan404/issue-6919
Fix few breakout  room bugs.
2019-03-14 13:05:54 -04:00
Anton Georgiev
718c32a615
Merge pull request #6889 from KDSBrowne/2.2-Edge-support-01
Fix whiteboard toolbar icons not rendering
2019-03-07 14:06:14 -05:00
Tainan Felipe
398c8c82c5 Fix get stcuked in generating url state 2019-03-07 10:21:08 -03:00
Tainan Felipe
1137f17be1 Add indicator number of users added for each breakout room 2019-03-06 17:25:23 -03:00
KDSBrowne
de660a0abe make remaining animations work with Edge 2019-03-05 02:46:37 +00:00
Anton Georgiev
48a951d253
Merge pull request #6660 from KDSBrowne/2.2-accessibility-minor-update
Fix minor accessibility issues
2019-02-07 15:23:39 -05:00
KDSBrowne
38a05de498 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-accessibility-minor-update 2019-02-06 14:49:44 +00:00
Tainan Felipe
4e43c99384 Add alert when is under a minute to end 2019-02-05 17:18:20 -02:00
Tainan Felipe
742040c57b Merge remote-tracking branch 'upstream/master' into issue-6450 2019-02-05 13:01:20 -02:00