Richard Alam
|
4929d261ce
|
- cleanup
|
2015-06-02 19:38:38 +00:00 |
|
Richard Alam
|
1d177e65ba
|
- fix merge issues
|
2015-06-02 19:17:41 +00:00 |
|
Richard Alam
|
151d790b17
|
Merge remote-tracking branch 'origin/extract-out-bbb-apps-after-upgrading-scala' into merge-with-akka-fs-and-akk-apps
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/Constants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/CreateMeetingMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/DestroyMeetingMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EndMeetingMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetAllMeetingsRequest.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/KeepAliveMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessageBuilder.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessagingService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserConnectedToGlobalAudio.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserDisconnectedFromGlobalAudio.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/BroadcastClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DirectClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DisconnectAllClientsMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DisconnectClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatKeyUtil.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/Constants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/CreateMeetingMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/DestroyMeetingMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/EndMeetingMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/GetAllMeetingsRequest.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/KeepAliveMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessageBuilder.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessageFromJsonConverter.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RegisterUserMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/UserConnectedToGlobalAudio.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/UserDisconnectedFromGlobalAudio.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/GenericObjectPoolConfigWrapper.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceKeyUtil.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardKeyUtil.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/api/IBigBlueButtonInGW.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/api/MessageOutGateway.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/BroadcastClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DirectClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectAllClientsMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/SharedObjectClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/red5/BroadcastClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/red5/ClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/red5/DirectClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/red5/DisconnectAllClientsMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/red5/DisconnectClientMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/redis/MeetingMessageHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/Constants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/CreateMeetingMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/DestroyMeetingMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/EndMeetingMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/GetAllMeetingsRequest.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/KeepAliveMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/MessageBuilder.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/MessageFromJsonConverter.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/MessagingConstants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/MessagingService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/RegisterUserMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/UserConnectedToGlobalAudio.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/UserDisconnectedFromGlobalAudio.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/ValidateAuthTokenMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/GenericObjectPoolConfigWrapper.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageReceiver.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ChatKeyUtil.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ChatService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/LayoutService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/LockService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/VoiceKeyUtil.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/VoiceService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/WhiteboardApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/WhiteboardKeyUtil.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/WhiteboardService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/chat/ChatKeyUtil.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/chat/ChatMessageListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/presentation/PreuploadedPresentation.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/voice/VoiceKeyUtil.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/voice/VoiceMessageListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/whiteboard/WhiteboardKeyUtil.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/whiteboard/WhiteboardListener.java
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IDispatcher.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IOutMessage.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/OutMessageListener2.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/RedisLpushDispatcher.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PreuploadedPresentationsUtil.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/redis/GenericObjectPoolConfigWrapper.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/RecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/Recorder.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/RecorderApplication.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/RedisDispatcher.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/chat/AbstractChatRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/chat/PublicChatRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/AbstractParticipantRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/AssignPresenterRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/ParticipantEndAndKickAllRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/ParticipantJoinRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/ParticipantLeftRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/ParticipantStatusChangeRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/RecordStatusRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/AbstractPresentationRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/ConversionCompletedPresentationRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/CursorUpdateRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/GenerateSlidePresentationRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/GotoSlidePresentationRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/RemovePresentationPresentationRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/ResizeAndMoveSlidePresentationRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/SharePresentationPresentationRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/AbstractVoiceRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/ParticipantJoinedVoiceRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/ParticipantLeftVoiceRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/ParticipantLockedVoiceRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/ParticipantMutedVoiceRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/ParticipantTalkingVoiceRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/StartRecordingVoiceRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/VoiceEventRecorder.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/AbstractWhiteboardRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/AddShapeWhiteboardRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/AddTextWhiteboardRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/ClearPageWhiteboardRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/ModifyTextWhiteboardRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/ToggleGridWhiteboardRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/UndoShapeWhiteboardRecordEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/ConferenceEventListener.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/UnknownConferenceEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceConferenceEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceStartRecordingEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceUserJoinedEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceUserLeftEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceUserLockedEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceUserMutedEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceUserTalkingEvent.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/service/recording/RecordMessage.java
labs/akka-bbb-apps/src/main/java/org/bigbluebutton/service/recording/RedisListRecorder.java
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorGateway.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/User.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ConsoleDispatcher.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/TimestampGenerator.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/Versions.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatApp.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatInGateway.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/vo/ValueObjects.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/messaging/Util.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ChatEventRedisPublisher.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingEventRedisPublisher.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PresentationEventRedisPublisher.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/WhiteboardEventRedisPublisher.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/WhiteboardMessageToJsonConverter.scala
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/ConferenceServerListener.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/FreeswitchConferenceEventListener.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/commands/ConferenceCommand.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/commands/ConferenceCommandResult.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/commands/EjectUserCommand.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/commands/GetUsersCommand.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/commands/MuteUserCommand.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/BroadcastConferenceCommand.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/EjectAllUsersCommand.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/EjectUserCommand.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/FreeswitchCommand.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/GetAllUsersCommand.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/MuteUserCommand.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/RecordConferenceCommand.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/response/ConferenceMember.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/response/ConferenceMemberFlags.java
labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/response/XMLResponseConferenceListParser.java
|
2015-06-02 18:39:18 +00:00 |
|
Richard Alam
|
28fac52687
|
- add start/stop recording messages
|
2015-06-02 17:53:43 +00:00 |
|
Richard Alam
|
d75003ee1c
|
- clean up
|
2015-06-02 17:53:25 +00:00 |
|
Richard Alam
|
a4af68377a
|
- finish presentation messages
|
2015-06-02 17:52:18 +00:00 |
|
Chad Pilkey
|
6bf54cccac
|
Merge pull request #649 from perroned/notification-blocking
Shrink notification area to contents
|
2015-06-02 13:03:37 -04:00 |
|
Richard Alam
|
db379d85fc
|
- handle voice messages in FS
|
2015-06-02 16:53:44 +00:00 |
|
perroned
|
f357942eed
|
Shrink notification area to contents
|
2015-06-02 07:02:54 -07:00 |
|
Richard Alam
|
04b5e4fca3
|
- implement voice messages
|
2015-06-01 21:44:45 +00:00 |
|
Richard Alam
|
855ab9673f
|
- receive redis messages
- cleanup
|
2015-05-29 19:48:29 +00:00 |
|
Richard Alam
|
a5bd34f8d9
|
- wire bbb fs esl
|
2015-05-29 19:06:00 +00:00 |
|
Richard Alam
|
8a437df7a9
|
- send recieve messages thru redis
|
2015-05-29 17:03:03 +00:00 |
|
Richard Alam
|
63336e3717
|
- restructure packages and wire up classes
|
2015-05-29 15:52:46 +00:00 |
|
Richard Alam
|
712499747a
|
- setup redis scala
|
2015-05-28 22:00:30 +00:00 |
|
Oleksandr Zhurbenko
|
8cf7328373
|
Merge branch 'meteor-ui' of https://github.com/OZhurbenko/bigbluebutton into meteor-ui
|
2015-05-28 14:28:58 -07:00 |
|
Oleksandr Zhurbenko
|
fe9cc6e31f
|
Fixed private tab's height
|
2015-05-28 14:19:51 -07:00 |
|
Chad Pilkey
|
98f40d78ef
|
Merge pull request #648 from gthacoder/meteor-client-whiteboard-bug-fixes
HTML5 client: whiteboard bug fixes.
|
2015-05-28 17:13:38 -04:00 |
|
Richard Alam
|
f6b35ef6b5
|
- restructure message receivers
|
2015-05-28 20:55:39 +00:00 |
|
Richard Alam
|
29d55fcec1
|
- remove fs-esl
|
2015-05-28 20:44:39 +00:00 |
|
Richard Alam
|
b9fb309d45
|
- split fs-esl from bbb-apps
|
2015-05-28 20:36:56 +00:00 |
|
Richard Alam
|
acebdaf695
|
- setup fs esl
|
2015-05-28 20:30:17 +00:00 |
|
Richard Alam
|
a0c4ee2128
|
- restructure packages
|
2015-05-28 20:10:01 +00:00 |
|
Richard Alam
|
7aa84da980
|
- now compiles
|
2015-05-28 19:42:57 +00:00 |
|
Richard Alam
|
00988e2da6
|
- remove apps from red5
|
2015-05-28 17:58:35 +00:00 |
|
Maxim Khlobystov
|
a53b88f5e7
|
Made the whiteboard properly resize when the slide navigation controllers appear/disapper.
|
2015-05-28 10:06:57 -07:00 |
|
Richard Alam
|
75c2a352e8
|
- cleanup
|
2015-05-28 15:52:50 +00:00 |
|
Richard Alam
|
5fe15691e1
|
- cleanup
|
2015-05-28 15:51:03 +00:00 |
|
Richard Alam
|
d64e5a1a85
|
- rename packages
|
2015-05-28 15:48:18 +00:00 |
|
Richard Alam
|
994a1bb336
|
- rename old packages
|
2015-05-28 15:45:00 +00:00 |
|
Richard Alam
|
1f02d3ba06
|
- move messages into it's own package
|
2015-05-28 15:39:33 +00:00 |
|
Richard Alam
|
e05a7e4fcf
|
- voice messages
|
2015-05-27 22:01:47 +00:00 |
|
Richard Alam
|
811f0e4537
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into upgrade-to-scala-2.11
|
2015-05-27 21:13:31 +00:00 |
|
Richard Alam
|
39bbcc2c9b
|
Merge pull request #647 from kepstin/presentation-security-master
web: check that meeting is running before allowing presentation upload
|
2015-05-27 17:13:12 -04:00 |
|
Richard Alam
|
9d020b0e7d
|
- start converting voice messages
|
2015-05-27 21:06:44 +00:00 |
|
Calvin Walton
|
9deb87d0b0
|
web: check that meeting is running before allowing presentation upload
|
2015-05-27 15:08:04 -04:00 |
|
Chad Pilkey
|
638c3f24a3
|
First pass at the UsersWindow
|
2015-05-27 14:56:42 -04:00 |
|
Chad Pilkey
|
13fc30a331
|
Using depth property for Window focus
|
2015-05-27 14:56:13 -04:00 |
|
Chad Pilkey
|
1b520060b4
|
Fixed listenOnly indicators in Flash
|
2015-05-27 14:55:26 -04:00 |
|
Maxim Khlobystov
|
cb140cce99
|
Repaired the styling of slide navigation buttons.
|
2015-05-27 10:48:25 -07:00 |
|
Maxim Khlobystov
|
1fa46ab6dd
|
Made the whiteboard's height flexible depending on the presence of the slide navigation controllers.
|
2015-05-27 10:29:59 -07:00 |
|
Maxim Khlobystov
|
71fe855fa7
|
Prevented the slide from going beyond the whiteboard's top border.
|
2015-05-27 09:58:06 -07:00 |
|
Richard Alam
|
c083c14135
|
Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/PresentationClientMessageSender.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/Util.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
|
2015-05-27 15:31:25 +00:00 |
|
Anton Georgiev
|
18c828cb41
|
-whiteboard redis->red5
|
2015-05-27 10:41:20 -04:00 |
|
Chad Pilkey
|
9ac0f24edf
|
Made the whole User object Bindable
|
2015-05-27 10:24:14 -04:00 |
|
Richard Alam
|
b922fd3437
|
- start implementing presentation messages
|
2015-05-26 22:12:45 +00:00 |
|
Chad Pilkey
|
217b5c37d6
|
Merge pull request #646 from gthacoder/meteor-client-right-hand-menu
HTML5 client: right-hand menu.
|
2015-05-26 17:27:09 -04:00 |
|
Maxim Khlobystov
|
0b7749ec3c
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-right-hand-menu
Conflicts:
bigbluebutton-html5/app/client/stylesheets/style.less
|
2015-05-26 14:15:12 -07:00 |
|
Maxim Khlobystov
|
74b85b56fc
|
Made the Toggle Chat button work.
|
2015-05-26 14:09:54 -07:00 |
|
Chad Pilkey
|
3ce0fcc0e5
|
Merge pull request #644 from OZhurbenko/meteor-ui
Private chat
|
2015-05-26 17:09:39 -04:00 |
|