Gustavo Trott
502523a048
Merge pull request #14562 from danielpetri1/container-approach
2022-06-30 11:33:47 -03:00
Paulo Lanzarin
885e0ca72c
Merge pull request #15281 from prlanzarin/u26/fix/sxs-callerId
...
feat: add user name to checkAuthorization response, [...]
2022-06-29 15:40:42 -03:00
Daniel Petri Rocha
27edc515a4
Merge remote-tracking branch 'upstream/v2.6.x-release' into container-approach
2022-06-29 19:41:34 +02:00
prlanzarin
a8c689c8c3
refactor: remove akka-bbb-transcode leftovers
...
Follow up to the cleanup done in 143d9bbe87
2022-06-29 17:24:56 +00:00
Anton Georgiev
61b269eca8
Merge pull request #15171 from GuiLeme/issue-15051
...
refactor: Removed all traces of Red5
2022-06-29 12:09:02 -04:00
prlanzarin
eeed5ce208
fix: add ban status to SFU audio permission check
...
The UserJoinedVoice* event handler checks whether the caller is banned
and ejects them. That's valid for both SIP.js and SFU-based audio
flows, but for the latter there's a specific pre-flight permission check
as well.
This adds that same ban check to the pre-flight permission probe so that
calls are rejected earlier.
2022-06-28 20:33:37 +00:00
Ramon Souza
17c0bced1d
add uploadExternalDescription and uploadExternalUrl create params
2022-06-23 14:42:23 -03:00
prlanzarin
6e19eb55c7
fix(audio): decouple mic auth RPCs from global audio (SFU)
...
The SFU microphone module was using global audio authentication RPCs in
akka-apps to determine whether a mic connection is valid.
Fixes an issue where SFU microphone connections wouldn't take lock
settings in account in the permission checks.
In detail: decouple them by adding GetMicrophonePermissionReqMsg and
RespMsg. Allows flexibility on which conditionals to use in both. IMO it
is also better than renaming+adding a boolean to GetGlobalAudioPermission*
due to the fact that it gets easier to guarantee backwards compatibility
between SFU and BBB (ie SFU 2.9 keeps working on 2.4, 2.5).
2022-06-22 23:12:56 +00:00
GuiLeme
ac2e68842c
Merge remote-tracking branch 'upstream/v2.6.x-release' into issue-15051
2022-06-20 16:12:25 -03:00
Ramon Souza
edeb70de0d
Merge tag 'v2.5.1' into merge25-26-jun16
2022-06-16 13:58:54 -03:00
Daniel Petri Rocha
5f325ad134
Refactor Scala: immutability, no returns, recursion instead of loops
2022-06-15 15:11:39 +02:00
GuiLeme
beb0b507e0
[issue-15051] - Refactored all traces from Red5
2022-06-13 08:19:08 -03:00
Daniel Petri Rocha
1d0d4db2a7
Merge branch 'v2.6.x-release' into tldraw-with-annotation-export
2022-06-07 12:55:29 +02:00
Ramón Souza
f6b190aaa8
Merge pull request #15078 from lfzawacki/develop-layout
...
fix(layout): Fix propagation bugs and allow moderators to set the pushLayout flag
2022-06-02 19:48:07 +01:00
Lucas Zawacki
cd13446c5a
fix(layout): Moderators could not change layout if pushLayout was true
2022-05-24 17:31:35 -03:00
Daniel Petri Rocha
7aa4de0096
Modify PresentationPageForExport parameters due to tldraw panzoom handling
2022-05-15 22:24:06 +02:00
Daniel Petri Rocha
c9b9ab65ef
Merge branch 'export-annotations' into tldraw-with-annotation-export
2022-05-15 21:47:06 +02:00
Ramon Souza
3800065380
remove chat name
2022-05-13 17:44:41 -03:00
germanocaumo
45febec644
panAndZoom through akka + some cleanup
2022-05-13 02:47:41 +00:00
germanocaumo
234b2869e5
WIP: tldraw in akka-model & starting cleanup
2022-05-13 02:47:39 +00:00
Daniel Petri Rocha
19bbb4115d
Refactor handlers, role validation
2022-04-30 23:28:11 +02:00
Daniel Petri Rocha
7851d54484
PDF file: include meeting and room name
2022-04-29 13:50:42 +02:00
Lucas
2db9a1b343
Merge branch 'develop' into develop-bbb
2022-04-26 15:08:43 -03:00
Arthurk12
cff605e996
feat(webcam): pin multiple cameras simultaneously
...
Adds support for multiple cameras pins.
The pinned cameras are stored in a FIFO-type queue
When a camera is pinned the oldest one is removed.
The queue size can be set via create parameter 'maxPinnedCameras',
if not defaults to 3.
2022-04-18 20:17:58 +00:00
Lucas Zawacki
378d0f18a0
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into develop-bbb
2022-04-14 18:48:02 +00:00
Lucas Zawacki
83847a21aa
Merge branch 'v2.5.x-release-Layouts' of github.com:lfzawacki/bigbluebutton into develop-bbb
2022-04-13 21:08:32 +00:00
Gustavo Trott
725bed6797
Small fixes
2022-04-13 14:22:02 -03:00
Gustavo Trott
77a8aba1f5
Merge remote-tracking branch 'upstream/develop' into breakout-updated
2022-04-12 09:54:25 -03:00
Gustavo Trott
102eee3ba5
Backend portion of breakout Manage Users
2022-04-12 09:50:19 -03:00
Anton Georgiev
1500fb6a29
Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev
2022-04-09 00:55:25 +00:00
Anton Georgiev
33575e60e6
Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into v2.5.x-release
2022-04-09 00:48:14 +00:00
Ramon Souza
1c873bd8d6
Merge remote-tracking branch 'upstream/v2.4.x-release' into merge-2425-apr08
2022-04-08 17:30:21 -03:00
Daniel Petri Rocha
6703ac8ba1
Merge branch 'bigbluebutton:develop' into container-approach
2022-04-05 12:42:10 +02:00
Ramon Souza
4c328bc4ea
Merge remote-tracking branch 'upstream/develop' into issue-14382
2022-04-04 16:25:50 -03:00
Anton Georgiev
324388aa8e
Merge pull request #14016 from Tainan404/wip-new-msg-userLeftFlag
...
refactor: add msg userLeftFlag
2022-04-04 14:08:40 -04:00
Gustavo Trott
839aeb2685
Remove UserEjectedFromMeetingEvtMsg occurrences
2022-04-01 17:11:28 -03:00
Ramon Souza
6874156190
add messageDescription in notifications
2022-03-30 11:01:12 -03:00
Ramon Souza
4da4b8d7a9
Merge remote-tracking branch 'upstream/develop' into pr-issue-14493
2022-03-29 17:27:20 -03:00
Daniel Petri Rocha
9c10a46aee
Merge branch 'develop' into container-approach
2022-03-29 13:12:33 +02:00
Ramon Souza
68f55b8c7b
Merge remote-tracking branch 'upstream/develop' into issue-14382
2022-03-25 09:21:15 -03:00
Lucas Zawacki
48e5814e71
fix(layout): Add pushLayout field to akka/web
2022-03-22 19:14:03 +00:00
Gustavo Trott
a6c3af7b0f
Add disabledFeatures=virtualBackgrounds
2022-03-22 16:01:27 -03:00
Arthurk12
eacce4ee46
fix(layout): camera resize when pushing
...
Adds isResizing property to LayoutMeetings collection.
Moves the point where the last camera dock size is stored from webcam
component to custom layout component, since it is the only one with
this feature.
2022-03-22 15:29:49 -03:00
Gustavo Trott
4cb563085f
Implements param lockSettingsHideViewersCursor
2022-03-21 15:25:41 -03:00
Anton Georgiev
adfbaa4409
Merge pull request #14599 from gustavotrott/disabledFeatures-breakoutRooms
...
feat: Support to disable breakout rooms via disabledFeatures
2022-03-18 14:41:02 -04:00
Anton Georgiev
2ed04d4952
Merge pull request #14526 from pedrobmarin/r-u-dntru
...
refactor(user): do not timeout registered users
2022-03-17 13:51:15 -04:00
Ramon Souza
a89e9da4ea
Merge remote-tracking branch 'upstream/develop' into issue-14382
2022-03-16 16:53:17 -03:00
Anton Georgiev
7501c2788a
Merge branch 'java11-2' of github.com:zhem0004/bigbluebutton into java11-2
2022-03-16 18:04:06 +00:00
Gustavo Trott
6562cbc6e7
Merge branch 'v2.5.x-release' into disabledFeatures-breakoutRooms
2022-03-16 14:57:46 -03:00
Guilherme Leme
882c1e6cf6
[issue-14243] - changes in review.
2022-03-14 16:23:27 -03:00
Guilherme Leme
b080e889f6
Merge remote-tracking branch 'upstream/v2.5.x-release' into issue-14243
2022-03-14 16:05:44 -03:00
Gustavo Trott
5fdacf93dd
Merge remote-tracking branch 'upstream/v2.5.x-release' into disabledFeatures-breakoutRooms
2022-03-14 15:33:04 -03:00
Gustavo Trott
adc1c8cef8
Implements disabledFeatures=breakoutRooms
2022-03-14 15:30:41 -03:00
Guilherme Leme
b765312a2e
[issue-14321] - refactored name of variable presId to tmpPresId in order to make more sense in the context of presentation-token-upload and presentation collections.
2022-03-14 14:46:51 -03:00
Guilherme Leme
9104a0308e
[issue-14321] - Changes to make it possible to send 2 presentations with the same name
2022-03-14 12:10:27 -03:00
Ramón Souza
d008981855
add notifyRecordingIsOn create param
2022-03-10 20:17:57 +00:00
Tainan Felipe
fbb0f23510
Merge branch 'v2.5.x-release' into wip-notifications
2022-03-10 16:42:43 -03:00
Tainan Felipe
8858878d0d
Add server side notification
2022-03-10 16:33:25 -03:00
Pedro Beschorner Marin
5cd2b0b635
Merge remote-tracking branch 'bigbluebutton/v2.5.x-release' into f-v-amccc
2022-03-10 12:25:17 -03:00
Pedro Beschorner Marin
6ff1d680d9
feat(video): add meeting camera cap control
...
Include `meetingCameraCap` API param on create and enforce both server and
client to control the number of simultaneous webcams a meeting can have.
Disabled by default.
2022-03-07 09:36:55 -03:00
Pedro Beschorner Marin
8333a3c610
Merge branch 'v2.5.x-release' into r-u-dntru
2022-03-04 13:21:19 -03:00
Paulo Lanzarin
21d93f3d67
Merge pull request #14471 from pedrobmarin/r-w-ach
...
refactor(webcam): assemble core handlers
2022-03-04 12:31:42 -03:00
Gustavo Trott
f045aa7c31
Merge branch 'v2.5.x-release' into disabledFeatures-learningDashboard
2022-03-03 15:48:49 -03:00
Pedro Beschorner Marin
84bf1bfce9
refactor(user): do not timeout registered users
...
Avoid removing registered users on join timeout.
This registered users cleanup routine should be deprecated since guest users
do not have a join timeout anymore.
2022-03-03 15:38:54 -03:00
Anton Georgiev
5f884f6674
Merge remote-tracking branch 'bbb/v2.4.x-release' into merge-24-into-25
2022-03-03 18:35:05 +00:00
Anton Georgiev
212578b7c8
Merge branch 'v2.5.x-release' into disabledFeatures-learningDashboard
2022-03-02 08:46:31 -05:00
Anton Georgiev
9f6c6b7a0b
Merge pull request #14441 from pedrobmarin/r-s-fpr
...
refactor(screenshare): FreeSWITCH partial removal
2022-03-02 08:36:14 -05:00
Gustavo Trott
9d6eaead02
Move api param learningDashboardEnabled to disabledFeatures
2022-03-01 17:27:54 -03:00
Daniel Petri Rocha
3b77aef4c3
Notifier: notify MeetingActor
2022-03-01 11:01:50 +01:00
Pedro Beschorner Marin
b7a2f12d45
refactor(webcam): assemble core handlers
...
Create a core app and push the webcam event handlers under it.
2022-02-25 16:47:01 -03:00
Anton Georgiev
a75ab0c073
Merge pull request #14421 from gustavotrott/update-breakout-duration
...
feat: Update breakout duration
2022-02-24 15:18:54 -05:00
Gustavo Trott
c0d9af4618
Fix UpdateTime msgs
2022-02-24 14:24:46 -03:00
Anton Georgiev
9c3be36552
Merge branch 'origin/jdk-17-upgrade' of github.com:himanshugoyal1065/bigbluebutton into test-java-11
2022-02-24 16:53:47 +00:00
Lucas Zawacki
6dfdc6a579
feature(layout): Push most layout parts with custom layout
2022-02-24 13:21:16 -03:00
Ramón Souza
138f4d64e4
Merge remote-tracking branch 'upstream/v2.4.x-release' into v2.5.x-release
2022-02-24 14:49:56 +00:00
Pedro Beschorner Marin
6d80a413cf
refactor(screenshare): FreeSWITCH partial removal
...
Remove part of the old FreeSWITCH dependent WebRTC screenshare feature.
2022-02-23 13:03:51 -03:00
Pedro Beschorner Marin
e8ff5ebdc8
feat(video): add user camera cap control
...
Include `userCameraCap` API param on create and enforce both server and
client to control the number of simultaneous webcams an user can share.
Default set to 3.
2022-02-22 13:13:48 -03:00
Guilherme Leme
55f8d9266e
[issue-14243] - Fix to accept the chatEmphasizedText in recording and akka components.
2022-02-22 12:00:36 -03:00
Gustavo Trott
fb263babe6
Implements update breakout duration, and removes extend
2022-02-21 08:14:34 -03:00
Tainan Felipe
83426eec3a
Remove eject message usage and use user left message instead
2022-02-16 16:39:24 -03:00
Tainan Felipe
68346a8ac9
Rename the message to userLeftFlagUpdated
2022-02-16 15:46:02 -03:00
Tainan Felipe
3061f29751
Merge remote-tracking branch 'upstream/v2.5.x-release' into wip-new-msg-userLeftFlag
2022-02-16 11:29:15 -03:00
Guilherme Leme
0e47fe4912
[issue-14243] - On Back-end, I just marked the message with the user's role.
2022-02-14 11:01:00 -03:00
Pedro Beschorner Marin
abdea74fc9
Merge pull request #14314 from frankemax/webcam-sync
...
fix(webcam): add state sync between bbb-html5 and akka-apps
2022-02-14 10:19:58 -03:00
Anton Georgiev
006a9f9ffc
Merge pull request #14293 from gustavotrott/api-param-disabledFeatures
...
feat: new api Create param: disabledFeatures
2022-02-10 15:51:34 -05:00
Max Franke
d75734391a
fix(webcam): add state sync between bbb-html5 and akka-apps
2022-02-09 16:48:16 -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
Daniel Petri Rocha
fdb46e5547
presAnn master stores job as JSON, exportJob not containing annotations, presId fallback in meetingActor
2022-02-09 13:45:02 +01:00
Gustavo Trott
580ebdc066
Move disabledFeatures to meetingProp, and rename feat screensharing to screenshare
2022-02-07 15:55:45 -03:00
Himanshu Goyal
cf3b534604
Merge branch 'bigbluebutton:develop' into origin/jdk-17-upgrade
2022-02-07 19:12:25 +05:30
Gustavo Trott
dad9be2a6a
Merge remote-tracking branch 'upstream/v2.5.x-release' into api-param-disabledFeatures
2022-02-07 10:23:28 -03:00
Gustavo Trott
de4688bcdc
Implement new param disabledFeatures
2022-02-07 10:22:52 -03:00
Anton Georgiev
196e069160
Merge pull request #14173 from GuiLeme/issue-13238
...
feat(presentation): Add removable and downloadable attributes to payload.
2022-02-03 12:16:10 -05:00
prlanzarin
9dc54cdb5f
fix(webcams): add streamId to broadcast permission checks
...
Guarantees better enforcement of stream ownership
2022-02-03 13:12:28 -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
Guilherme Leme
75f3eab3f8
Resolve merging conflicts
2022-02-03 12:03:26 -03:00
Daniel Petri Rocha
e5dec08ab9
List/Hash data structure in Redis for messages; add jobId in annotations format
2022-02-01 17:24:57 +01:00
prlanzarin
dd3e24a800
refactor(screenshare): add voiceConf to ScreenshareBroadcastStopSysMsg
...
Just to make it easier to guarantee idempotence in webrtc-sfu while we dont get rid of voiceConf usage
2022-02-01 13:01:51 -03:00
Gustavo Trott
eb567eb106
Handle message to all breakouts sent
2022-01-28 14:41:10 -03:00
Tainan Felipe
33738d8c2e
Merge remote-tracking branch 'upstream/v2.4.x-release' into wip-new-msg-userLeftFlag
2022-01-27 09:48:14 -03:00
