bigbluebutton-Github/bigbluebutton-client/src
perroned 2a23778ea9 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-html5/imports/api/verto/index.js
	bigbluebutton-html5/imports/ui/components/deskshare/service.js
2016-07-22 19:20:00 +00:00
..
assets added icons 2012-12-26 17:46:47 -05:00
conf changed all internal references to participants to users 2013-03-15 18:53:39 -04:00
org Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 2016-07-22 19:20:00 +00:00
tests
bigbluebutton_favicon.ico
BigBlueButton.mxml Force showing logs in trace before the configuration is loaded. 2015-07-30 09:25:13 +01:00
BigBlueButtonMainContainer.mxml Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 2016-05-16 11:35:36 -04:00
BigBlueButtonTest.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
BigBlueButtonUnitTests.mxml Updated license for bigbluebutton-client, bbb-video, and demo 2013-01-21 16:14:55 -05:00
BroadcastModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
CameraCheck.mxml - try to figure out best way to test for cam 2013-04-17 18:36:43 +00:00
CaptionModule.mxml the client responds to the first two caption messages 2015-10-15 15:42:01 -07:00
ChatModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
ClassroomAudioModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
DeskShareModule.mxml Added new WebRTC event map 2016-02-04 11:21:55 -08:00
DeskshareStandalone.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
DynamicInfoModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
ExampleChatModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
LayoutModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
MicrophoneCheck.mxml - try to figure out best way to test for cam 2013-04-17 18:36:43 +00:00
MonitoringModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
NotesModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
PhoneModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
PollingModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
PresentModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
RTMPConnCheck.mxml Changes to support RTMPS connections 2014-04-24 17:16:03 -03:00
ScreenshareModule.mxml Begins adding webrtc deskshare to screenshare 2016-06-28 17:15:36 +00:00
ScreenshareStandalone.mxml - screenshare client 2016-02-10 19:43:38 +00:00
SharedNotesModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
UsersModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
VideoconfModule.mxml Fix the Flash debug error when client logging out. 2016-03-10 15:31:12 +01:00
WebcamPreviewStandalone.mxml - pass the avatarURL into some of the events for JS API 2013-05-30 20:01:58 +00:00
WebcamViewStandalone.mxml Changes to support RTMPS connections 2014-04-24 17:16:03 -03:00
WhiteboardModule.mxml Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00