GuiLeme
536285fc37
[issue-17531] - restored old feature of downloading original presentation
2023-04-14 11:04:24 -03:00
Gustavo Trott
8270bf1612
Update users policies in real-time in Postgres/Hasura
2023-04-14 09:11:56 -03:00
Gustavo Trott
63bc1593d5
Apply locksettings-hideUserList as validation on fetch users in Hasura
2023-04-12 11:07:54 -03:00
Gustavo Trott
36ba5ddc76
Add lockSettings options to graphql Hasura
2023-04-10 15:52:19 -03:00
Gustavo Trott
0b2bf8f68b
Akka-apps will set mobile flag instead of Meteor
2023-04-06 17:43:57 -03:00
Gustavo Trott
0630fb05ea
Moves user color picker to akka-apps instead of meteor-backend
2023-04-06 16:39:05 -03:00
Gustavo Trott
93c52542ae
Clear codes related to Scala/Slick
2023-04-05 16:47:14 -03:00
Gustavo Trott
be4bac6037
Merge with v2.7.x-release
2023-04-05 15:05:16 -03:00
Gustavo Trott
3cf7be926c
Introduces userTyping, user_connectionStatus and other flags to Postgres/Hasura
2023-04-05 13:56:22 -03:00
Gustavo Trott
94111058e5
Set userId as PK for user_voice table (user has only one mic, following Meteor current logic)
2023-04-04 09:02:41 -03:00
Gustavo Trott
d13613fb7d
Include cursor data to Pg/Hasura and other fixes
2023-04-03 17:23:30 -03:00
Gustavo Trott
a31f3fe057
Set current presentation in Postgres/Hasura
2023-04-03 10:46:47 -03:00
Gustavo Trott
e85620d7a9
Add presentation collections to Hasura/Postgres
2023-03-31 17:46:17 -03:00
germanocaumo
e326955f90
fix(recording): crash on redisrecorderactor when poll is published
...
We were trying to save a poll result shape before it was converted to tldraw style, which was not compatible.
2023-03-29 22:43:18 +00:00
Gustavo Trott
2b58f246ee
Create relationship for chat->user
2023-03-29 12:06:48 -03:00
Gustavo Trott
7f88d2efa4
Add Chat collections to Hasura/Postgres
2023-03-29 09:55:41 -03:00
Gustavo Trott
52fd6d3ad5
Insert Meeting props to database/Hasura
2023-03-24 13:33:08 -03:00
Gustavo Trott
b2bc0c838d
Include more data to (Postgres/Hasura) graphql-server
2023-03-16 13:56:32 -03:00
Gustavo Trott
f641b71b4a
Adjusts to run graphql client
2023-03-11 12:11:50 -03:00
Gustavo Trott
42711ac5ae
Initial implementation of Postgres data and Hasura
2023-03-08 12:23:45 -03:00
Guilherme Pereira Leme
48853d483d
[issue-16734] - changes in review
...
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2023-02-27 14:59:51 -03:00
GuiLeme
cfdff618fc
[issue-16734] - Changes in review
2023-02-27 12:45:04 -03:00
GuiLeme
661ab05bfa
[issue-16734] - changes in review
2023-02-24 12:52:01 -03:00
GuiLeme
d47d586f0e
[issue-16734] - refactor disabledFeatures presentationArea to just presentation
2023-02-22 17:16:43 -03:00
GuiLeme
421717a817
[issue-16734] - patch for error handling
2023-02-21 08:41:05 -03:00
GuiLeme
3e6bb32a45
Merge remote-tracking branch 'upstream/v2.6.x-release' into issue-13867
2023-02-08 11:41:10 -03:00
Bohdan Zhemelinskyi
ffb8aaf616
fix dial-in guest join
2023-02-03 17:02:28 +00:00
GuiLeme
ce50e00cef
[issue-13867] - remove and related settings
2023-01-31 10:30:55 -03:00
Gustavo Trott
701a355ef2
Merge pull request #16571 from paultrudel/multi-user-join-issue
2023-01-26 16:46:56 -03:00
Paul Trudel
4fb221c613
Removed unused import
2023-01-26 19:36:34 +00:00
Paul Trudel
cda9c06da4
Added some additional logs for user authentiction and purging
2023-01-26 19:25:36 +00:00
Anton Georgiev
f024171671
fix(sec): bump jackson to 2.13.5
2023-01-25 22:44:28 +00:00
Gustavo Trott
ff184d9d13
Merge pull request #16421 from danielpetri1/capture-content-iff-necessary
2023-01-19 15:34:34 -03:00
Gustavo Trott
f121418355
Improvements to choose filename of captured content
2023-01-18 20:51:06 -03:00
Gustavo Trott
fc245c13a2
Upgrade logback to 1.2.11
2023-01-17 11:35:59 -03:00
Daniel Petri Rocha
2ecd3d6a80
Use prop as filename
2023-01-17 00:10:13 +01:00
Daniel Petri Rocha
a6b589a069
Add captured filename as breakout property
2023-01-16 23:00:27 +01:00
Daniel Petri Rocha
e15e17c307
Prevent toast from waiting forever when no presentation is set
2023-01-14 19:03:07 +01:00
Daniel Petri Rocha
a72d76a46a
Add 'no content' toast for slide capture
2023-01-14 18:00:29 +01:00
Daniel Petri Rocha
da6f5d996e
Merge branch 'v2.6.x-release' into capture-content-iff-necessary
2023-01-14 13:43:38 +01:00
Gustavo Trott
734221676e
Merge pull request #16170 from GuiLeme/disabled-transcriptions
2023-01-11 13:54:05 -03:00
Daniel Petri Rocha
a5b463306b
Revert "Skip export if no annotations available"
...
This reverts commit efb4031fb5
2023-01-10 13:51:15 +01:00
Daniel Petri Rocha
feaaff2eee
Prevent export in send to chat if no annotations available
2023-01-10 13:46:54 +01:00
Daniel Petri Rocha
3b8bdef05b
Merge branch 'v2.6.x-release' into capture-slides-upload-toast
2023-01-09 16:03:44 +01:00
Daniel Petri Rocha
69fffe777c
Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into v2.6.x-release
2023-01-09 15:53:36 +01:00
GuiLeme
78b165ed7c
Merge remote-tracking branch 'upstream/v2.6.x-release' into disabled-transcriptions
2023-01-09 10:58:25 -03:00
GuiLeme
f67f530b32
[disabled-transcription] - Renamed audioCaptions to liveTranscription (for disabledFeatures)
2023-01-09 10:47:22 -03:00
GuiLeme
73f84d5dc5
[disabled-transcription] - Added new validation in akka
2023-01-09 10:30:05 -03:00
Anton Georgiev
3a74c2bec1
Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2510-to-26
2023-01-05 18:30:09 +00:00
Anton Georgiev
c7fb6615fa
Merge pull request #16392 from antobinary/fix-indent
...
refactor: fix indentation in core
2023-01-05 09:39:42 -05:00
Anton Georgiev
55fe868a27
refactor: fix indentation in core
2023-01-05 11:24:42 +00:00
Anton Georgiev
2ab08082eb
fix: use correct service name in akka-apps deploy
2023-01-05 06:04:53 -05:00
Daniel Petri Rocha
efb4031fb5
Skip export if no annotations available
2022-12-27 17:33:00 +01:00
Daniel Petri Rocha
a8657ff0ed
Merge branch 'v2.6.x-release' into capture-slides-upload-toast
2022-12-22 21:18:14 +01:00
Anton Georgiev
2d7bdbedbd
Merge pull request #16175 from danielpetri1/poll-fix-pdf-export
...
fix(export-annotations): Display poll results
2022-12-22 13:17:12 -05:00
Anton Georgiev
657473e0d6
chore: upgrade scala 2.13.4 -> 2.13.9
2022-12-20 21:30:49 +00:00
Anton Georgiev
a1b7d3a963
Merge pull request #16185 from antobinary/scala
...
chore: upgrade scala 2.13.4 -> 2.13.9
2022-12-20 15:22:22 -05:00
Anton Georgiev
a8d64e94d6
chore: upgrade scala 2.13.4 -> 2.13.9
2022-12-20 16:07:08 +00:00
Daniel Petri Rocha
752ada2a6b
Refactor: don't hardcode JobTypes
2022-12-17 16:32:49 +01:00
Daniel Petri Rocha
532d39deb4
Undo adding timestamp to filename
2022-12-17 15:11:20 +01:00
Bohdan Zhemelinskyi
fc5a1adaa5
re-apply lock settings fix
2022-12-15 20:08:49 +00:00
KDSBrowne
09eb68f23b
add lock setting for viewer annotations
2022-12-12 23:26:03 +00:00
Daniel Petri Rocha
df4d896e3a
Delete print statement
2022-12-10 00:01:56 +01:00
Daniel Petri Rocha
d06a642ae9
Include timestamp in exported content
2022-12-09 23:48:04 +01:00
Joao Victor
1239458fb8
Update description of presentation thumbnails
2022-12-09 10:38:20 -03:00
GuiLeme
5391bd1a83
[fix-check-mime-insert-document] - changes in review
2022-11-23 09:22:35 -03:00
Daniel Petri Rocha
5a432289cf
Remove unreachable code
2022-11-23 01:39:41 +01:00
Daniel Petri Rocha
587c11c56a
Remove potential race condition
2022-11-23 01:25:03 +01:00
GuiLeme
058bbb039b
[fix-check-mime-insert-document] - add validation to front-end
2022-11-22 17:41:57 -03:00
Daniel Petri Rocha
b43863342b
Add captured slides to UploadingPresentations collection
2022-11-22 21:07:43 +01:00
Gustavo Trott
8b7b501ea2
Merge pull request #15589 from danielpetri1/breakout-shared-notes-upload
2022-11-21 08:08:36 -03:00
Gustavo Trott
17a16eced5
Merge pull request #16022 from gustavotrott/presentation-refactor
2022-11-18 16:31:00 -03:00
Daniel Petri Rocha
a53a7e924f
Refactor: remove setPresentationExportingProgress; AnalyticsActor log
2022-11-17 20:55:15 +01:00
Gustavo Trott
7781909d50
Removes all references to swf files (used by old flash client)
2022-11-17 10:55:19 -03:00
Gustavo Trott
531241d269
feat: Button to transfer user to mobile App ( #15183 )
...
* Provide a link to transfer user to mobile App
* show menu option only if appStoreLink is present and it is not running on mobile app already
2022-11-15 09:49:24 -03:00
Daniel Petri Rocha
c786164d05
Refactor worker kickoff
...
Removes duplicated code across workers.
2022-11-11 17:51:30 +01:00
Daniel Petri Rocha
f6ccf74f9b
Merge branch 'v2.6.x-release' into breakout-shared-notes-upload
2022-11-11 15:38:38 +01:00
Daniel Petri Rocha
334b97779b
Merge branch 'v2.6.x-release' into capture-notes-toast
2022-11-10 23:01:28 +01:00
Gustavo Trott
50010ea528
Merge pull request #15894 from JoVictorNunes/shared-notes-on-media
2022-11-10 11:44:28 -03:00
Gustavo Trott
c9ddd971f5
Merge pull request #15857 from gustavotrott/max-users-improvements
...
Closes https://github.com/bigbluebutton/bigbluebutton/issues/9354
2022-11-07 21:24:07 -03:00
Daniel Petri Rocha
f7952fa256
Allow 16 simultaneous exports; remove timeout behavior
2022-11-03 18:09:48 +01:00
Joao Victor
08fac039c8
Merge branch 'v2.6.x-release' into shared-notes-on-media
2022-10-31 11:13:31 -03:00
Gustavo Trott
09697948e1
Merge pull request #15708 from danielpetri1/breakout-upload-ui
2022-10-31 08:29:56 -03:00
Gustavo Trott
ba647cdd08
Handle Pin Shared Notes in akka-apps
2022-10-28 08:10:23 -03:00
Gustavo Trott
d2d69dd7f9
Removes function clearWhiteboard that is not used anymore
2022-10-26 17:59:09 -03:00
Gustavo Trott
1bd9d57c84
Improves readability
2022-10-26 17:22:17 -03:00
Gustavo Trott
f747b82d47
Improve validation of maxParticipants on akka-apps side
2022-10-26 13:19:16 -03:00
Daniel Petri Rocha
a8587d53b8
Merge branch 'v2.6.x-release' into breakout-upload-ui
2022-10-25 16:13:24 +02:00
Gustavo Trott
e2f9b19afc
Merge remote-tracking branch 'upstream/v2.6.x-release' into max-users-improvements
2022-10-24 22:48:38 -03:00
germanocaumo
ce9e53cfe3
fix(tldraw): fix crash on race condition when adding annotion
...
Sometimes delete and add messages could be received out-of-order in akka, so the page could be saved with an incomplete annotation.
Now we ignore the update message if the annotation does not exists before.
2022-10-24 20:06:22 +00:00
germanocaumo
d3082f3ca0
Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into tldraw-shape-updates
2022-10-24 15:04:00 +00:00
Ramón Souza
8ed142a522
Merge remote-tracking branch 'upstream/v2.5.x-release' into merge-258-26
2022-10-21 14:43:23 -03:00
germanocaumo
835cf4f753
fix(whiteboard): diff shape update + shape permission +
...
Several improvements to tldraw whiteboard:
- Only send the shape diff on shape updates (reduce a lot the message traffic)
- Shape permissions (don't allow others to select/edit unless you are presenter/moderator)
- This required some changes in akka model
- Tldraw state patch changes to improve stability with fast updates (fix several crashes)
2022-10-21 14:05:31 +00:00
Gustavo Trott
d97dadaf65
Add validation on poll responses
2022-10-20 09:22:23 -03:00
Daniel Petri Rocha
0a2b4186a2
Merge branch 'v2.6.x-release' into breakout-upload-ui
2022-10-19 19:51:05 +02:00
Daniel Petri Rocha
dd06ce2660
Show UploadingPresentations toast upon breakout notes capture
...
Displays a "To be uploaded..." toast in the main meeting while the shared notes of breakout rooms are being captured.
2022-10-19 13:36:25 +02:00
Gustavo Trott
ba2aefb5b2
Merge pull request #15840 from gustavotrott/fix-polls-multiple-answers-v26
2022-10-19 08:07:17 -03:00
Gustavo Trott
ddd32b40f0
Validate if user already added a typed answer
2022-10-18 08:10:43 -03:00
Gustavo Trott
80ffb26fff
Implements maxUserConcurrentAccesses and change participants count logic
2022-10-17 17:30:53 -03:00
GuiLeme
bc9f24a5fb
[backport-pdf-100] - backport of functionality
2022-10-17 17:05:16 -03:00
Gustavo Trott
8dee4bb7b3
Ignore answer if user already responded
2022-10-11 10:07:25 -03:00
Daniel Petri Rocha
f170bdc19b
Merge branch 'v2.6.x-release' into capture-shared-notes
2022-10-06 22:38:21 +02:00
GuiLeme
5ca4a92940
[issue-pdf-100-processing] - resolved conflicts
2022-10-06 09:58:42 -03:00
Gustavo Trott
bbe3ca34a8
Merge pull request #15474 from GuiLeme/apply-toast-shared-notes
2022-10-05 12:02:04 -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
Daniel Petri Rocha
440deff4dc
Address SonarCloud code smells
2022-09-29 16:32:49 +02:00
Daniel Petri Rocha
289f4125ec
Perform captured pad upload
2022-09-28 19:56:29 +02:00
germanocaumo
d770a7df8c
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-09-28 12:03:59 +00:00
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
edb2ff39cc
Perform upload upon breakout room timeout
2022-09-19 19:22:29 +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
Daniel Petri Rocha
41f71981f4
Working checkbox in backend
2022-09-11 20:12:37 +02:00
Anton Georgiev
a17679834f
Merge pull request #15632 from antobinary/build-tweaks-2
...
fix: JVM apps stopping to differ from failure
2022-09-07 22:02:52 -04: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
80a381c87c
[apply-toast-shared-notes] - resolved conflicts and refactored temporaryPresentationId's name
2022-09-02 15:24:29 -03:00
Anton Georgiev
4ea7bfb6b4
fix: JVM apps stop to differ from failure
2022-09-02 01:59:56 +00: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
germanocaumo
d609628047
refactor(recording): remove not used event
2022-08-23 18:39:46 +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
Joao Victor
0d08f226eb
fix: send notification messages to appropriate redis channel
2022-08-18 14:34:26 -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
491380096e
[apply-toast-shared-notes] - changes in review and resolve merge conflict
2022-08-11 15:50:06 -03:00
Gustavo Trott
13308031bb
Merge branch 'v2.6.x-release' into fixPhoneUserLock25
2022-08-04 22:34:57 -03: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
Daniel Petri Rocha
3529fe9f28
Rename parameters; hide download button and label when disabled
2022-08-02 15:53:40 +02:00
Daniel Petri Rocha
5dfc9293fb
Merge branch 'v2.6.x-release' into pdf-disabledFeatures-tldraw
2022-08-02 12:29:38 +02: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
d32d47168f
feat(captions): add transcript settings
...
Define number of lines and words per line at application.conf.
2022-07-20 17:20:50 +00:00
Pedro Beschorner Marin
f726cb0ad5
refactor(captions): UX improvements
...
Parse the audio transcript before broadcasting it's content back to the
client and the recording actor. Limiting by 8 words per line and max of
2 lines to avoid CPU intensive operations over this recurring event.
Replace Calibri font family with Verdana to improve character spacing,
add relative sizing to the text content and a background padding.
2022-07-20 17:20:49 +00:00
Pedro Beschorner Marin
1519462f4e
feat(captions): use audio's floor
...
Broadcast the transcript's event based on the voice user's floor state.
2022-07-20 17:20:49 +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
Daniel Petri Rocha
5f98290413
Add presentationWithAnnotationDownload, exportPresentationWithAnnotation to disabledFeatures
2022-07-12 18:58:56 +02:00
Anton Georgiev
da474130d9
build: akka apps + fsesl as part of bigbluebutton.target
2022-07-07 00:00:35 +00:00
Anton Georgiev
4595b6688f
Merge pull request #15244 from germanocaumo/tldraw-recording
...
fix(whiteboard): tldraw recording processing/publishing
2022-07-05 08:55:01 -04:00
Gustavo Trott
502523a048
Merge pull request #14562 from danielpetri1/container-approach
2022-06-30 11:33:47 -03:00
germanocaumo
c2db91b5f9
Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into tldraw-recording
2022-06-30 14:31:08 +00: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
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
germanocaumo
853d0dfd9b
fix(whiteboard): tldraw recording processing/publishing
...
Changed the names of tldraw record events to differentiate from before.
Publish tldraw.json file with all shape information during the meeting to be used in playback.
Adapted cursor.xml and panzoom.xml to store tldraw data.
Publish slides svgs to be used by playback's tldraw component (otherwise we have different image sizes in pngs and thus messing the coordinates).
Retro-compatible with old recordings.
2022-06-23 17:04:09 +00:00
prlanzarin
e1644a9fa9
fix(screenshare): remove userLeftFlag from permission checks
...
If the user is in akka-apps' user cache (which means they are still
visible in the user list) and triggers a screenshare re-connect, the
re-connect should be allowed to minimize outages.
If the user indeeds fails to be reconnected to the whole system, then
the screen sharing sessions will be ejected when the user is
completely ejected from the system.
2022-06-22 23:13:55 +00:00
prlanzarin
14b1c818b1
fix(webcam): remove userLeftFlag from permission checks
...
If the user is in akka-apps' user cache (which means they are still
visible in the user list) and triggers a camera re-connect, the
re-connect should be allowed to minimize outages.
If the user indeeds fails to be reconnected to the whole system, then
the camera sessions will be ejected when the user is completely ejected
from the system.
2022-06-22 23:13:54 +00: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
prlanzarin
a1988dbe76
fix(audio): remove userLeftFlag from global audio permission check
...
If the user is in akka-apps' user cache (which means they are still
visible in the user list) and triggers an audio re-connect, the
re-connect should be allowed.
If the user indeeds fails to be reconnected to the whole system, then
the audio session will be ejected when the user is completely ejected
from the system.
2022-06-22 20:49:39 +00: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
4e2f013fa0
fix user removal in breakout
2022-06-08 15:00:40 -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
germanocaumo
07a3a915c0
feat(whiteboard): poll result, zoom fit slide +
...
- Poll result as text shape in the lower right-hand
- Include all tldraw shape bounds as size in akka (to help Daniel rendering in pdf export)
- Default/initital zoom will be centered in the slide and maximize the size according to the presentation area
- Also limited the max zoom out to be the one that fits the slide, to be similar as we had before
2022-05-31 19:40:31 +00:00
Lucas Zawacki
cd13446c5a
fix(layout): Moderators could not change layout if pushLayout was true
2022-05-24 17:31:35 -03:00
Tainan Felipe
3ae69643b2
Make sure that user is a chat participant when send a message
2022-05-24 17:08:56 -03:00
Ramon Souza
5bddbdb4cf
adjustments
2022-05-17 09:39:15 -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
KDSBrowne
632bac1ebc
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.6-bbb-tldraw
2022-05-15 14:02:22 +00:00
Anton Georgiev
c4874398f6
chore: Merge 2.5.0-rc.2 into develop
2022-05-13 21:03:34 +00:00
Ramon Souza
3800065380
remove chat name
2022-05-13 17:44:41 -03:00
KDSBrowne
10adb3e097
remove merge comment
2022-05-13 12:14:01 +00: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
48f05962a0
Add sequence number to exported PDFs
2022-05-04 18:45:04 +02:00
Daniel Petri Rocha
19bbb4115d
Refactor handlers, role validation
2022-04-30 23:28:11 +02:00
Guilherme Pereira Leme
31eef0bdd3
Changes in review
...
Co-authored-by: Paulo Lanzarin <4529051+prlanzarin@users.noreply.github.com>
2022-04-29 17:24:31 -03:00
Daniel Petri Rocha
7851d54484
PDF file: include meeting and room name
2022-04-29 13:50:42 +02:00
Guilherme Leme
0a384a1331
[issue-9789] - Created the event startConfiguration to store the initial state of WebcamsOnlyForModerator property
2022-04-28 15:59:12 -03: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
Anton Georgiev
c808f1f1dd
chore: Drop .dockerignore and docker-entrypoint.sh files #14814
2022-04-13 17:17:08 +00:00
Anton Georgiev
13bed65baf
chore: drop obsolete Dockerfile from BBB
2022-04-12 20:34:28 +00:00
Gustavo Trott
ecbfee26db
Missing parts
2022-04-12 13:56:54 -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
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
Ramón Souza
1810e1728b
Update akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala
...
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2022-04-07 17:31:32 -03:00
Ramon Souza
6dea6a1d6e
add user join/leave notifications - akka-apps
2022-04-07 09:41:36 -03:00
Ramon Souza
ec3b43b3bd
add guest user notifications - akka-apps
2022-04-07 09:41:26 -03:00
Ramon Souza
28414c1a5a
add lock settings notifications - akka-apps
2022-04-07 09:41:21 -03:00
Ramon Souza
d62b2d4f2e
add user promote/demote notifications - akka-apps
2022-04-07 09:41:16 -03:00
Ramon Souza
d64d605ed6
add poll published notifications - akka-apps
2022-04-07 09:41:10 -03:00
Ramon Souza
921c563f7d
add meeting mute/unmute notifications - akka-apps
2022-04-07 09:41:03 -03:00
Ramon Souza
5554a0fb41
add start/stop recording notifications - akka-apps
2022-04-07 09:40:56 -03:00
Ramon Souza
2edc102f80
move user message to all breakouts notification to akka
2022-04-07 09:40:13 -03:00
Ramon Souza
a80fe263a3
move breakout room ended notification to akka
2022-04-07 09:39:32 -03:00
Daniel Petri Rocha
6703ac8ba1
Merge branch 'bigbluebutton:develop' into container-approach
2022-04-05 12:42:10 +02: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
Tainan Felipe
231a25f0cb
Remove trailling semicolon
2022-04-04 14:40:59 -03:00
Tainan Felipe
159a09be49
Small adjustments
2022-04-04 14:26:00 -03:00
Gustavo Trott
73977036cc
Remove garbage
2022-04-01 17:30:39 -03:00
Gustavo Trott
839aeb2685
Remove UserEjectedFromMeetingEvtMsg occurrences
2022-04-01 17:11:28 -03:00
Gustavo Trott
4ab9b9bc17
Improve scripts to run/deploy applications
2022-03-31 13:48:57 -03:00
Ramon Souza
51726166c2
add moderator notification on breakout time update
2022-03-30 13:23:13 -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
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
Gustavo Trott
fb587f8c84
Merge branch 'v2.5.x-release' into disabledFeatures-layouts
2022-03-18 15:46:45 -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
Tainan Felipe
375ee3602b
reset conf to default
2022-03-17 09:35:56 -03:00
Tainan Felipe
051495c69b
Merge branch 'wip-notifications' of github.com:Tainan404/bigbluebutton into wip-notifications
2022-03-17 09:16:14 -03:00
Tainan Felipe
d226ee3887
Remove deprecated messages
2022-03-17 09:11:16 -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
c76ab27d8e
update for fsesl
2022-03-16 17:46:18 +00:00
Bohdan Zhemelinskyi
cb716b005b
modified common-message for java 11
2022-03-16 17:45:11 +00:00
Anton Georgiev
0d1d45245c
Merge pull request #14570 from gustavotrott/disabledFeatures-notes
...
feat: Support to disable shared notes and captions via disabledFeatures
2022-03-16 11:45:52 -04:00
Gustavo Trott
c214a479f9
Implements disabledFeatures=layouts
2022-03-15 10:40:02 -03:00
Pedro Beschorner Marin
61e9605545
fix(chat): get sender from msg
2022-03-15 09:22:49 -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
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
Gustavo Trott
a4c88e0578
better readability
...
Co-authored-by: Pedro Beschorner Marin <pedrobmarin@gmail.com>
2022-03-10 15:53:05 -03:00
Gustavo Trott
9f939513b0
Implements disabledFeatures=captions
2022-03-10 15:02:20 -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
Gustavo Trott
901c990ce4
Fix merge conflicts on Akka
2022-03-10 10:11:14 -03:00
Gustavo Trott
ad95126912
Fix breaking closeCaption on disabling sharedNotes
2022-03-10 08:56:12 -03:00
Ramón Souza
ae5e116e16
Merge remote-tracking branch 'upstream/v2.4.x-release' into merge-24-25-mar09
2022-03-09 20:40:07 +00:00
Gustavo Trott
537704ef0e
Implements disabledFeatures=sharedNotes
2022-03-09 16:23:38 -03:00
Gustavo Trott
057b7514b1
Implements disabledFeatures-chat
2022-03-09 11:19:25 -03:00
Gustavo Trott
2719bd4f65
Implements disabledFeatures=externalVideos
2022-03-09 10:33:18 -03:00
Gustavo Trott
3013c2792b
Implements disabledFeatures/polls
2022-03-08 15:05:24 -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
Gustavo Trott
f131155bc0
Add missing file
2022-03-06 19:55:30 -03:00
Gustavo Trott
9bc5017333
Fix message description
2022-03-06 19:54:15 -03:00
Gustavo Trott
a5af4ff0b2
Extend user ejection for breakout rooms too
2022-03-06 19:45:53 -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
d85f857220
Merge pull request #14509 from prlanzarin/u24-15-vague
...
fix(screenshare): request ejection when presenter automatically changes
2022-03-03 12:49:05 -05:00
prlanzarin
c7f0c23731
fix(screenshare): request ejection when presenter automatically changes
...
Fixes an edge case where screen ejections weren't being requested internally on
ungraceful presenter changes
2022-03-02 17:48:30 -03:00
Anton Georgiev
de58d9c10c
Merge pull request #14438 from pedrobmarin/f-e-aafc
...
feat(events): add audio floor change
2022-03-02 08:51:40 -05: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
c59037310a
Revert change in SystemConfiguration.scala
2022-03-01 17:34:38 -03: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
Bohdan Zhemelinskyi
c8eeb69979
fixedPhoneLock
2022-02-25 15:31:35 +00:00
Guilherme Pereira Leme
36af1d966e
send directly the chatEmphaiszedText
...
Co-authored-by: Pedro Beschorner Marin <pedrobmarin@gmail.com>
2022-02-25 10:14:57 -03:00
Anton Georgiev
4e268dffa3
WIP target JVM8 -> JVM11
2022-02-25 04:39:48 +00:00
Anton Georgiev
8c29a6568f
Merge pull request #14344 from zhem0004/fixPhoneJoinPermission
...
Fix: dial in users obey guest policy
2022-02-24 15:26:44 -05: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
Anton Georgiev
57f53918f0
Merge branch 'v2.5.x-release' into fixPhoneJoinPermission
2022-02-24 15:16:11 -05: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
Gustavo Trott
6839a424c1
Merge remote-tracking branch 'origin/update-breakout-duration' into update-breakout-duration
2022-02-24 13:53:01 -03:00
Lucas Zawacki
6dfdc6a579
feature(layout): Push most layout parts with custom layout
2022-02-24 13:21:16 -03:00
Paulo Lanzarin
79d5c835c0
Merge pull request #14433 from pedrobmarin/f-v-auccc
...
feat(video): add user camera cap control
2022-02-24 13:15:22 -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
Gustavo Trott
e4046dbe04
Update last Role of user in Dashboard
2022-02-23 18:42:34 -03:00
Lucas Zawacki
cad3c9a3f0
feature(layout): Only require presenter permission for layout push
2022-02-23 18:03:08 -03: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
b843bb583a
feat(events): add audio floor change
...
Include at the meeting's recorded events the audio floor changed event.
2022-02-22 17:20:52 -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
Daniel Petri Rocha
acdcd4d89a
Text linebreaks for long words
2022-02-22 17:02:54 +01: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
d6d2a6dc0b
Revert sbt.json
2022-02-21 08:35:00 -03:00
Gustavo Trott
fb263babe6
Implements update breakout duration, and removes extend
2022-02-21 08:14:34 -03:00
Anton Georgiev
60302d3e35
Merge pull request #14405 from antobinary/2.4.4-branch
...
Merge 2.4.4 into 2.5-alpha-1
2022-02-18 12:19:13 -05:00
Guilherme Leme
f6e144d71c
[issue-14243] - Changes in Akka, to save the events in redis, and changes in rap to process these changes.
2022-02-17 17:23:28 -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
Daniel Petri Rocha
f299947216
Collector worker
2022-02-12 21:03:07 +01:00
Bohdan Zhemelinskyi
5a448766ad
added dial in prefix
2022-02-11 16:21:39 +00:00
Bohdan Zhemelinskyi
1d21b20379
fixes
2022-02-11 15:26:47 +00:00
root
9dbb5a0406
changing java arguments to 11
2022-02-11 09:58:55 +00: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
Bohdan Zhemelinskyi
fbef4f43a7
Added logic
2022-02-10 15:42:54 +00:00
Bohdan Zhemelinskyi
0c63f0899e
fixed join permission for Phone Users
2022-02-10 15:42:26 +00:00
Daniel Petri Rocha
d6eb8b602f
Point PresLocation to SVG files, collector taking annotations from Redis
2022-02-10 12:48:54 +01:00
Paulo Lanzarin
8d91bae7e8
Revert "fix: Phone users to abide by guest policy"
2022-02-09 20:02:38 -03: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
cf7184f504
Merge pull request #14269 from prlanzarin/u24-eight-statue
...
fix(webcams): add stream ID to broadcast check, better lock setting enforcement
2022-02-04 12:58:46 -05:00
prlanzarin
a8f3ebd661
fix(webcams): always run lock settings enforcement on user demotion
...
Checking for the user locked state before running the procedure is not entirely
correct since some lock settings should always be appleid. An example of the is
the See other viewers lock which must be enforced on demotion regardless of
whether the demoted user is locked or not.
2022-02-03 15:41:14 -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
Anton Georgiev
7152d23e39
Merge pull request #14147 from zhem0004/fixPhoneJoinPermission
...
fix: Phone users to abide by guest policy
2022-02-03 12:07:47 -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
3f0fb558b1
Add ExportAnnotationsActor
2022-02-02 16:32:09 +01: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
38b256dba5
Remove unnecessary codes
2022-01-28 15:00:17 -03:00
Gustavo Trott
eb567eb106
Handle message to all breakouts sent
2022-01-28 14:41:10 -03:00
Bohdan Zhemelinskyi
fe91b448c2
Merge branch 'v2.4.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixPhoneJoinPermission
2022-01-27 15:43:48 +00: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
Daniel Petri Rocha
87f51b1ba4
Add PresentationUploadToken to handleExportPresentationWithAnnotationReqMsg
2022-01-26 23:52:18 +01: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
Bohdan Zhemelinskyi
98c45a2167
Changes on feedback
2022-01-24 20:46:32 +00: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
Bohdan Zhemelinskyi
a77eca86cd
Added logic
2022-01-24 16:24:28 +00:00
Daniel Petri Rocha
6c13edc32c
Add export job / annotations object
2022-01-24 16:35:23 +01:00
Paulo Lanzarin
1f4f60093d
Merge pull request #14091 from prlanzarin/u24-martha-55
...
fix(screenshare): add akka-apps|webrtc-sfu broadcast stop sys msg
2022-01-21 18:06:35 -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
Anton Georgiev
6c196be63e
Merge pull request #13931 from zhem0004/BorderCase
...
FixGracePeriod
2022-01-20 08:52:27 -05:00
Aleksandar Vasilev
3b5781402c
Corrected HashMap updates in GuestsWaiting.scala
2022-01-20 04:11:34 +02:00
Bohdan Zhemelinskyi
8582ccd6db
fixed join permission for Phone Users
2022-01-19 18:35:04 +00:00
Daniel Petri Rocha
05a149da56
Iterate over pages collecting annotations
2022-01-19 15:32:40 +01:00
Daniel Petri Rocha
e1489bd3d7
Get number of pages in current presentation
2022-01-19 13:52:12 +01:00
Daniel Petri Rocha
22d50a7572
MakePresentationWithAnnotationDownloadReqMsg with parameters in MeetingActor
2022-01-18 16:05:02 +01:00
Daniel Petri Rocha
4442da1aa5
Send makePresentationWithAnnotationDownloadReqMsg to Redis PubSub
2022-01-16 19:43:13 +01:00
Daniel Petri Rocha
56669cab98
Button in HTML5 interface that emits activity sign
2022-01-16 16:56:46 +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
baf1b53407
Resolve conflicts in Ramon's 2.4 merge
2022-01-12 19:35:00 -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
68942d45db
Merge branch 'wip-new-msg-userLeftFlag' of github.com:Tainan404/bigbluebutton into wip-new-msg-userLeftFlag
2022-01-07 11:41:19 -03:00
Tainan Felipe
5ae5d230b8
Create util function in HandlerHelper
2022-01-07 11:37:23 -03:00
Tainan Felipe
6ed8fb304a
Merge branch 'v2.4.x-release' into wip-new-msg-userLeftFlag
2022-01-06 18:20:32 -03:00
Tainan Felipe
9c844bdd26
Add userLeftFlag message
2022-01-06 18:07:22 -03:00
hiroshisuga
142f9e447a
Fix annotation order for pen drawings #12249
2022-01-05 16:39:44 -05:00
Anton Georgiev
b41f895ab8
Merge pull request #13850 from Tainan404/remove-grace-period
...
Remove Grace Period for locked user in chat
2022-01-05 14:51:16 -05:00
Bohdan Zhemelinskyi
323bb606ef
FixGracePeriod
2022-01-04 18:41:11 +00: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
69aba9ea6a
Merge pull request #13853 from zhem0004/fixModifyWhiteboardAccess
...
fixWhiteboardModifyPermissionsCheck
2021-12-15 14:08:26 -05:00
Tainan Felipe
50b10a1288
Add else returning the state
2021-12-15 14:02:39 -03: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
Anton Georgiev
3433396672
Merge pull request #13895 from gustavotrott/dashboard-cookies-fix
...
fix: Reduces Dashboard cookie lifetime
2021-12-14 13:04:07 -05:00
Anton Georgiev
26b19a1b55
Merge pull request #13826 from gustavotrott/dashboard-grouped-by-extId
...
Refactor: Dashboard grouped by extId
2021-12-14 10:17:18 -05: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
Anton Georgiev
dfcd6a4fe8
Resolved akka-apps conflicts
2021-12-10 23:08:40 +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
Anton Georgiev
75a64da3cc
refactor: Decrease time allowed for reconnection
...
We are receiving feedback that due to this 30s period that the user remains in the room, if a user exits a breakout room, that user won't be able to re-join it until 30s elapses.
More investigation is needed but given that this 30s value is somewhat large, I'm [temporarily] reducing it to 10s. Related #13531
2021-12-09 11:46:51 -05:00
Gustavo Trott
a8042a5b9e
Allow multiple choices poll in Dashboard
2021-12-08 10:40:09 -03:00
Bohdan Zhemelinskyi
3690c02b74
fixWhiteboardModifyPermissionsCheck
2021-12-07 20:02:28 +00:00
Tainan Felipe
7d6cc80eb0
Remove ejection behavior from locked users who sent chat message
2021-12-07 15:12:01 -03:00
Tainan Felipe
f98e57a617
Remove Grace Period for locked user on chat
2021-12-07 15:06:21 -03:00
Gustavo Trott
f50be91411
Only merge users (extId) if there is no overlap between differents intIds
2021-12-07 14:41:16 -03: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
f9ecbb135b
upgrading dependency of akka-bbb-apps
2021-12-04 10:44:11 +00:00
hiroshisuga
52bc4c5a90
remove a duplicated condition
2021-12-04 18:51:22 +09:00
Anton Georgiev
dce14adf50
Merge pull request #13803 from zhem0004/fixAnnotationPermissionCheck
...
Fixed annotation permission
2021-12-03 15:18:25 -05:00
Gustavo Trott
f44801e13c
Groups dashboard data by extId
2021-12-03 15:47:16 -03:00
root
ce7362380b
Merge branch 'develop' into origin/jdk-17-upgrade
2021-12-03 14:04:02 +00:00
Anton Georgiev
a4a37233a9
Merge pull request #13766 from Tainan404/fix-ejected-user-not-validated
...
fix: Fixes the validation of banned users
2021-12-02 16:12:29 -05:00
Anton Georgiev
c89dde225e
Merge pull request #13817 from zhem0004/FixEmojiStatusPermissions
...
fix: Fix Emoji Permissions in akka-apps
2021-12-02 16:02:57 -05: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
Bohdan Zhemelinskyi
404bc83f18
FixEmojiPermissions
2021-12-02 18:37:47 +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
Bohdan Zhemelinskyi
af947d68a2
Fixed annotation permission
2021-12-01 20:29:20 +00:00
Anton Georgiev
94f85ad68a
Merge pull request #13678 from gustavotrott/breakouts-n-groups-assignments-2.5
...
feat: Auto assign Breakouts (names and users) using previous rooms info or groups info
2021-12-01 15:01:23 -05: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
root
3f2f1678ce
upgrading akka-bbb-apps
2021-11-29 17:03:44 +00:00
Tainan Felipe
30cef81400
Fixes the validation of banned users
2021-11-26 15:34:38 -03:00
Gustavo Trott
df60295d22
Implements join param excludeFromDashboard
2021-11-26 14:07:03 -03:00
Gustavo Trott
4ebd27065a
Include presentations info to Learning Dashboard Json
2021-11-17 14:42:34 -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
Anton Georgiev
c60ef3c179
Merge pull request #13253 from ramonlsouza/PR-11359
...
feat: multiple choice poll
2021-10-26 14:42:29 -04:00
Ramón Souza
1807122a84
fix multiple choice custom poll
2021-10-26 17:24:47 +00:00
Joao Siebel
7a118ed3b8
Remove unused properties from chat message event record. close #11696
2021-10-25 14:46:59 -03:00
Anton Georgiev
1622425cbc
Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.4-into-develop
2021-10-22 19:12:58 +00:00
Tiago Jacobs
57c1ea332a
Increase time allowed for reconnection
2021-10-20 15:24:32 -03:00
Ramón Souza
1cc066366f
Merge remote-tracking branch 'upstream/develop' into PR-11359
2021-10-19 16:41:36 +00:00
Joao Siebel
1218b8b610
Add constraint for actions in breakouts on akka
2021-10-15 16:25:36 -03:00
Philipp Memmel
e580040e3a
Allow non-mod presenters to see and lower raised hands
2021-09-27 11:29:49 +00:00
Ramon Souza
c892a2a5d1
resolve conflicts
2021-09-21 12:06:27 -03:00
Anton Georgiev
0b1f26bd57
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-23-into-24
2021-09-21 14:12:32 +00: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
065dedf0fa
Avoid to reset lastModeratorLeftOnInMs when some user leave the meeting
2021-09-16 14:46:16 -03:00
Gustavo Trott
2a348e5f71
Makes Akka stop ScreenShare when External Video is started
2021-09-09 15:27:29 -03:00
Joao Siebel
e51b197049
Prevent VIEWER to get breakout's url for breakouts that he is not assigned
2021-08-31 11:50:30 -03:00
Gustavo Trott
6970a0ab30
Merge branch 'develop' into learning-dashboard-improvements2
2021-08-30 15:23:04 -03:00
Anton Georgiev
4ecb24b4fa
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-aug30
2021-08-30 18:11:16 +00:00
Gustavo Trott
cd15f17394
Refactor all references for activity-report renaming to learning-dashboard
2021-08-25 11:38:35 -03:00
Pedro Beschorner Marin
57e27bb4dc
fix(polling): stop current running poll
...
As far as I could understand, polls are tightly coupled with the meeting
main content area, or at least they were and we still have to deal with
this close relation between them. Not sure if it's something we'll keep
this way forever but, from my candid perspective, looks like this is already
diverging inside the poll model. Polls are indexed by presentation pages,
screenshare or even something called "public" that I'm not 100% what
actually means. My best guess is anything besides the first and the second.
The polling stop process lacks to inform which pollId is scoped at source
so it relies on akka-apps to discover based on the current state of other
apps. This looks like the major problem over this polling termination issue.
Made a few changes at the running poll getter fallback at the polling stop
process. Following the premise that there is only one running poll available,
we make sure to return a valid running poll (if there's one).
2021-08-24 18:56:01 -03:00
Gustavo Trott
465a4c41ec
Includes dialIn users to Learning Dashboard
2021-08-18 11:45:24 -03:00
Anton Georgiev
c22875a6d7
Merge pull request #12977 from gustavotrott/learning-dash-improvements
...
Learning Dashboard: Layout improvements
2021-08-12 14:28:45 -04:00
Gustavo Trott
1d961d9c00
Sort users by moderator/alphabetical order
2021-08-11 18:22:55 -03:00
Gustavo Trott
dc2611632a
Adds more details about used Emojis
2021-08-11 14:46:44 -03:00
Joao Siebel
13913a6111
Remove LEGACY option for valid layouts. close #12858
2021-08-10 09:50:13 -03:00
Gustavo Trott
fd4761374f
Improvements to set all endedOn/leftOn when meeting is ended
2021-08-04 16:25:22 -03:00
Gustavo Trott
8346f1d9cf
Avoid send activity message if it didnt have new activities
2021-08-02 11:50:11 -03:00
Gustavo Trott
42e32b7ba8
Include infos about meeting endedOn and fix problem where user leftOn was never set if meeting ends before they left
2021-08-02 11:16:08 -03:00
Gustavo Trott
184f89c152
Merge branch 'activity-report' of github.com:gustavotrott/bigbluebutton into activity-report
2021-07-23 14:06:34 -03:00
Gustavo Trott
2500d4f767
Removes from Json all start/stop talks info, and inform only the totalTime
2021-07-23 14:02:48 -03:00
Gustavo Trott
eea16c8268
Remove unnecessary codes
2021-07-23 10:47:03 -03:00
Gustavo Trott
284b97840e
Remove unnecessary codes
2021-07-23 10:43:28 -03:00
Gustavo Trott
0661712da1
Removes Json content from INFO LOG. To avoid too large logs.
2021-07-23 10:40:57 -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
Anton Georgiev
1abedcc698
Merge pull request #12789 from jfsiebel/implement-default-layout-config
...
Allow default layout config in bbb-web
2021-07-21 16:11:08 -04:00
Gustavo Trott
b0f9835ffd
Merge branch 'develop' into activity-report
2021-07-21 14:20:27 -03:00
Gustavo Trott
21f90fc0e3
Handle anonymous Polls to hide the autor of the answer
2021-07-21 14:16:27 -03:00
Gustavo Trott
c1e39819fe
Fix: Stop last user Talk when Audio is disabled or muted
2021-07-20 17:39:36 -03:00
Anton Georgiev
064f525f68
Merge pull request #12646 from jfsiebel/wip-prevent-unasign-assign-spam
...
WIP Prevent spam of assign presenter role
2021-07-20 16:02:52 -04:00
Joao Siebel
8462465a5f
Allow default layout config in bbb-web. close #12668
2021-07-19 11:02:58 -03:00
Gustavo Trott
d0b08f5603
Improvements in screenShare registers
2021-07-16 16:53:47 -03:00
Gustavo Trott
45d4c310c2
Merge branch 'develop' into activity-report
2021-07-13 11:12:45 -03:00
Gustavo Trott
974c8e1945
Adds Screenshare activities
2021-07-13 11:03:52 -03:00
Gustavo Trott
5c602fd2b0
Merge branch 'develop' into breakoutrooms-set-name
2021-07-12 16:31:38 -03:00
Anton Georgiev
b9cc633286
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.3.5-into-develop
2021-07-06 19:36:19 +00:00
Gustavo Trott
0417cbb03f
Adds Activity Dashboard initial version and generate activityReportAccessToken
2021-06-30 00:01:46 -03:00
Joao Siebel
fc56678f71
Remove unused import
2021-06-28 10:43:10 -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
Joao Siebel
95e9cd3ef1
Add role check to allow webcamsOnlyForModerator changes. close #12636
2021-06-23 15:28:37 -03:00
Gustavo Trott
54dfe4bc3e
ActivityTracker handle/stores more important events
2021-06-23 11:51:10 -03:00
Joao Siebel
1d7bab7e0b
Prevent unnecessary call to unassign presenter and add logs
2021-06-22 14:44:34 -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
paultrudel
90fd6f4d2f
analytics endpoint now successfully returns meeting info
2021-06-11 09:31:51 -04:00
Gustavo Trott
c33f2f48ef
Add Actor to receive and store user activities
2021-06-09 10:00:18 -03:00
Gustavo Trott
5b579d3a16
Avoid extend breakout rooms time exceed parent meeting remaining time
2021-06-07 14:19:20 -03:00
tibroc
8f80f95251
removed userId and added secretPoll flag to RecordEvents
2021-06-07 11:01:34 +02:00
tibroc
1f329a70e3
pass secret polls also to handlers and object models
2021-06-07 10:57:53 +02: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
02ef1186be
Avoid set negative values in Extend time for breakout rooms
2021-06-02 17:36:43 -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
Pedro Beschorner Marin
4a5b92445a
refactor(external videos): system stop
...
Move all external video's system stop control events to akka-apps:
- on presenter change
- on presenter leave
- on screenshare start
2021-06-02 15:06:17 -03:00
Arthur B. Grossi
b0f2297809
refactor(external videos): add akka-apps model
2021-06-02 13:06:41 -03:00
Arthur B. Grossi
e606df6031
feat(external video): permission check
...
Checks permission of start, stop and update external video messages
and only broadcast it if the sender is presenter (unless it's system
messages).
2021-06-02 12:54:37 -03:00
Anton Georgiev
93c9aecab8
Merge pull request #12447 from gustavotrott/fix-user-inactive-while-in-breakoutroom
...
fix: Avoid users to be ejected due to inactivity while they are in a breakout room
2021-05-31 11:00:15 -04:00
Anton Georgiev
8868e84e9f
Merge pull request #12395 from gustavotrott/end-when-no-moderator
...
Implements endWhenNoModerator
2021-05-31 10:59:55 -04:00
Anton Georgiev
9f84b993f7
Merge pull request #12467 from pedrobmarin/f-r-mow
...
fix!(recording): moderator only webcams
2021-05-31 10:49:17 -04:00
Anton Georgiev
2b4746fc85
Merge pull request #12465 from pedrobmarin/f-r-rrce
...
feat(recording): record role change event
2021-05-31 10:47:15 -04:00
Pedro Beschorner Marin
0e34d7239d
fix!(recording): moderator only webcams
...
BREAKING CHANGE: fix typo at moderator only webcams recorded event.
2021-05-30 14:13:39 -03:00
Pedro Beschorner Marin
ed64e330ee
feat(recording): record role change event
...
Reuse `ParticipantStatusChangeEvent` record event, already used by emojis and
webcam streams, to record `UserRoleChangedEvtMsg`.
Role change is stored at `events.xml` as:
- promotion
```
<event timestamp="2068340" module="PARTICIPANT" eventname="ParticipantStatusChangeEvent">
<timestampUTC>1622384175759</timestampUTC>
<date>2021-05-30T14:16:15.759Z</date>
<status>role</status>
<userId>w_fowyht7g0tfi</userId>
<value>MODERATOR</value>
</event>
```
- demotion
```
<event timestamp="2071437" module="PARTICIPANT" eventname="ParticipantStatusChangeEvent">
<timestampUTC>1622384178855</timestampUTC>
<date>2021-05-30T14:16:18.855Z</date>
<status>role</status>
<userId>w_fowyht7g0tfi</userId>
<value>VIEWER</value>
</event>
```
2021-05-30 11:19:30 -03:00
germanocaumo
ed6e895b67
refactor: rename inside question parameters
2021-05-27 21:11:50 +00:00
germanocaumo
4d347be53b
refactor: use questionText instead of title for poll question
2021-05-27 21:04:15 +00:00
Gustavo Trott
b3f1d51f44
Updates user lastActivityTime in parent room while user is in breakout room
2021-05-26 17:16:15 -03:00
germanocaumo
674d23105e
fix: don't show empty line when poll have 7 answers
2021-05-20 18:39:33 +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
Anton Georgiev
1bc324b657
Merge pull request #12353 from germanocaumo/poll-record-improvs
...
Recorded polling events improvements
2021-05-13 13:43:36 -04: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
germanocaumo
af6180a618
fix(record): add question title in pollstartedrecordevent
2021-05-11 18:36:42 +00:00
Gustavo Trott
62b24b8c19
Code improvements in inactivity warning funcs
2021-05-11 10:01:35 -03:00
Gustavo Trott
17994bb4dd
Fix problem that users was not being ejected after inactivity warning timeout
2021-05-10 15:12:13 -03:00
Michael Zinsmeister
5ca831ff86
Merged upstream develop branch
2021-05-01 16:59:20 +02:00
Richard Alam
22d434416a
- lump other responses in the poll and include in the display
2021-04-29 14:44:18 +00:00
Richard Alam
39c69675a4
- sort answers based on number of votes
...
- limit display of responses to 7 to prevent squishing of display in the whiteboard
2021-04-28 21:34:21 +00:00
Richard Alam
414716d23b
- remote debug logs
2021-04-28 21:33:34 +00:00
Anton Georgiev
867edc695c
Merge pull request #12142 from ritzalam/do-not-log-chat-msgs
...
Do not log chat msgs
2021-04-26 15:06:05 -04:00
Richard Alam
ebf883d087
- add flag to not log the chat messages
2021-04-24 02:23:17 +00:00
Richard Alam
19c66dac6c
- remove debug logs
2021-04-24 02:15:22 +00:00
Richard Alam
ba40af8324
- let parent meeting manage breakout lifecycle
2021-04-23 23:22:01 +00:00
Richard Alam
722fb707cc
- fix issue https://github.com/bigbluebutton/bigbluebutton/issues/11358 by having the parent meeting
...
tell the breakout rooms the remaining time. Currently, each room has its own countdown timer which
could introduce drifting resulting in breakout rooms ending at different times.
2021-04-23 21:25:06 +00:00
Richard Alam
b89fd1dbe2
- only update parent meeting if this is breakout room
2021-04-23 21:21:23 +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
Anton Georgiev
ef337acbe6
Merge pull request #11956 from gustavotrott/upload-maxsize-error
...
Creates a pubSub error message when Upload max size exceeded
2021-04-09 16:41:22 -04:00
Aron Engineer
182340112a
feat: Meeting id query param added, support for get and getall added
2021-04-09 18:47:01 +00:00
Gustavo Trott
b7d61e45eb
Reorganize code
2021-04-08 16:53:22 -03: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
d4ed29b49d
Merge branch 'develop' into analytics_actor_for_meeting_info
2021-04-06 12:52:36 +00:00
Aron Engineer
35909a4cba
fix: Null value replaced with other relevant placeholder values for analytics logging.
2021-04-05 20:55:55 +00:00
Aron Engineer
c7563765c6
fix: Analytics logging value Meeting Recorded corrected, common messages change
2021-04-05 18:43:39 +00:00
Marcel Waldvogel
9140613a96
Services run as starting PID
...
The starting scripts now `exec` the main service instead of starting
it as a subprocess. Also in line with docker-entrypoint recommendations.
2021-04-05 12:24:29 +02:00
Aron Engineer
66b320c26a
fix: extra lines removed from updateWebcamStream
2021-04-01 18:12:36 +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
1a2af980cf
fix: literal renamed for readability
2021-03-30 20:28:01 +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
Anton Georgiev
cf6491adc8
Merge branch 'develop' into multiple-choice-poll
2021-03-30 12:49:35 -04:00
Aron Engineer
7c06f3b85e
Merge branch 'develop' into analytics_actor_for_meeting_info
2021-03-29 19:50:03 +00:00
Aron Engineer
c3640f2971
fix:Banned user rejoining error code modified with error message
2021-03-29 17:22:55 +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
4c328e980a
Merge branch 'develop' into analytics_actor_for_meeting_info
2021-03-24 20:32:22 +00:00
Aron Engineer
fe898bc276
WIP: Meeting actor modified to separate individual params
2021-03-24 20:30:01 +00:00
Aron Engineer
105e1d0166
fix: Option removed from ValidateAuthTokenRespMsg and respective handlers, default eject reason added
2021-03-24 17:42:19 +00:00
Aron Engineer
376dfcc59a
Merge branch 'develop' into logout_response_message_modified_reasoncode
2021-03-24 13:15:45 +00:00
Aron Engineer
52d57645c4
fix: ValidateAuthTokenRespMsg reason code added to the message.
2021-03-23 21:13:14 +00:00
Pedro Beschorner Marin
0c4cf0135d
Handle pad's events and Meteor's instances
...
Since Meteor was split in multiple process and events started to be
filtered by instances, all Etherpad's Redis events were being discarded.
Etherpad has a Redis' publisher plugin that is unaware of BigBlueButton's
existence. All the communication between them is kept simple with minimal
of internal data exchange. The concept of distincts subscribers at Meteor's
side broke part of this simplicity and, now, Etherpad has to know which
instance must receive it's messages. To provide such information I decided
to include Meteor's instance as part of the pad's id. Should look like:
- [instanceId]padId for the shared notes
- [instanceId]padId_cc_(locale) for the closed captions
With those changes the pad id generation made at the recording scripts had to
be re-done because there is no instance id available. Pad id is now recorded at
akka-apps and queried while archiving the shared notes.
2021-03-23 18:03:50 -03: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 Z
4d3bda1306
Merge branch 'develop' into multiple-choice-poll
2021-03-16 18:38:48 +01:00
Aron Engineer
eb601eef3e
fix: create meeting message order precedes group chat message in akka-apps
2021-03-15 22:34:54 +00: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
