perroned 7ca23e44cc Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as bigbluebutton-html5/imports/startup/server/EventQueue.js bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx		2016-09-14 19:30:07 +00:00
..
actions-bar	Cleanup, linting, fixed css modules' imports	2016-08-20 18:14:12 -07:00
app	Remove unused constructor	2016-09-06 19:29:04 +00:00
button	Fixes and improvements on the Dropdown and Modal components	2016-09-06 19:10:18 +00:00
chat	Fixed merge conflicts	2016-08-23 16:45:28 -07:00
closed-captions	Cleanup, linting, fixed css modules' imports	2016-08-20 18:14:12 -07:00
deskshare	Hooking up viewing from html5	2016-08-19 14:07:47 +00:00
dropdown	Fix SPACE/ENTER behavior	2016-09-07 14:43:54 +00:00
icon	Add new component button and some basic styles	2016-05-20 10:37:19 -03:00
kicked-screen	Add missing files	2016-07-28 19:49:16 +00:00
loading-screen	Add missing files	2016-07-28 19:49:16 +00:00
logout-confirmation	HTML5 Dropdown - fixed warnings and added style	2016-09-07 12:17:15 -07:00
media	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-09-14 19:30:07 +00:00
modal	Remove unused modal logs	2016-08-31 19:53:40 +00:00
nav-bar	HTML5 Dropdown - fixed warnings and added style	2016-09-07 12:17:15 -07:00
notifications-bar	Cleanup, linting, fixed css modules' imports	2016-08-20 18:14:12 -07:00
polling	Upgraded Meteor to 1.4	2016-07-27 14:50:35 -07:00
settings	Move old settings modal to the new component	2016-09-01 13:56:41 +00:00
user-avatar	Cleanup, linting, fixed css modules' imports	2016-08-20 18:14:12 -07:00
user-list	Fixed merge conflicts	2016-08-23 16:45:28 -07:00
video-dock	Upgraded Meteor to 1.4	2016-07-27 14:50:35 -07:00
whiteboard	Added a check for cursor data	2016-08-20 19:59:32 -07:00