BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,243 Commits 13 Branches 260 Tags 1.1 GiB
9506144857
Commit Graph

1837 Commits

Author SHA1 Message Date
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
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
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
Paulo Lanzarin
5447666c15
Merge branch 'v2.7.x-release' into port-timer 2023-05-26 10:33:38 -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
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
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
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
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
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
Paul Trudel
2e1635900b Removed logs for auth token validation 2023-04-27 20:51:17 +00:00
Paul Trudel
1b5015211e Change registeredUser joined to false after leave 2023-04-26 15:41:29 +00: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
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
GuiLeme
536285fc37 [issue-17531] - restored old feature of downloading original presentation 2023-04-14 11:04:24 -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
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
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