Commit Graph

702 Commits

Author SHA1 Message Date
GuiLeme
bc9f24a5fb [backport-pdf-100] - backport of functionality 2022-10-17 17:05:16 -03:00
germanocaumo
3ecf79cc4f fix(whiteboard): only call annotation upsert in one frontend instance
We were calling upsert in the Annotations collection for the same annotation in all frontend instances, this could lead to the same annotation being inserted
multiple times with different ids due to concurrency.

Added the html5InstanceId of the original request to the redis message so we can use it to only call upsert in one instance.
2022-10-04 10:28:36 +00:00
GuiLeme
d9de398d90 [fix-page-count-exeed] - Forwarded temporaryPresentationId to front-end and refactor it's name 2022-08-22 15:00:27 -03:00
Mario Jr
ca6b020f82 fix(audio): prevent dial-in waiting / guest users to speak/listen to the room
Based on the strategy proposed by @schrd in #15163
Also thanks to @jacotec and @maximilianhoecker for the help on investigating

Closes #15163
2022-07-14 13:56:17 -03:00
Ramon Souza
3800065380 remove chat name 2022-05-13 17:44:41 -03: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
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
Gustavo Trott
a6c3af7b0f Add disabledFeatures=virtualBackgrounds 2022-03-22 16:01:27 -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
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
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
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
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
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