Commit Graph

7 Commits

Author SHA1 Message Date
Tainan Felipe
2dbfe499cc rename variable 2018-06-18 15:59:35 -03:00
Tainan Felipe
9e9e85cddb skip share/unshare webcam using if not check 2018-06-18 15:35:27 -03:00
Ghazi Triki
5227217e85 Fix the regex that checks the Flash stream id by adding the option "-recorded" to the pattern, making sure recorded streams are matched too. 2018-01-20 09:34:11 +01:00
prlanzarin
dfb5170e5d Finished filtering out HTML5 and Flash webcams using stream name patterns 2018-01-04 16:24:50 +00:00
prlanzarin
bdc89e0830 Refactored webcam share/unshare handlers 2017-12-08 16:52:37 +00:00
prlanzarin
248dc7fa08 Fixed HTML5 video API import
Added chrome extension ID to HTML5 screenshare call
2017-11-17 18:55:59 +00: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