bigbluebutton-Github/bigbluebutton-html5/imports/ui/components
Lucas Zawacki 06f8b56a82 Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-video-media-flow
Conflicts:
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
2017-12-20 18:43:33 -02:00
..
about
actions-bar Removed unused methods from actions bar component 2017-12-08 16:32:08 +00:00
app Removed unused Screenshare import 2017-12-08 16:26:28 +00:00
audio change device selector key generation 2017-10-31 15:34:06 -02:00
breakout-join-confirmation
button Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-11 18:22:36 -03:00
chat Merge pull request #4488 from Tainan404/fix-errors-linter 2017-10-23 12:27:38 -02:00
checkbox
closed-captions Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
dropdown Merge pull request #4488 from Tainan404/fix-errors-linter 2017-10-23 12:27:38 -02:00
error-screen
icon Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-23 13:31:33 -02:00
loading-screen
logout-confirmation fix endmeeting handler with incorrect name 2017-11-01 13:47:14 -02:00
media Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 2017-11-11 03:41:37 +00:00
modal Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-24 11:19:58 -02:00
nav-bar solve error in nav-bar component 2017-10-23 14:26:56 -02:00
notifications-bar solve error in nav-bar component 2017-10-23 14:26:56 -02:00
polling Fixed a bug with props in the polling container 2017-11-06 10:24:10 -08:00
presentation Merge pull request #4621 from Tainan404/fix-upload-percentage 2017-11-02 11:03:03 -02:00
screenshare Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 2017-11-11 03:41:37 +00:00
settings Fixed a bug with Settings not being closed when click Cancel 2017-10-23 16:19:02 -07:00
switch
toast bug fixes; CSS animation package update; updated package-lock; fixed permissions; 2017-10-25 16:11:06 -07:00
user-avatar remove .scss extension and changed path 2017-10-11 14:54:00 -03:00
user-list Merge pull request #4578 from OZhurbenko/meteor-react-16-update 2017-11-02 10:41:45 -02:00
video-dock Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-video-media-flow 2017-12-20 18:43:33 -02:00
whiteboard Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00