Matthew Marangoni a37799f19f Merge remote-tracking branch 'upstream/master' into html5test ... Conflicts: bigbluebutton-html5/imports/ui/components/modals/settings/SettingsModal.jsx bigbluebutton-html5/imports/ui/components/modals/settings/submenus/SessionMenu.jsx		2016-07-11 10:37:00 -07:00
..
actions-bar	Fixed all the 120+ linter warnings	2016-06-27 11:24:37 -07:00
app	Merge remote-tracking branch 'origin/master' into router-changes	2016-07-08 11:59:05 +00:00
button	Fix renderCircle and add hideLabel prop	2016-06-17 16:42:17 +00:00
chat	Remove debug messages	2016-06-13 14:15:15 -03:00
deskshare	change audio to default to SIP	2016-06-21 15:34:10 +00:00
icon	Add new component button and some basic styles	2016-05-20 10:37:19 -03:00
loader	Changes Router in order for the livereloading to work again	2016-07-07 14:01:40 +00:00
media	Hide webcam component	2016-07-11 10:13:55 -03:00
modals	Merge remote-tracking branch 'upstream/master' into html5test	2016-07-11 10:37:00 -07:00
nav-bar	Merge remote-tracking branch 'upstream/master' into html5test	2016-07-11 10:37:00 -07:00
polling	Moved polling files back to components folder	2016-07-07 10:08:26 -07:00
user-avatar	Remove color-generator because it is not being used	2016-06-29 14:09:23 +00:00
user-list	Mark open chat as active	2016-06-30 14:45:19 +00:00
video-dock	Fixed all the 120+ linter warnings	2016-06-27 11:24:37 -07:00
whiteboard	Moved polling files back to components folder	2016-07-07 10:08:26 -07:00