Commit Graph

6525 Commits

Author SHA1 Message Date
root
851c2645ea Committer: Antonio Guirado <amguirado73@gmail.com>
Changes to be committed:
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StartExternalVideoPubMsgHdlr.scala
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StopExternalVideoPubMsgHdlr.scala
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/UpdateExternalVideoPubMsgHdlr.scala
	modified:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
	modified:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
	modified:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
	new file:   bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala
	new file:   bigbluebutton-html5/imports/api/external-videos/server/eventHandlers.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/handlers/startExternalVideo.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/handlers/stopExternalVideo.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/handlers/updateExternalVideo.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/index.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/streamer.js
	modified:   bigbluebutton-html5/imports/api/meetings/server/handlers/meetingDestruction.js
	modified:   bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
	modified:   bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
	modified:   bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
	modified:   bigbluebutton-html5/imports/api/users/server/store/bannedUsers.js
	modified:   bigbluebutton-html5/imports/startup/server/index.js
	modified:   bigbluebutton-html5/imports/startup/server/redis.js
	modified:   bigbluebutton-html5/imports/ui/components/external-video-player/service.js
	modified:   bigbluebutton-html5/private/config/settings.yml
2020-08-28 12:58:55 +02:00
Anton Georgiev
8cc8474655 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 08-26-merge 2020-08-27 19:09:07 +00:00
Anton Georgiev
22641c0e33
Merge pull request #10219 from Tainan404/unsafe-dropdown-components
Remove unsafe lifecycle from all dropdown related components
2020-08-25 08:54:16 -04:00
Tainan Felipe
9230dfcc62 Fix wrong default setting 2020-08-25 09:29:23 -03:00
Tainan Felipe
4a81457b10 Fix comparison 2020-08-25 08:47:38 -03:00
Tainan Felipe
5956531941 Add init state for locale comparison 2020-08-25 08:36:06 -03:00
Anton Georgiev
4476df6f09
Merge pull request #10318 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: prioritise presenter in pagination ordering, restore pre-.22 full mesh ordering
2020-08-24 17:14:43 -04:00
Anton Georgiev
b8959be312
Merge pull request #10304 from pedrobmarin/individual-video-record-control
Add individual video record control
2020-08-24 16:58:16 -04:00
prlanzarin
f3674335a4 video-provider: prioritise presenter in pagination ordering
Also restore the old full mesh, pre-.22 ordering where outbound streams were put first
2020-08-24 19:55:29 +00:00
Anton Georgiev
89319787f8
Merge pull request #10317 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: fix dynamic profile accounting when using pagination
2020-08-24 15:14:00 -04:00
prlanzarin
e7323ee6a5 video-provider: fix dynamic profile accounting when using pagination 2020-08-24 18:30:24 +00:00
KDSBrowne
6f377c3d77 make external video MATCH_URL even more generic 2020-08-24 17:59:46 +00:00
Anton Georgiev
59ab8e215d
Merge pull request #10315 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: fix pagination edge case
2020-08-24 10:42:07 -04:00
prlanzarin
2e6627b820 video-provider: fix pagination edge case where pages would be calculated as NaN 2020-08-24 14:35:28 +00:00
Pedro Beschorner Marin
8b54c01898 Add hack to avoid recording viewers video stream
If, at the time the video is shared, the user has a viewer role and
meta_hack-record-viewer-video is false this user won't have this video
stream recorded.
2020-08-22 21:00:31 -03:00
Pedro Beschorner Marin
95bc7cd59e Add individual video record control
This adds bbb_record_video userdata that, when is set to false, signals
bbb-webrtc-sfu to avoid generating the stream recording assets for a
particular user.

