Paul Trudel
e61edbdfcc
Update pres_page table on move and resize
2023-07-26 18:34:19 +00:00
Paul Trudel
ec9deb1e67
Added podId, width, and height, columns to postgres
2023-07-26 13:53:15 +00:00
Gustavo Trott
185e48d36c
Merge remote-tracking branch 'upstream/v2.7.x-release' into develop
2023-07-21 17:17:52 -03:00
Gustavo Trott
762ae78814
Implements func to Clear all users reaction
2023-07-21 11:10:10 -03:00
Gustavo Trott
4a346aae4e
Fix btn Show Welcome Msgs bugs
2023-07-19 11:16:57 -03:00
Gustavo Trott
21f1ed9f27
Merge 2.7 into Develop
2023-07-14 17:42:13 -03:00
Anton Georgiev
cd9f93be44
Merge remote-tracking branch 'bbb/v2.6.x-release' into merge-july12
2023-07-12 15:59:46 -04:00
Gustavo Trott
300ffee642
Merge pull request #18284 from hiroshisuga/patch-5
...
[fix] Cannot pick an escaping student who knows he will be picked next
2023-07-10 11:48:38 -03:00
hiroshisuga
90f4541fe2
Repick when only nobody to be picked
2023-07-08 20:32:00 +09:00
Tainan Felipe
f2e0fd43e9
Refactor: Make all chat area use graphql ( #18122 )
...
* Refactor: Make all chat area use graphql
* Fix: large space between welcome msg and chat list
* Fix: missing file
* add pending status and fix system messages
* Add: mark messages as seen in chat
* Refactor: Move char opening logic to inside of chat panel
* Refactor message and mark as seen
* Add Recharts to package.json and fix miss data
* Implements clear-chat function on graphql
* Make system message sticky
* Add clear message support and fix user is typing
* FIx chat unread and scroll not following the tail
* Change: make unread messages be marked by message and fix throttle
* Don't show restore welcome message when the welcome message isn't set
* Fix: scroll not following the tail properly
* Fix: previous page last sender not working
* Fix: scroll loading all messages
* Fix messaga not marked as read
---------
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2023-07-07 17:46:36 -03:00
hiroshisuga
4ba826c6aa
Update SelectRandomViewerReqMsgHdlr.scala
2023-07-06 10:14:08 +09:00
Gustavo Trott
99c2719fea
Fix some conflicts on updating graphql-database
2023-07-05 19:01:48 -03:00
Gustavo Trott
e31ae5d7de
Include speechLocale to graphql
2023-07-05 10:05:25 -03:00
Gustavo Trott
4be594d8db
Remove color from collection userVoice
2023-07-05 08:50:08 -03:00
Gustavo Trott
89c628e5d6
Add bk sendInvitationToModerators to graphql
2023-06-29 16:52:59 -03:00
Gustavo Trott
a7cd1c5232
Merge 2.7 into Develop
2023-06-29 16:27:10 -03:00
Gustavo Trott
c8867fadb5
Merge pull request #18197 from Scroody/I-18127
...
Allow dynamic control on moderators invitation for breakouts
2023-06-29 13:39:26 -03:00
Gustavo Trott
e497cd5cd8
Implements guest props and others to graphql
2023-06-28 23:08:03 -03:00
Gustavo Trott
5681e88c60
Merge 2.7 into Develop
2023-06-26 17:21:01 -03:00
Ramón Souza
574b187645
Merge pull request #18130 from Scroody/I-18101
...
Client change: List the option to download presentation with annotations even if there are no annotations
2023-06-26 16:27:58 -03:00
Gustavo Trott
714de811b2
Update PresPresentationDAO.scala
...
Use `compactPrint` to store json instead of `prettyPrint`.
2023-06-26 09:56:17 -03:00
Gustavo Trott
74c81e080b
Provide presentation data through graphql
2023-06-26 09:46:54 -03:00
Gustavo Trott
5761094388
graphql - Remove generation of join Links for breakout assignments
2023-06-23 11:23:41 -03:00
Ramón Souza
af670883c1
remove unused code
2023-06-22 15:35:40 -03:00
Ramón Souza
ae1e6079e1
rename includeMods -> sendInviteToModerators
2023-06-22 13:55:23 -03:00
Gustavo Trott
6ba4aad05a
Merge branch 'v2.7.x-release' into user-raiseHand-away-flags
2023-06-22 08:27:20 -03:00
Anton Georgiev
43b96b47c4
Merge pull request #17724 from lfzawacki/v2.7.x-release
...
feat: Implement automatic closed captions using an open transcription server
2023-06-22 05:25:14 -04:00
Ramón Souza
56d16f0330
back-end part
2023-06-21 16:47:28 -03:00
Anton Georgiev
ce24a1a6c2
Merge pull request #18163 from Scroody/I-18137
...
feat(config): Disable timer feature
2023-06-21 14:33:20 -04:00
Gustavo Trott
2b167786b5
Introduces breakoutRooms to graphql
2023-06-21 12:32:53 -03:00
GuiLeme
0c5f8aa1f0
[issue-18021-back-end] - Changes in review and fix to support screenshare disabled and cameraAsContent enabled
2023-06-16 17:48:52 -03:00
GuiLeme
ac210ca39c
[I-18101-back-end-tweak] - back-end portion - minor tweak
2023-06-16 13:52:44 -03:00
GuiLeme
ef1b00fe7f
[I-18101-back-end-tweak] - back-end portion - review changes
2023-06-16 12:22:14 -03:00
GuiLeme
f36ffbe949
[I-18101-back-end] - back-end portion
2023-06-16 09:24:50 -03:00
Anton Georgiev
d8cc9f0e61
fix: missing comma after conflict resolving
2023-06-15 16:01:05 -04:00
André Castro
5af5151219
Merge branch 'v2.7.x-release' into I-18137
2023-06-15 11:50:02 -03:00
GuiLeme
48ebf3150d
[issue-18021-back-end] - Back-end portion of disabled camera as content
2023-06-15 10:24:28 -03:00
GuiLeme
8c5c1728ee
[I-18137-back-end] - Back-end implementation for disabledTimer
2023-06-14 17:19:40 -03:00
danielpetri1
84e797e8ee
Fix double file separator glitch
2023-06-14 13:48:46 +00:00
Anton Georgiev
cdf6e6ec73
build: use Java17 to build akka projects
2023-06-13 14:26:12 -04:00
Gustavo Trott
60e5fe6a53
Introduces Timer data to graphql
2023-06-13 11:44:51 -03:00
Paul Trudel
2d737aa0ef
Change target to release for java 17
2023-06-12 21:15:33 +00:00
danielpetri1
40d990d8a6
Fix original presentation download link in cluster setups
2023-06-12 14:57:24 +00:00
Gustavo Trott
22a2c8ce7c
Merge remote-tracking branch 'upstream/v2.7.x-release' into graphql-timer
2023-06-12 10:06:22 -03:00
Anton Georgiev
c8b0437df3
Merge pull request #18133 from GuiLeme/port-timer-with-events-suggestions
...
feat(timer): Port timer (Mconf) with events suggestions
2023-06-08 15:56:10 -04:00
GuiLeme
2cf46e4d05
[port-timer-with-events-suggestions] - made review suggestions
2023-06-08 16:37:32 -03:00
Gustavo Trott
8263dd17ca
Introduces flags user.away and user.raiseHand
2023-06-07 22:10:07 -03:00
Ramón Souza
22b02ead28
Merge remote-tracking branch 'upstream/v2.7.x-release' into 16120
2023-06-06 08:45:29 -03:00
Anton Georgiev
70b3220f41
Merge branch 'v2.7.x-release' of github.com:bigbluebutton/bigbluebutton into june5-27
2023-06-05 17:09:35 -04:00
Anton Georgiev
748c7a4a0b
Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into june227
2023-06-02 09:45:34 -04:00
Arthurk12
ad8759ed1b
feat(timer): add recording events
...
Adds recording events to each timer message(except CreateTimerPubMsg).
2023-06-02 09:12:44 -03:00
Arthurk12
1431e76bfe
feat(timer): add fields to the activate message
...
Adds fields(stopwatch, running, time, accumulated, track) to the
activate timer message response in order to be able to log them in the
events.xml file.
2023-06-02 09:12:43 -03:00
prlanzarin
4d1aa87a88
feat: only record media while meeting is being actively recorded
...
Only record media (microphone, webcams and screens) while meeting is
being actively recorded (ie an user has enabled recording in the
conference). If the conference's recording is paused, media capture will
stop as well (with appropriate recording events).
A bigbluebutton.properties/API#create parameter called
`recordFullDurationMedia` is added to control this behavior. The default
is false (only capture while recording is active). Setting it to `true`
enables the current (legacy) behavior: always capture media if the
meeting's `recorded` prop is true.
2023-05-31 16:36:11 -03:00
Gustavo Trott
6186ef99ad
Support camera as content using graphql
2023-05-30 10:01:32 -03:00
Gustavo Trott
c873504bec
Rename UserLocalSettingsDAO
2023-05-29 13:51:06 -03:00
Gustavo Trott
ff39f1b250
Introduces graphql user-localSettings
2023-05-29 13:49:36 -03:00
Gustavo Trott
51bdcededc
Merge 2.7 into develop
2023-05-26 10:50:39 -03:00
Paulo Lanzarin
5447666c15
Merge branch 'v2.7.x-release' into port-timer
2023-05-26 10:33:38 -03:00
Gustavo Trott
624137f19b
Send presentation to chat in graphql
2023-05-26 09:38:11 -03:00
Paulo Lanzarin
171c7a6587
Merge branch 'v2.7.x-release' into v2.7.x-release
2023-05-26 09:27:14 -03:00
Anton Georgiev
4948731fe7
Merge pull request #17764 from lfzawacki/reactions-port
...
feat: Port Mconf Reactions into BBB 2.7
2023-05-26 08:05:02 -04:00
Anton Georgiev
1a1f442d5a
Merge pull request #17746 from Carloshsc/port-present-webcam-27
...
feat(camera as content): present webcam
2023-05-26 08:01:40 -04:00
prlanzarin
7c77fc7433
Merge remote-tracking branch 'origin/v2.7.x-release' into reactions-port
2023-05-25 19:54:01 -03:00
Arthurk12
196d2c1e0a
feat(reactions): sync expiration with akka
...
Currently, the reactions are cleared on mongo based on the expire time.
So to sync its state with akka, an observer is atattched to the user
reactions collection and whenever a reaction is removed because of the
expiration time, akka is notified with message 'UserReactionTimeExpiredCmdMsg'.
2023-05-25 17:32:27 -03:00
Gustavo Trott
d1a60157e5
Insert Poll result as Chat msg in graphql
2023-05-24 10:56:22 -03:00
Arthurk12
3efdbd9012
feat(reactions): add akka messages to clear all emojis status
...
Adds two new messages which clear the users emoji statuses. This messages
enables this task to be done in a single call, instead of triggering one
method call for each user.
'ClearAllUsersEmojiCmdMsg' is sent from meteor to akka and updates all the
emoji states in the users model.
'ClearedAllUsersEmojiEvtMsg' is sent from akka to meteor. This triggers the
mongo collection update.
2023-05-24 10:49:42 -03:00
Gustavo Trott
ed2c94eaea
Add externalVideo and screenshare to Graphql
2023-05-23 09:09:38 -03:00
Gustavo Trott
0fa28dd5d1
Include welcomeMsg to graphql and set permissions
2023-05-19 15:28:20 -03:00
Gustavo Trott
8e2f2f3000
Clear code
2023-05-19 13:49:24 -03:00
Gustavo Trott
cf92e73f11
Add Polls to postgres/graphql
2023-05-19 13:47:00 -03:00
Arthurk12
f13217607e
feat(timer): add model and messages to akka apps
...
This commit makes the messages of the timer feature to be proxied by
akka-apps and also adds a timer model that is updated based on these
messages.
Moving the timer panel opening logic to the timer button component in
the navigation panel was a consequence of these changes.
2023-05-18 15:29:42 -03:00
GuiLeme
1b26302745
[issue-17531] - merge upstream/v2.7.x-release
2023-05-16 15:30:15 -03:00
Gustavo Trott
e5f31e2f0b
Add user customParameters to graphql
2023-05-15 17:21:36 -03:00
Ramón Souza
dcef3e3d7b
Merge pull request #17845 from ramonlsouza/issue-17839
...
fix: ignore restore on update for first load of initial presentation
2023-05-15 13:41:27 -03:00
GuiLeme
9710c00b3d
[issue-17531] - changes in review
2023-05-15 10:58:22 -03:00
Guilherme Pereira Leme
47a1dba829
Update akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/MakePresentationDownloadReqMsgHdlr.scala
...
Changes in review
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2023-05-12 12:45:37 -03:00
GuiLeme
89eafc6315
[issue-17531] - changes in review
2023-05-12 12:40:07 -03:00
GuiLeme
4c2806a018
[issue-17531] - changes in review and ES-lint fixes
2023-05-11 18:06:48 -03:00
Gustavo Trott
290a41baa1
Merge pull request #17762 from GuiLeme/chat-list-migration
...
refactor: Chat list migration to graphql structure
2023-05-11 17:13:19 -03:00
Arthurk12
e902f2ee27
feat(screenshare): add contentType field
...
This commit adds a contentType field in the back-end components of the
screenshare feature in order to accomodate the new 'camera as content'
feature.
2023-05-09 17:21:47 -03:00
Anton Georgiev
8cb98d99fd
Merge pull request #17842 from paultrudel/akka-randomness-fix
...
fix(sec): Switched PRNG to secure PRNG
2023-05-09 11:18:21 -04:00
GuiLeme
d2c5b33eec
[issue-17839] - back-end part for hide_presentation_on_join issue
2023-05-09 12:01:55 -03:00
GuiLeme
7a43191cd1
[graphql-chatlist-migration] - quick fix suggestion
2023-05-05 10:48:14 -03:00
GuiLeme
4676b74203
[chat-list-migration] - Back-end suggestion
2023-05-05 09:02:44 -03:00
GuiLeme
90078aedc7
[issue-17531] - resolve conflicts with 2.7
2023-05-04 08:56:27 -03:00
GuiLeme
f650ade561
[issue-17531] - prevent user from exporting annotations when there is no annotation
2023-05-04 08:48:32 -03:00
GuiLeme
f03c01399f
[issue-17531] - added ConvertedPresentationName to be referenced when getting the link to downloading the original file
2023-05-02 11:14:40 -03:00
Gustavo Trott
39ac6d14f6
Revert database to config name
2023-05-02 10:28:11 -03:00
Gustavo Trott
13b871f4d5
Alter graphql database name to bbb_graphql
2023-05-02 10:00:51 -03:00
GuiLeme
a695ddf40d
[chat-list-migration] - Remove debug logs
2023-04-27 18:05:51 -03:00
GuiLeme
c10cc1d01b
[chat-list-migration] - Resolve open two times the same private chat problem
2023-04-27 17:52:42 -03:00
Paul Trudel
2e1635900b
Removed logs for auth token validation
2023-04-27 20:51:17 +00:00
Gustavo Trott
a204980a6a
Create new flag visible to chat_user
2023-04-26 16:19:58 -03:00
Paul Trudel
1b5015211e
Change registeredUser joined to false after leave
2023-04-26 15:41:29 +00:00
Gustavo Trott
8d0583e160
Explain what pg columns of user mean
2023-04-25 15:50:23 -03:00
Gustavo Trott
694ebd1e35
Introduces new flags disconnected (replacing leftFlag) and expired
2023-04-25 15:41:37 -03:00
Lucas Fialho Zawacki
4400cc68c8
feat(captions): Add SetUserSpeechLocaleMsg files
2023-04-25 10:05:16 -03:00
Lucas Fialho Zawacki
fee6ff026a
feat(captions): Use setUserSpeechLocale as an akka event and catch it in the transcription manager
2023-04-25 09:54:34 -03:00
Lucas Fialho Zawacki
6979432c36
feat(transcription): Server side open source transcriptions
2023-04-24 18:23:34 -03:00
Gustavo Trott
768c4224a1
Resolve conflicts with 2.7 upstream
2023-04-24 18:02:06 -03:00
Gustavo Trott
9ff8d0aee9
Include new column user.hasDrawPermissionOnCurrentPage and triggers to populate it, to improve performance of the userlist orderBy
2023-04-20 09:49:16 -03:00
GuiLeme
6e05e3ca51
[issue-17131] - Suggestions in review and some change of behavior
2023-04-20 08:48:43 -03:00
Gustavo Trott
d19d286811
Adds prop color for voiceUsers create msgs
2023-04-19 12:16:35 -03:00
Paul Trudel
0528604839
Switched PRNG to secure PRNG
2023-04-17 19:35:02 +00:00
GuiLeme
13e37e61c3
[issue-17531] - removing logs for debbug
2023-04-17 09:44:56 -03:00
GuiLeme
90bbb10de6
[issue-17531] - insert tag besides the presentation's name
2023-04-17 09:04:58 -03:00
Gustavo Trott
e3a2e4b01a
Store sessionToken in akka-apps (in order to invalidate connections in graphql-middleware)
2023-04-14 15:48:10 -03:00
Gustavo Trott
b9c0909b2a
Introduces redis msg InvalidateUserGraphqlConnectionSysMsg that will be listened by graphql-middleware
2023-04-14 13:38:15 -03:00
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