Anton Georgiev
b1bbc3fd52
Merge branch 'develop' into multiple-choice-poll
2021-03-17 16:11:49 -04:00
Pedro Beschorner Marin
d90ba5e286
Merge branch '2.3-per-user-wb' into develop
2021-03-16 20:28:39 -03:00
Pedro Beschorner Marin
381c5cb15c
Isolated whiteboard access
...
Modified the previous implementation of the whiteboard individual access to remove
multiple Collections dependency on this feature. Multi-user whiteboard is now an
array instead of a boolean value and most of the access control can be synchronized
and handled by akka-apps.
2021-03-16 19:55:25 -03:00
Michael Z
4d3bda1306
Merge branch 'develop' into multiple-choice-poll
2021-03-16 18:38:48 +01:00
Ramon Souza
ca345de246
add check after extractCredentials is used
2021-03-16 13:15:41 -03:00
Michael Zinsmeister
06707de4f3
Merged upstream develop branch
2021-03-14 22:19:25 +01:00
Michael Zinsmeister
b99bd3be0c
Merged upstream develop branch
2021-03-14 22:17:19 +01:00
Pedro Beschorner Marin
defc33a043
Removed callback from setGuestPolicy
2021-03-12 09:22:08 -03:00
Lucas Zawacki
07b51a6bf0
Correctly set guestPolicy to not overwrite userProps
2021-03-12 09:19:53 -03:00
Pedro Beschorner Marin
af64232e45
Change guest policy
2021-03-12 09:19:22 -03:00
Anton Georgiev
3fbb40875f
Merge pull request #11631 from prlanzarin/u23-planZETA
...
audio: make sdpSemantics configurable
2021-03-12 05:34:10 -05:00
Anton Georgiev
9f841bd64b
Merge pull request #11622 from prlanzarin/u23-ilgiardino
...
[screenshare] Rewrite SFU/Kurento screensharing bridge (+reconnections|audio sharing|QoL, was #11025 )
2021-03-12 05:13:11 -05:00
prlanzarin
f20fb3eef2
audio: make sdpSemantics configurable
...
Plan B is going to be phased out of Chrome soon and we should be testing it with unified plan
2021-03-12 03:04:55 +00:00
prlanzarin
775cbf4124
screenshare: move end alert sound to a reliable place
2021-03-12 00:44:38 +00:00
prlanzarin
7eb91f9273
Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino
2021-03-11 18:49:14 +00:00
Anton Georgiev
4f2f0d123d
Merge pull request #11596 from Tainan404/fix-chat-issues
...
re-implement chat sync and fix stucked loading indicator
2021-03-11 12:29:01 -05:00
Joao Siebel
c9650ba8f1
Inform akka that user intentionality logged out from meeting
2021-03-11 14:32:01 +00:00
Tainan Felipe
87ebdbd02a
Merge remote-tracking branch 'upstream/develop' into fix-chat-issues
2021-03-11 10:07:16 -03:00
Anton Georgiev
bbec7efb57
Merge pull request #11593 from pedrobmarin/2.3-lobby-message
...
Add guest lobby messages
2021-03-10 11:35:35 -05:00
Pedro Beschorner Marin
17f47fa4ea
Removed callback from setGuestLobbyMessage
2021-03-10 09:09:15 -03:00
Tainan Felipe
927e2167bc
Re-implements chat sync and clear
2021-03-09 17:52:20 -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
Ramon Souza
826c420788
update meetingEndedBy with information coming from bbb core
2021-03-08 16:45:09 -03:00
Ramon Souza
c9ac737207
display name of the user who ended the meeting
2021-03-08 13:05:33 -03:00
Michael Zinsmeister
def6ed7604
Merge with upstream
2021-03-07 15:29:10 +01:00
Michael Zinsmeister
81d5129084
Merge with upstream
2021-03-07 15:28:39 +01:00
Michael Zinsmeister
214b236701
Merge with upstream
2021-03-07 15:12:49 +01:00
Anton Georgiev
c9bbcebe59
Revert "Add reconnection and sync handler"
2021-03-05 03:53:36 -05:00
Anton Georgiev
228bad03d5
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into march4-merge
2021-03-04 21:25:47 +00:00
Tainan Felipe
21045abf16
Merge remote-tracking branch 'upstream/develop' into issue-11438
2021-03-04 11:29:01 -03:00
Anton Georgiev
eba2d0ab58
Merge pull request #11535 from pedrobmarin/etherpad-patch
...
Rework padIds and turn bbb-web pad aware
2021-03-02 14:48:34 -05:00
Tainan Felipe
71e0ca9d92
Add sync and reconnection handler
2021-03-02 11:35:26 -03:00
Anton Georgiev
879c54981e
Merge pull request #11447 from antobinary/external-video-sync-lucas-amguirado73
...
External video events propagated through akka-apps
2021-03-02 08:53:09 -05:00
Anton Georgiev
1268663030
wrap collection modifiers in try-catch blocks
2021-03-02 00:44:49 +00:00
Anton Georgiev
550bf6d282
Merge pull request #11525 from gustavotrott/develop
...
Adds lastAuthTokenValidatedOn to users
2021-03-01 13:56:16 -05:00
Mario Jr
de05622d19
Avoid setting an unknown input deviceId
...
Without 'exact' match, the browser fallbacks to the default inputDeviceId
This prevents the error (input device error) when breakout is ended and we try
to skipCheck the microphone when user returns to main room (assuming the
user had the microphone active before joining breakout room). Related
to the feature c451666d52
2021-02-28 17:15:08 -03:00
Pedro Beschorner Marin
540ce10c24
Recording external video events
2021-02-26 00:59:40 +00:00
Lucas Fialho Zawacki
ddc7a974bf
Register external video playback events to Redis
2021-02-25 21:58:43 +00:00
Anton Georgiev
aff272cbf3
Merge #7484 into #11447 ExternalVideo recording events
2021-02-25 19:54:22 +00:00
Gustavo Trott
63e00bd7ca
Adds lastAuthTokenValidatedOn to users in Akka, send it in ValidateAuthTokenRespMsg pubSub msg, makes Meteor store it as authTokenValidatedTime
2021-02-25 16:52:20 -03:00
Anton Georgiev
0eac03394c
remove duplicated logging of pengingAuth
2021-02-22 19:48:14 +00:00
Tainan Felipe
b298bf4384
WIP add timestamp greater than to publisher
2021-02-22 13:35:32 -03:00
Anton Georgiev
740a3a9db9
stop external video if presenter changed
2021-02-21 12:19:01 +00:00
Anton Georgiev
0b6496618c
Merge branch 'develop' of github.com:amguirado73/bigbluebutton into external-video-sync-lucas
2021-02-21 11:04:39 +00:00
KDSBrowne
e2156157f5
remove comment
2021-02-21 06:12:38 +00:00
KDSBrowne
babaf1b578
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-per-user-wb
2021-02-21 00:04:36 +00:00
Ramon Souza
043fa4bac8
fix user-sent poll result messages
2021-02-19 10:57:11 -03:00
Anton Georgiev
55e8de4357
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb18-merge
2021-02-18 20:33:19 +00:00
Anton Georgiev
e966d6c7b6
Merge pull request #11366 from MaximKhlobystov/updating-poll-ui
...
Updated poll UI: question field and typed responses
2021-02-18 10:32:33 -05:00
Anton Georgiev
49cdf9faef
Merge pull request #11413 from gustavotrott/develop
...
Include registeredOn date in pubSub user creation messages to replace loginTime creation in Meteor
2021-02-17 16:56:53 -05:00
