-
- Downloads
Merge remote-tracking branch 'bigbluebutton/master' into mobile-logout
# Conflicts: # clients/flash/air-client/src/org/bigbluebutton/air/main/views/TopToolbarMediatorAIR.as # clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/services/UsersMessageReceiver.as
Showing
- clients/flash/air-client/src/org/bigbluebutton/air/AppConfig.as 3 additions, 0 deletions...s/flash/air-client/src/org/bigbluebutton/air/AppConfig.as
- clients/flash/air-client/src/org/bigbluebutton/air/main/commands/ConnectingFinishedCommandAIR.as 2 additions, 0 deletions...ebutton/air/main/commands/ConnectingFinishedCommandAIR.as
- clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtonsMediatorAIR.as 3 additions, 4 deletions...rg/bigbluebutton/air/main/views/MenuButtonsMediatorAIR.as
- clients/flash/air-client/src/org/bigbluebutton/air/main/views/TopToolbarMediatorAIR.as 4 additions, 3 deletions...org/bigbluebutton/air/main/views/TopToolbarMediatorAIR.as
- clients/flash/air-client/src/org/bigbluebutton/air/settings/SettingsConfig.as 1 addition, 4 deletions...ient/src/org/bigbluebutton/air/settings/SettingsConfig.as
- clients/flash/air-client/src/org/bigbluebutton/air/settings/views/audio/AudioSettingsViewMediatorAIR.as 2 additions, 3 deletions.../air/settings/views/audio/AudioSettingsViewMediatorAIR.as
- clients/flash/air-client/src/org/bigbluebutton/air/settings/views/camera/CameraSettingsViewMediatorAIR.as 12 additions, 7 deletions...ir/settings/views/camera/CameraSettingsViewMediatorAIR.as
- clients/flash/air-client/src/org/bigbluebutton/air/users/views/UserDetailsView.as 36 additions, 34 deletions.../src/org/bigbluebutton/air/users/views/UserDetailsView.as
- clients/flash/air-client/src/org/bigbluebutton/air/video/commands/ShareCameraCommand.as 8 additions, 7 deletions...rg/bigbluebutton/air/video/commands/ShareCameraCommand.as
- clients/flash/air-client/src/org/bigbluebutton/air/voice/VoiceConfig.as 0 additions, 6 deletions...air-client/src/org/bigbluebutton/air/voice/VoiceConfig.as
- clients/flash/air-client/src/org/bigbluebutton/air/voice/views/IMicButton.as 0 additions, 10 deletions...lient/src/org/bigbluebutton/air/voice/views/IMicButton.as
- clients/flash/air-client/src/org/bigbluebutton/air/voice/views/MicButton.as 0 additions, 45 deletions...client/src/org/bigbluebutton/air/voice/views/MicButton.as
- clients/flash/air-client/src/org/bigbluebutton/air/voice/views/MicButtonMediator.as 0 additions, 64 deletions...rc/org/bigbluebutton/air/voice/views/MicButtonMediator.as
- clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/models/ChatMessagesSession.as 3 additions, 3 deletions.../org/bigbluebutton/lib/chat/models/ChatMessagesSession.as
- clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatItemRenderer.mxml 18 additions, 26 deletions...pt/org/bigbluebutton/lib/chat/views/ChatItemRenderer.mxml
- clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatRoomsItemRenderer.mxml 1 addition, 1 deletion...g/bigbluebutton/lib/chat/views/ChatRoomsItemRenderer.mxml
- clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/common/views/ParticipantIcon.mxml 32 additions, 6 deletions...t/org/bigbluebutton/lib/common/views/ParticipantIcon.mxml
- clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/commands/ConnectCommand.as 14 additions, 8 deletions...ipt/org/bigbluebutton/lib/main/commands/ConnectCommand.as
- clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/commands/EmojiCommand.as 5 additions, 5 deletions...cript/org/bigbluebutton/lib/main/commands/EmojiCommand.as
- clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/commands/EmojiSignal.as 3 additions, 2 deletions...script/org/bigbluebutton/lib/main/commands/EmojiSignal.as
Loading
Please register or sign in to comment