Daniel Petri Rocha
76b24e1ec3
Route padId to bbb-export-annotations
2022-09-24 22:59:29 +02:00
GuiLeme
633a032fd0
[issue-pdf-100-processing] - implemented retry flow and fixed error message
2022-09-22 16:58:37 -03:00
Daniel Petri Rocha
e23d00004f
'Capture Shared Notes' button in front-end
2022-09-20 17:43:13 +02:00
Daniel Petri Rocha
c84c2e2892
Merge branch 'v2.6.x-release' into breakout-upload-ui
2022-09-19 19:30:18 +02:00
Daniel Petri Rocha
e5ed5a4546
Capture slides from breakout rooms upon their end
...
Sends out the request to export the presentations from the main meeting to each breakout room.
The breakout rooms then generate the PDF file and upload it back to the main meeting.
2022-09-18 15:55:20 +02:00
GuiLeme
39b6359441
[issue-pdf-100-processing] - fix timeout error when PDF is too complex.
2022-09-14 10:33:41 -03:00
Ramón Souza
ce539ec44a
rename external upload parameters
2022-09-12 11:04:13 -03:00
Daniel Petri Rocha
41f71981f4
Working checkbox in backend
2022-09-11 20:12:37 +02:00
Daniel Petri Rocha
f1690247fd
Include capture checkbox in bbb-html5
2022-09-05 19:27:38 +02:00
Daniel Petri Rocha
16b3d43f19
Initial back-end wiring for breakout slides capture
2022-09-04 22:34:04 +02:00
GuiLeme
2dec0f051b
[apply-toast-shared-notes] - resolving conflicts
2022-09-02 16:08:24 -03:00
GuiLeme
80a381c87c
[apply-toast-shared-notes] - resolved conflicts and refactored temporaryPresentationId's name
2022-09-02 15:24:29 -03:00
Gustavo Trott
f7f20f3e2e
Merge pull request #15251 from ramonlsouza/issue-15001
2022-09-02 09:44:10 -03:00
Ramón Souza
470f491352
Merge pull request #15583 from germanocaumo/tldraw-viewbox-sync
...
fix(tldraw): sync viewed area between presenter/viewers +
2022-08-30 17:00:14 -03:00
Ramón Souza
609d43157a
Merge tag 'v2.5.5' into merge-2526-aug25
2022-08-25 14:33:44 -03: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
Daniel Petri Rocha
d56acd4022
Initial backend+bbb-export-annotations wiring for toast messages
2022-08-16 20:27:40 +02:00
germanocaumo
d4b8bdce7e
fix(tldraw): sync viewed area between presenter/viewers +
...
- Return to the ResizeAndMoveSlide event to do pan&zoom, respecting the viewed width and height ratio
- Defaults zoom in toolbar to 100% like before to be more consistent
- Fit to width and Reset Zoom is back (fit tho width still has some sync problems)
- Fix to not change to first page when presenter reloads page
2022-08-16 12:12:43 +00:00
GuiLeme
1e0700b455
[apply-toast-shared-notes] - merge 26 and resolved conflicts
2022-08-03 11:12:55 -03:00
GuiLeme
74caa9cb5f
[apply-toast-shared-notes] - Savepoint - Made some changes
2022-08-02 17:25:15 -03:00
Ramón Souza
ccce085aed
Merge remote-tracking branch 'upstream/v2.6.x-release' into issue-15001
2022-07-27 09:49:19 -03:00
Gustavo Trott
acb0465266
Merge pull request #15412 from JoVictorNunes/export-presentation
2022-07-26 17:49:09 -03:00
Daniel Petri Rocha
6ac3040d4a
Fix multiple pres. export; include PresId in NewPresAnnFileAvailable msg.
2022-07-26 15:19:23 +02:00
Gustavo Trott
59ddf3e8e3
broadcast NewPresAnnFileAvailableMsg to html5
2022-07-20 20:20:32 -03:00
Pedro Beschorner Marin
b52c67d7a7
feat(captions): first pass on recording
...
Add the main server-side adapter for using the legacy closed captions
recording process with the audio captions data.
2022-07-20 17:20:52 +00:00
Pedro Beschorner Marin
307ab6ea40
feat(captions): add author avatar
...
Include captions' author avatar at the live feedback to improve identification.
2022-07-20 17:20:50 +00:00
Pedro Beschorner Marin
75969ec93c
feat(captions): audio captions app
...
Add a server-side app for the audio captions feature and record proto-events
for this data.
As it is, only behaves as a pass-through module. The idea is to include all
the business intelligence in this app.
2022-07-20 17:20:48 +00: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
Mario Jr
3f99413cbb
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 09:04:48 -03:00
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
Anton Georgiev
3ce6dbf997
Merge pull request #14665 from JoVictorNunes/breakout-update
...
feat: move users among breakouts
2022-04-14 08:22:49 -04: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
Anton Georgiev
aaef76cd2e
Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev
2022-04-13 20:58:02 +00:00
Gustavo Trott
725bed6797
Small fixes
2022-04-13 14:22:02 -03:00
Anton Georgiev
13bed65baf
chore: drop obsolete Dockerfile from BBB
2022-04-12 20:34:28 +00: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
Gustavo Trott
f7d1b153a6
Keep blank line on end of gitignore files
2022-04-07 17:36:26 -03:00
Gustavo Trott
df1fc781f6
Add .bsp directory to .gitignore
2022-04-07 17:34:01 -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
Bohdan Zhemelinskyi
cb716b005b
modified common-message for java 11
2022-03-16 17:45:11 +00: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
4e268dffa3
WIP target JVM8 -> JVM11
2022-02-25 04:39:48 +00: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
Gustavo Trott
def7fc65c3
Update common-message and common-web using sbt update
2022-02-17 10:58:41 -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
Gustavo Trott
ac4621da4d
Improvements in deploy.sh script
2022-02-11 14:26:57 -03:00
Gustavo Trott
dab0ee8b19
Clear cache of common-message and common-web before publish
2022-02-11 14:03:25 -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
Gustavo Trott
4e3711c1bd
Resolve conflicts on backend marging 24->Develop
2022-01-27 08:29:14 -03:00
Gustavo Trott
759535eb62
Implements message to all breakout rooms
2022-01-26 17:02:38 -03:00
Daniel Petri Rocha
5e6dd1b74f
Store messages in Redis
2022-01-26 19:23:11 +01:00
Daniel Petri Rocha
41a7ff87ea
Send out message to store annotation and export job in Redis
2022-01-25 18:15:11 +01: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
5f4c5cdedb
Merge branch 'develop' into r-r-e-acea
2022-01-24 16:05:57 -05:00
Anton Georgiev
2e72946bc1
Merge pull request #14088 from zhem0004/fixPhoneBan
...
Fix: Removing phone users always bans them
2022-01-24 15:50:30 -05:00
Anton Georgiev
b8ba4b5c71
Merge pull request #14075 from gustavotrott/api-create-virtual-background-param
...
Add param to disable Virtual Backgrounds in API /create
2022-01-24 15:04:30 -05:00
Pedro Beschorner Marin
c9043655f1
Merge branch 'develop' into position-in-waiting-queue
2022-01-24 14:31:03 -03:00
Pedro Beschorner Marin
810deb907b
refactor(etherpad): access control et al.
...
Move all Etherpad's access control from Meteor to a separated [Node application](https://github.com/bigbluebutton/bbb-pads ).
This new app uses [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview )
to create groups and manage session tokens for users to access them. Each group
represents one distinct pad at the html5 client.
- Removed locked users' access to pads: replaced readOnly pad's access with a new pad's content sharing routine
- Pad's access is now controlled by [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview )
- Closed captions edited content now reflects at it's live feedback
- Improved closed caption's dictation mode live feedback
- Moved all Etherpad's API control from Meteor to a separated [app](https://github.com/bigbluebutton/bbb-pads )
- Included access control both in akka-apps and bbb-pads
2022-01-21 16:56:01 -03:00
Guilherme Leme
7d6156d298
[Issue-13238]-Refactored files to fit the new presentation structure (With the removable attribute). And refactored message services as well.
2022-01-21 11:49:44 -03:00
Daniel Petri Rocha
22d50a7572
MakePresentationWithAnnotationDownloadReqMsg with parameters in MeetingActor
2022-01-18 16:05:02 +01:00
Aleksandar Vasilev
6935b8293c
Merge branch 'bigbluebutton:develop' into position-in-waiting-queue
2022-01-16 02:59:40 +01:00
Aleksandar Vasilev
6103ae960d
Merge branch 'bigbluebutton:develop' into develop-private-guest-lobby-messages
2022-01-16 02:58:43 +01:00
Bohdan Zhemelinskyi
df3da31f39
fixUsersGettBannedFromPhone
2022-01-13 18:43:16 +00:00
prlanzarin
f3e3d397a6
fix(screenshare): add akka-apps|webrtc-sfu broadcast stop sys msg
2022-01-13 12:34:49 -03:00
Daniel Petri Rocha
3b32fb02b5
Initial implementation of MakePresentationWithAnnotationDownloadReqMsg
2022-01-13 12:45:22 +01:00
prlanzarin
8e822f4a6d
fix(screenshare): add state sync between bbb-html5 and akka-apps
...
A TODO 5 years in the making
2022-01-12 19:36:38 -03:00
Gustavo Trott
7d55cac005
Implements virtualBackgroundsDisabled param to API /create
2022-01-12 18:21:58 -03:00
germanocaumo
b71b9a0c85
fix(polls): fix wrong typed poll results due to race condition
...
Sometimes a vote for a new answer text was being computed as a vote for the first option due to poll collection late update.
2022-01-12 17:41:02 +00:00
Ramón Souza
f6e65f58c5
merge 2.4 into develop and resolve conflicts - partial
2022-01-12 16:40:45 +00:00
SashoVihVas
1862f60e05
Add private guest lobby messages
2022-01-12 14:10:30 +00:00
SashoVihVas
2d7c82e73d
Add position in waiting queue for guest users
2022-01-12 03:08:43 +00:00
Tainan Felipe
6ed8fb304a
Merge branch 'v2.4.x-release' into wip-new-msg-userLeftFlag
2022-01-06 18:20:32 -03:00
Max Franke
85ad9a5e30
feat(video): webcam video pinning server side logic
...
Add the new ChangeUserPinState messages to handle the new video pinning
functionality
2021-12-21 16:58:38 -03:00
root
427cd8ac34
Merge branch 'develop' into origin/jdk-17-upgrade
2021-12-17 15:59:00 +00:00
Anton Georgiev
b0c66caef9
Merge pull request #13915 from prlanzarin/u24-sprawling-pier
...
feat(webcams): add option to allow moderators to close another user's webcams
2021-12-15 09:24:11 -05:00
Gustavo Trott
35e465387b
Merge of last Dashboard 2.4 improvements
2021-12-15 10:35:14 -03:00
Tainan Felipe
35ddbed8c2
add msg userLeftFlag
2021-12-14 15:45:59 -03:00
prlanzarin
21c124b854
feat(webcams): server-side logic to allow moderators to close user's webcams
...
Includes a new create param/web conf called allowModsToEjectCameras, false by
default.
Ejection does not work in breakout rooms or with non-mod users
Ejection closes _all_ webcams shared by the target user
2021-12-13 19:49:41 +00:00
Gustavo Trott
63f60f5009
Reduce Dashboard cookie timelife
2021-12-10 17:15:47 -03:00
Anton Georgiev
797fc49633
TEMP
2021-12-09 20:37:05 +00:00
root
70eebe6c0c
removing red5 dependency
2021-12-08 16:21:33 +00:00
hiroshisuga
0bc62f66f4
Feat(meeting): minimise sequential user pick ( #13831 )
...
Updating random user picker to reduce the probability that the exact same viewers would be selected first in successive random-pick runs
2021-12-07 12:36:34 -05:00
root
c3f0f26b7b
upgrading dependencies for bbb-common-message
2021-12-04 10:55:26 +00:00
root
ce7362380b
Merge branch 'develop' into origin/jdk-17-upgrade
2021-12-03 14:04:02 +00:00
Anton Georgiev
efd3c160fa
Merge pull request #13790 from prlanzarin/u24-second-tragic-laurel
...
fix(webcams): viewer accounting, improved perm. checks in akka-apps, [...]
2021-12-02 15:11:19 -05:00
root
94eb9197a0
upgrading bbb-common-message
2021-12-02 16:01:44 +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
prlanzarin
3e6b849458
fix(webcams): viewer accounting, improved perm. checks in akka-apps, ...
...
- Improve permission checks by making them lock-settings aware
- Account for camera viewers in akka-apps. They should now be
present in the analytics endpoint
- Further integrate akka-apps and webrtc-sfu so their states remain
consistent. We'd also like to be able to slowly dehydrate some
of the logic that today resides in webrtc-sfu and move it to
akka-apps and this is a first step.
- Add additional broadcasted stream ID checks (ownership and streamID
format)
2021-11-30 18:40:37 +00:00
Gustavo Trott
df60295d22
Implements join param excludeFromDashboard
2021-11-26 14:07:03 -03: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
Anton Georgiev
019a0b25b9
Merge pull request #13564 from jfsiebel/remove-unused-property-chat-message
...
Remove unused properties from chat message event
2021-11-02 15:12:56 -04:00
Joao Siebel
7a118ed3b8
Remove unused properties from chat message event record. close #11696
2021-10-25 14:46:59 -03:00
Ramon Souza
c892a2a5d1
resolve conflicts
2021-09-21 12:06:27 -03:00
Ramon Souza
85ded998f2
remove linting
2021-09-17 11:03:09 -03:00
Ramon Souza
0ca1b7896e
Merge remote-tracking branch 'upstream/develop' into PR-11359
2021-09-17 09:12:43 -03:00
Gustavo Trott
cd15f17394
Refactor all references for activity-report renaming to learning-dashboard
2021-08-25 11:38:35 -03:00
Gustavo Trott
e4ef1582f2
Merge branch 'develop' into activity-report
2021-07-22 11:33:47 -03:00
Gustavo Trott
3c6155a73e
Creates config activityReportTracking to enable Activity Report
2021-07-22 11:09:44 -03:00
Joao Siebel
8462465a5f
Allow default layout config in bbb-web. close #12668
2021-07-19 11:02:58 -03:00
Gustavo Trott
45d4c310c2
Merge branch 'develop' into activity-report
2021-07-13 11:12:45 -03:00
Gustavo Trott
5c602fd2b0
Merge branch 'develop' into breakoutrooms-set-name
2021-07-12 16:31:38 -03:00
Gustavo Trott
0417cbb03f
Adds Activity Dashboard initial version and generate activityReportAccessToken
2021-06-30 00:01:46 -03:00
Gustavo Trott
7d76ccac4c
Change default Activity-report directory
2021-06-24 16:37:15 -03:00
Gustavo Trott
de9896d8c5
Akka sends pubSub ActivityReportEvtMsg and Bbb-web listen and export the content as Json file
2021-06-24 16:22:27 -03:00
germanocaumo
1fb9870cf7
Apply suggestions from code review
...
Code style fixes and remove translations other than en to avoid conflicts with transifex.
Co-authored-by: Pedro Beschorner Marin <pedrobmarin@gmail.com>
2021-06-17 10:25:03 -03:00
germanocaumo
349af23f0a
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into anonymous-polls
2021-06-16 21:54:28 +00:00
Anton Georgiev
5ee5ed1970
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-june16
2021-06-16 19:54:28 +00:00
germanocaumo
31138d440e
fix(poll): readd userId for non secret poll record event
2021-06-16 17:01:56 +00:00
Gustavo Trott
37dea2215b
Translates dynamically breakout room Names when default name is being used
2021-06-14 16:59:27 -03:00
Richard Alam
b6e49e5218
Merge branch 'develop' into paultrudel-analytics-actor-for-meeting-info
2021-06-12 01:29:28 +00:00
Richard Alam
ef766217f7
Merge branch 'analytics-actor-for-meeting-info' of https://github.com/paultrudel/bigbluebutton into paultrudel-analytics-actor-for-meeting-info
2021-06-12 01:28:37 +00:00
Anton Georgiev
1369cb2269
Merge pull request #12505 from gustavotrott/breakoutroom-inscrease-time
...
Add 'Extend duration' option for breakout rooms
2021-06-11 16:33:15 -04:00
germanocaumo
7bedcb08e5
fix(poll): don't translate user/presenter typed answers
...
When the answer is not default (Custom or UserResponse), don't translate the answers.
2021-06-11 16:55:53 +00:00
tibroc
828cf60cb2
Add option to hide individual answers in polls
...
This patch adds a new option to hide the individual answers to the presenter
when starting a poll. This includes hiding the answers for the presenter and
informing the other users that the current poll is anonymous.
See #9524
2021-06-07 10:56:14 +02: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
Pedro Beschorner Marin
d4888f585c
refactor(external videos): state as integer
...
A media state may have more than 2 states. Moving this property back to
integer so it can be extended.
2021-06-02 15:07:03 -03:00
Anton Georgiev
8868e84e9f
Merge pull request #12395 from gustavotrott/end-when-no-moderator
...
Implements endWhenNoModerator
2021-05-31 10:59:55 -04:00
germanocaumo
4d347be53b
refactor: use questionText instead of title for poll question
2021-05-27 21:04:15 +00:00
Gustavo Trott
979b21c0ed
Improve code reading
2021-05-17 18:13:00 -03:00
Gustavo Trott
00240c925e
Implements endWhenNoModerator
2021-05-17 17:52:59 -03:00
germanocaumo
ca2ad30e12
fix(record): add missing info to polling events
...
Add PollPublishedRecordEvent with all infos (also fix duplicated handlePollStoppedEvtMsg)
Add answer text to UserRespondedToPollRecordEvent (useful for custom answers)
Add type in PollStartedRecordEvent
2021-05-11 18:37:23 +00:00
Michael Zinsmeister
5ca831ff86
Merged upstream develop branch
2021-05-01 16:59:20 +02:00
Richard Alam
5114ea7780
- remove unused import
2021-04-23 17:23:40 +00:00
Anton Georgiev
3ebb2cf46d
Merge pull request #12004 from prlanzarin/u23-isitcoldinthewater
...
video: voice activity video sorting
2021-04-20 09:47:43 -04:00
hiroshisuga
4db28a2824
Fancy random viewer selection ( #11297 )
...
* Revert "Delete bbb-icons-ori.woff"
This reverts commit 84937a0d07391434445a7c245c666d6f8c764c4b5141e65359c8f7b17b0473c45065949d01d58527d221d290cdc415ff02d1d221d290cd267dc412d584937a0d077c245c666d6f8c764c4bc8f7b17b0473c45065949d01d5852764a48f2bd69d1b4a068ab60491d93316e357091de0b70f20557b1bde97ed
2021-04-15 11:12:10 -04:00
prlanzarin
172e31b78e
Rework of the floor event
...
Now it`s called AudioFloorChanged* to properly reflect its role
Add fields to carry the floor state (boolean) along with the uID and vID to be able to send events for a floor takeover and a floor surrender
2021-04-12 18:25:58 +00:00
Gustavo Trott
3e675af3b5
Akka broadcasts UploadedFile Too Large error msg
2021-04-08 16:49:17 -03:00
Aron Engineer
e5903ccfdd
feat:Meeting analytics web api endpoint added to expose meeting info
2021-04-08 19:19:22 +00:00
Gustavo Trott
3d1575e635
Send pubSub FileTooLarge Error Msg from bbb-web when file is too large, (and makes Akka send meetingId with presentation token msg)
2021-04-08 14:18:15 -03:00
Aron Engineer
c7563765c6
fix: Analytics logging value Meeting Recorded corrected, common messages change
2021-04-05 18:43:39 +00:00
Aron Engineer
2d740ec2a9
feat: CamStreamSubscribeSysMsg added with handler and update webcam functionality, ScreenStreamSubscribeSysMsg added
2021-04-01 17:35:09 +00:00
Aron Engineer
21ad951f5f
feat: TwoWay user params added to MeetingAnalyticsInfo message, Message body modified with correct ref naming
2021-03-30 20:08:41 +00:00
Aron Engineer
7c06f3b85e
Merge branch 'develop' into analytics_actor_for_meeting_info
2021-03-29 19:50:03 +00:00
Anton Georgiev
aae72c0547
Merge branch 'develop' into multiple-choice-poll
2021-03-29 11:54:44 -04:00
Aron Engineer
7195a67e4e
fix: MeetingInfoAnalyticsMessage WebcamStream modified
2021-03-26 20:29:27 +00:00
Aron Engineer
6cd0f01adb
fix: bbb-common-message updated with correct Msg body
2021-03-24 17:56:13 +00:00
Aron Engineer
c4b05e83e8
fix: UserMsgs.scala filename typo fixed
2021-03-24 13:33:25 +00:00
Aron Engineer
52d57645c4
fix: ValidateAuthTokenRespMsg reason code added to the message.
2021-03-23 21:13:14 +00:00
Aron Engineer
6d100d2a21
WIP: New params added to MeetingInfoAnalyticsLogMessage
2021-03-23 20:13:40 +00:00
Aron Engineer
f0b7aea734
Merge branch 'develop' into analytics_actor_for_meeting_info
2021-03-23 13:06:15 +00:00
Aron Engineer
f598862149
feat: Presenter added to presentationInfo analytics message
2021-03-19 19:25:08 +00:00
Aron Engineer
af528b26d1
feat: WIP meeting info analytics logging messages computed
2021-03-18 21:43:49 +00:00
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 Zinsmeister
b99bd3be0c
Merged upstream develop branch
2021-03-14 22:17:19 +01: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
7eb91f9273
Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino
2021-03-11 18:49:14 +00:00
Aron Engineer
625c4962a0
feat: ValidateAuthToken revoked when user is logged out, reason added to response message
2021-03-11 14:32:01 +00:00
Aron Engineer
56a2ff5df8
feat: User modified to add logged out attribute
2021-03-11 14:32:01 +00: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
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
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
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
Aron Engineer
cae124aed7
feat: pubsub send and receive statuses added to health endpoint
2021-03-04 21:16:48 +00:00
