Commit Graph

28892 Commits

Author SHA1 Message Date
Ramon Souza
45421b1276 fix an error that might happen if PR 11529 is applied to an ongoing meeting 2021-03-10 09:16:31 -03:00
Pedro Beschorner Marin
17f47fa4ea
Removed callback from setGuestLobbyMessage 2021-03-10 09:09:15 -03:00
Andrei Bautu
18b3fc2684 Remove unused ffmpeg settings 2021-03-10 13:10:54 +02:00
Anton Georgiev
38f11dbdee
Merge pull request #11587 from mariogasparoni/fix-11333
Improve the way store information about breakout audio transfer
2021-03-10 06:01:56 -05:00
Anton Georgiev
65fd2d434a
Merge pull request #11584 from ramonlsouza/issue-9856
When a moderator ends a meeting, indicate to viewers who ended the meeting
2021-03-10 05:59:43 -05:00
Andrei Bautu
8cc99ef4ab Include comments about ffmpeg settings 2021-03-10 12:58:59 +02:00
Andrei Bautu
d71df37b8a Fix detection of empty video segments 2021-03-10 11:40:18 +02:00
Brent Baccala
60734e0f65 on installation of akka-bbb-fsesl, update ESL password in /etc/bigbluebutton, where we're starting to
put the configuration stuff, instead of /usr/share/bbb-fsesl-akka/conf/application.conf
2021-03-10 01:13:31 -05:00
Brent Baccala
7b16f03135 packaging from akka-bbb-fsesl: copy FreeSWITCH password from
FreeSWITCH configuration file (event_socket.conf.xml) and add
FreeSWITCH as a package dependency to make sure that it gets
configured first
2021-03-10 01:13:11 -05:00
Mario Jr
9c92c14a6e Fix audio and push alerts for user join
When validating tokens, the dummyUser created at the beginning is set
with validated=true. This means there won't be the state change that used
to occur from validated:false to validated:true (which detects the moment
joined the meeting) , therefore the alert code that expects for this change
won't run.
To fix this for audio alerts, we now detect when user join by observing
additions in Users's collection. This is actually good because we start
observing this only once (in componentDidMount), differently we used to do,
by calling this every time the tracker was activated.

To distinguish between the user addition that initially populates user's
collection from those that happens after user join (which are the ones we
want), we store the initial state (at componentDidMount) and compare it
with new additions. If the user added is present at the initial state,
then it is an addition to populates the collection, otherwise this is a real
user addition (happened after user joined the meeting)

Partially fixes #11399
2021-03-09 21:40:27 -03:00
Aron Engineer
4596d1916e feat: User modified to add logged out attribute 2021-03-09 22:32:14 +00:00
Aron Engineer
85f4b13275 Merge remote-tracking branch 'jfsiebel/send-user-logged-out-info' into user-logged-out 2021-03-09 22:25:21 +00:00
Tainan Felipe
927e2167bc Re-implements chat sync and clear 2021-03-09 17:52:20 -03:00
Ramon Souza
4445d4e309 fix invisible box appearing if presentation is hidden 2021-03-09 16:43:51 -03:00
Pedro Beschorner Marin
0365018e92 Add guest lobby messages
Moderators are able to send a message to the meeting's guest lobby. This new
event reaches bbb-web and is sent to the guest user with her/his status response
while polling. All guest users that are waiting for acceptance will be able to
read this message.

enableGuestLobbyMessage is disabled by default.
2021-03-09 11:02:25 -03:00
Anton Georgiev
4ba2082fb6
Merge pull request #11591 from mariogasparoni/11533-related
Improve the way we observe changes on Users's collection
2021-03-08 16:30:39 -05:00
Mohamed Amine Ben Salah
982ddc56a1 adds YNA and UR polling cases 2021-03-08 18:11:36 -03:00
Mario Jr
c7df108f5a Improve the way we observe changes on Users's collection
It is safer to look at subscriptions's state to users instead of depending
on the initial state of the collection at mounting time. Although
i couldn't force any race conditions on this, there's a chance it could
happen. The fix avoid this problem.
This complements #11533
2021-03-08 18:08:56 -03:00
Anton Georgiev
dc1e78e808
Merge pull request #11588 from ramonlsouza/issue-11585
Changes on end meeting message
2021-03-08 15:34:46 -05:00
Ramon Souza
826c420788 update meetingEndedBy with information coming from bbb core 2021-03-08 16:45:09 -03:00
Ramon Souza
0a09112f80 split end meeting message in two parts 2021-03-08 16:14:09 -03:00
Andrei Bautu
beb66512a0 Recording processing using MP4/OGG temporary files, stream copy, and customizable (lower) frame rates.
Discussion from https://github.com/bigbluebutton/bigbluebutton/issues/2483
2021-03-08 20:14:48 +02:00
Ramon Souza
78095f830d 'active users' message change on ending meeting 2021-03-08 15:11:31 -03:00
Mario Jr
3b6b9523fc Update breakout audio transfer states when user leave mic
When leaving audio/reconnecting , we must update breakout audio transfer
state.

