BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,265 Commits 13 Branches 260 Tags 1.1 GiB
19868f636f
Commit Graph

1979 Commits

Author SHA1 Message Date
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