By default, bbb_record_video is true.
2020-08-21 19:10:25 -03:00
Anton Georgiev
4fb301c48b
Merge pull request #10293 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: first tackle at video pagination
2020-08-20 15:24:57 -04:00
prlanzarin
0b29b5a812 video-provider: enrich pagination enabled checks 2020-08-20 17:26:32 +00:00
prlanzarin
a98c476239 video-provider: remove page change lock in favor of a debounced approach 2020-08-20 15:43:02 +00:00
Anton Georgiev
077f0c985a
Merge pull request #10295 from prlanzarin/upstream-2.2-fix-mirroring
video-provider: fix mirrorOwnWebcam behaviour (regression from #10208)
2020-08-20 08:39:34 -04:00
Anton Georgiev
64cc59fd4c
Merge pull request #10296 from KDSBrowne/2.2-add-slide-text-SR
Add presentation slide text for screen readers
2020-08-20 08:37:51 -04:00
KDSBrowne
916b7d7f31 add slide text for screeen reader 2020-08-20 01:48:10 +00:00
prlanzarin
5f72cecf4f video-provider: fix mirrorOwnWebcam behaviour (regression from #10208) 2020-08-20 01:12:56 +00:00
Pedro Beschorner Marin
69c408e16a Disable notes and captions footer
Something related on not being able to provide links
2020-08-19 20:27:41 -03:00
prlanzarin
bc4ce58251 video-provider: make pagination circular 2020-08-19 22:27:47 +00:00
Anton Georgiev
3099b8fb45
Merge pull request #10265 from pedrobmarin/notes-cc-header-style
Fix shared notes and closed captions header button style
2020-08-19 15:58:51 -04:00
Anton Georgiev
fdc14ba42b
Merge pull request #10289 from pedrobmarin/data-savings-presentation-area
Check video data savings to set presentation max-height
2020-08-19 15:39:37 -04:00
Anton Georgiev
4d688fee20
Merge pull request #10280 from KDSBrowne/2.2-localize-cam-quality
Localize drop-down values for webcam quality
2020-08-19 15:33:11 -04:00
Anton Georgiev
d95d8a66f0
Merge pull request #10279 from KDSBrowne/2.2-remove-br-mod-options
Remove mute and clear public chat options from breakouts
2020-08-19 15:31:43 -04:00
Anton Georgiev
b648c26c61
Merge pull request #9012 from Tainan404/issue-9011
Add preloading for slides
2020-08-19 15:28:28 -04:00
Anton Georgiev
01d5467017
Merge pull request #10288 from KDSBrowne/2.3-issue-10281
Fix dropdown menus not closing on item select
2020-08-19 15:23:28 -04:00
Anton Georgiev
31645b26ef
Merge pull request #10278 from KDSBrowne/2.2-issue-10204
Fix text area's being created smaller than a single character
2020-08-19 15:22:22 -04:00
Anton Georgiev
4fd2a815f4
Merge pull request #10220 from Tainan404/unsafe-intl-components
Remove unsafe lifecycle from intl component
2020-08-19 15:16:21 -04:00
prlanzarin
0e02b6a6f8 video-provider: remove nonsensical play abort warning log 2020-08-19 13:56:53 +00:00
prlanzarin
2d436977cb video-provider: add pagination page change timer to prevent spamming 2020-08-19 13:56:22 +00:00
Tainan Felipe
47b2d6b945 fix language doesn't updating 2020-08-19 10:48:57 -03:00
Tainan Felipe
73ba3ef2e9
Merge branch 'develop' into issue-9011 2020-08-19 10:14:12 -03:00
Pedro Beschorner Marin
7ab3d9a386 Check video data savings to set presentation max-height 2020-08-18 16:41:18 -03:00
prlanzarin
28e826118a video-provider: first version of video pagination 2020-08-18 17:00:47 +00:00
KDSBrowne
3042d90bc4 fix user item dropdown menus not closing 2020-08-18 16:17:58 +00:00
KDSBrowne
fbeaf87dbd localize the dropdown values for webcam quality 2020-08-17 16:19:45 +00:00
KDSBrowne
9f8661bc15 remove mute / unmute / clear chat options for breakoutrooms 2020-08-14 17:13:51 +00:00
Pedro Beschorner Marin
26fcb97dd9 Fix shared notes and closed captions header button style
Also adds a little more visibility and well-deserved credit to Etherpad's project
2020-08-14 11:32:52 -03:00
Anton Georgiev
b03f29497f
Merge pull request #8926 from Tainan404/virtualized-userlist
Virtualized user list
2020-08-12 14:12:48 -04:00
Anton Georgiev
e9e5feac76
Merge pull request #10194 from KDSBrowne/issue-9861
Allow polling when presentation does not exist but chat is available
2020-08-12 13:45:05 -04:00
Anton Georgiev
5be5aed1d9 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12 2020-08-12 17:12:58 +00:00
Tainan Felipe
939fdd9b52 Merge remote-tracking branch 'upstream/develop' into virtualized-userlist 2020-08-12 11:24:36 -03:00
Tainan Felipe
0453533256 Remove unecessary function reference 2020-08-12 11:20:02 -03:00
KDSBrowne
c6bb65b24b prevent user creating textarea too small for text 2020-08-11 14:54:29 +00:00
KDSBrowne
76a98459c8 backport #8484 from 2.3 to 2.2 2020-08-11 14:51:59 +00:00