Commit Graph

4 Commits

Author SHA1 Message Date
prlanzarin
7d5a722e12 Removed router for video-menu
Also removed unused class in video-dock css
2017-12-08 16:53:28 +00:00
prlanzarin
06b273c251 Moved video-dock and video-menu collection communication to services 2017-12-08 16:38:51 +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
Augusto Bennemann
d0592a7acb HTML5 video: share and unshare buttons 2017-09-20 00:12:10 -03:00