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