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
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
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