Commit Graph

47 Commits

Author SHA1 Message Date
Pedro Beschorner Marin
4eb67c12be Multiple webcams first commit 2019-12-10 08:21:19 -03:00
Anton Georgiev
42d640f3e2 Merge branch 'issue7791-add-support-to-new-parameters-name' of github.com:diegobenetti/bigbluebutton into test-7805 2019-11-05 11:59:00 -05:00
Joao Siebel
f365c50fd0 Relax autoSwapLayout constraints
now it's possible to minimize the presentation even if there
is no webcam being shared.

close #8129
2019-09-26 17:14:05 -03:00
Lucas Zawacki
5dd46f8f48 Fix video swap when there's no presentation and/or screenshare/external video 2019-09-17 16:55:52 -03:00
Anton Georgiev
43c0670ed8 Merge branch 'new-arc-player' of github.com:lfzawacki/bigbluebutton into external-video-player 2019-09-10 16:35:50 -04:00
Anton Georgiev
ea18b09311 add a few more collection lookups "fields" delimiters 2019-08-29 12:26:07 -04:00
Lucas Zawacki
546f4cdac5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-arc-player 2019-08-27 15:09:40 -03:00
Chad Pilkey
6e76dd584b improve user fetch and sort, and webcam fetch 2019-08-09 15:39:55 -07:00
Diego Benetti
f13239674b Changes other parameters to the new pattern 2019-07-24 14:04:46 -03:00
Diego Benetti
4a764f8f6c Implements new name for parameters and the support to the old names 2019-07-22 11:28:13 -03:00
Lucas Zawacki
a2068d06b6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-react-player 2019-07-16 17:33:27 -03:00
Diego Benetti
aa0c777cee Parameter enableExternalVideo changed to externalVideoPlayer 2019-07-15 16:31:28 -03:00
Diego Benetti
f7a58c3279 Changes the position of the parameter enableExternalVideo in the settings.yml file 2019-07-15 13:26:57 -03:00
Lucas Fialho Zawacki
e98333c45e Use react-player for external video 2019-07-12 20:08:55 +00:00
Diego Benetti
f383ccb8cc Fixes client to obey custom parameter autoSwapLayout 2019-06-24 18:01:54 -03:00
Diego Benetti
0ad8c228b4 Fixes performance bug when youtube video is shared 2019-06-17 11:10:45 -03:00
Pedro Beschorner Marin
c0510f74e6 Check data savings settings before showing screenshare 2019-02-05 10:59:39 -02:00
Lucas Zawacki
6d4d3daba3 Youtube video. Fix syntax, variable names, move some code into the service, remove unused code 2019-01-16 10:57:20 -03:00
Lucas Zawacki
550bbcd492 Share synchronized youtube video in presentation area 2019-01-14 14:40:27 -03:00
KDSBrowne
f16366c305 hide toolbar when presentation is swapped 2018-12-11 16:28:37 +00:00
Anton Georgiev
57dc55b559 drop metadata configs; use userdata configs for autoSwap 2018-10-23 20:44:17 +00:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Tainan Felipe
99df324d73 revert Boolean coversion 2018-05-08 15:01:35 -03:00
Tainan Felipe
2f52c9fdc5 remove only metadata 2018-05-08 09:26:04 -03:00
Oswaldo Acauan
46559833e2 Add metatag html5autosharewebcam 2018-04-24 12:51:41 -03:00
Oswaldo Acauan
6beada63eb Add metatag html5autoswaplayout 2018-04-24 12:23:54 -03:00
Oswaldo Acauan
c688eb23ca Move Polling to above slides/webcams and change swapLayout constraints. Closes #5359 2018-04-17 14:55:07 -03:00
Oswaldo Acauan
5bf71eee98 Add swap functionality 2018-04-09 15:48:21 -03:00
Oswaldo Acauan
fe11dd9a90 Improve media overlay/content styles 2018-04-09 15:28:54 -03:00
Joao Siebel
cb70001f37 Implement notification when a presenter start and end a screenshare 2018-03-09 08:20:08 -03:00
Joao Siebel
eddc480851 Implement screenshare data saving setting. Fix #5029 2018-02-06 11:33:48 -02:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
2017-11-11 03:41:37 +00:00
prlanzarin
76f09e16ad Adding checks to show screenshare and video overlays according to config file 2017-11-11 01:36:55 +00:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
Augusto Bennemann
5ec827e17d HTML5 video with kurento (port) 2017-09-01 12:26:57 -03:00
Klauswk
e751bcdadf Merge branch 'bbb-2x-mconf' into slides-refactor-2x 2017-07-27 17:27:35 -03:00
Anton Georgiev
b7d6427e63 rename deskshare to screenshare and adjust condition for viewing 2017-07-24 15:29:34 -04:00
Klaus
97b38fb0e6 Presentation reflects akkaApps 2017-07-24 15:46:53 -03:00
Anton Georgiev
83e14e8206 handle slides messages 2017-06-30 15:16:00 -04:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
perroned
c64c97b582 Html5 clean up 2017-03-21 21:46:41 +00:00
perroned
6371d476f9 embedding video into html5 2016-09-14 20:25:31 +00:00
Oleksandr Zhurbenko
949511f9b5 Linting, changed line endings from Windows to Unix 2016-05-30 15:07:02 -07:00
Oleksandr Zhurbenko
36cfffd2db Fixed multiple rerenderings while changing slides
Media container is supposed to know only if a current presentation exists, not slide
2016-05-30 10:33:35 -07:00
Oleksandr Zhurbenko
179ce3c2bd Swapping whiteboard with default view if there is no current slide 2016-05-27 18:10:34 -07:00