Related to the issue #11333
2021-03-08 15:01:10 -03: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
Ramon Souza
c9ac737207 display name of the user who ended the meeting 2021-03-08 13:05:33 -03:00
Anton Georgiev
cc22f8c042
Merge pull request #11581 from ramonlsouza/issue-11145
Fixes incorrectly displaying of 'restore presentation' button when presentation is disabled
2021-03-08 09:37:29 -05:00
Ramon Souza
2923ea1641 fix 'restore presentation' button when presentation is disabled 2021-03-08 09:33:25 -03:00
Fred Dixon
f67691f65f
Merge pull request #11579 from ffdixon/bbb-conf-override
Added text for override of bbb-web.properties
2021-03-07 21:50:28 -04:00
Fred Dixon
af23e30f37 Added text for override of bbb-web.properties 2021-03-07 19:48:08 -06:00
Mohamed Amine Ben Salah
620183d5d3 added True/False, A/B/C/D polling cases WIP 2021-03-07 20:53:58 -03:00
Mohamed Amine Ben Salah
f4b0029340 correct type Repsonse => Response in en.json 2021-03-07 17:04:00 -03:00
Anton Georgiev
f814d5f8cd
Merge pull request #11470 from schrd/grails-config
add overlay config for bbb-web
2021-03-05 16:53:57 -05:00
Daniel Schreiber
44b1b9052c fix grep if configfile does not exist
there was a call of grep which failed when the config file does not
exist yet. check existance of file first.
2021-03-05 21:56:50 +01:00
Anton Georgiev
bca8b7baac
Merge pull request #11569 from mariogasparoni/develop
Move some validations to the User's collection query
2021-03-05 14:30:55 -05:00
Richard Alam
28245a1b58
Merge pull request #11557 from aron-2809/bbb-core-http-endpoint-wip
Bbb core http endpoint wip
2021-03-05 14:27:48 -05:00
Mario Jr
9b1630186c Move some validations to the User's collection query
Also removed unnecessary fields
2021-03-05 15:56:42 -03:00
Anton Georgiev
13493b4a4d
Merge pull request #11568 from mariogasparoni/develop
Improve performance when doing user join notifications
2021-03-05 13:55:08 -05:00
Aron Engineer
2c8220a897 fix: HealthActor messages optimized for the timestamp value update 2021-03-05 18:31:31 +00:00
Mario Junior
d4620b024d
Update bigbluebutton-html5/imports/startup/client/base.jsx
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2021-03-05 15:14:19 -03:00
Mario Jr
837b1cfb52 Improve performance when doing user join notifications
Complements #11533
2021-03-05 15:10:31 -03:00
Aron Engineer
284ba1af97 fix: Timeout exception response modified with typesafety. 2021-03-05 17:23:51 +00:00
hiroshisuga
190bde3320
Fix slide size problem at fullscreen <-> window-mode transition #2 (#11540)
Replaces the PR #10604, which has been temporarily fixed a problem in 2.3a2, that is, the slide size gets crazy when turning on and off fullscreen mode. Since #10604 was just a workaround, I tried to fix it in a way making more sense.

### Closes Issue(s)

closes #10459 (already closed by #10604) and #10589

### Motivation

#10604 is fixing the problem by calling "slide change" event, although the slide has not been changed actually. I tried to fix the same problem by adding a "full screen change" event listener in the layout manager, which I think is more elegant.
2021-03-05 11:01:47 -05:00
Anton Georgiev
e50e5ee59d
Merge pull request #11566 from mariogasparoni/merge-22
Merge 2.2 into develop
2021-03-05 10:35:40 -05:00
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