Commit Graph

1738 Commits

Author SHA1 Message Date
Lucas
429f90156f
Merge branch 'develop' into open-cc 2023-02-01 12:13:17 -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
Lucas Fialho Zawacki
6e572a815d feat(captions): Add SetUserSpeechLocaleMsg files 2023-01-11 14:48:16 -03: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
Lucas Fialho Zawacki
a804535714 feat(captions): Use setUserSpeechLocale as an akka event and catch it in the transcription manager 2022-12-23 16:13:26 -03: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
Lucas Fialho Zawacki
802964f9e3 feat(transcription): Server side open source transcriptions 2022-12-15 16:06:42 -03: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