BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,127 Commits 13 Branches 260 Tags 1.1 GiB
bb89bb5c05
Commit Graph

1467 Commits

Author SHA1 Message Date
Richard Alam
96f1717e46 - add a bit of logging so we can see if validate token succeeded or not 2015-09-04 19:21:28 +00:00
Anton Georgiev
eb57aa7da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share-merging 2015-08-24 14:31:00 +00:00
Richard Alam
a63a211143 - change poll config for jedis 
- attempt to reconnect redis pubsub subscriber if disconnected
 2015-08-23 07:09:00 -04:00
Ghazi Triki
66a7f23146 Added userId to EmojiStatusEvent to able to send a request for a different user. 2015-08-28 11:08:18 +01:00
Ghazi Triki
2fb8296ff0 - Fixed emojiStatus not set correctly in server. 
- Upgraded bbb-common-message version.
 2015-08-26 18:51:05 +01:00
Ghazi Triki
988d8cf56c Removed lower hand methods in server applications and replace raise hand by emoji status. 2015-08-25 09:46:00 +01:00
Anton Georgiev
1939dac06c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingMessageHandler.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/WhiteboardEventRedisRecorder.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/WhiteboardKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ViewerWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2015-08-21 20:15:37 +00:00
Richard Alam
46ba98f737 - add ping/pong message between different components to verfiy that we have working path 2015-08-20 20:44:40 +00:00
Anton Georgiev
bcfbb7c33a Revert "attempt to accommodate late joiners for ds on flash" 
This reverts commit 8cf051a262.
 2015-08-20 18:06:53 +00:00
Anton Georgiev
8cf051a262 attempt to accommodate late joiners for ds on flash 2015-08-20 16:13:11 +00:00
Richard Alam
282fecf351 - ping/pong message between red5 and bbb-apps 2015-08-19 18:32:07 +00:00
Richard Alam
8be746b4ac - start implementing round-trip pubsub monitoring 2015-08-18 21:51:48 +00:00
Richard Alam
5472548118 - allow custom polling through chat message 2015-08-17 22:40:31 +00:00
Richard Alam
9302532be5 - start implementing custom poll 2015-08-13 22:33:51 +00:00
Pedro Beschorner Marin
c4fecdf1d7 Cleanup 2015-08-13 18:45:34 +00:00
Richard Alam
4e4270912b - fix issue where deleting presentation doesn't remove the presentation from file upload window 2015-08-11 17:21:09 +00:00
Richard Alam
cacfbf7e35 - update jar to latest red5 2015-08-10 21:32:00 +00:00
Richard Alam
bc7aadcd22 - create new bbb-commons jar 2015-08-07 19:46:52 +00:00
Richard Alam
839e7ebf58 Merge branch 'svg-conversion' of https://github.com/gthacoder/bigbluebutton into gthacoder-svg-conversion 2015-08-07 18:28:16 +00:00
Maxim Khlobystov
5c0cb9c3d8 Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
 2015-08-06 16:21:31 -04:00
Richard Alam
44c7d4ab77 - trying to determine why client isn't receiving timestamp data from the server 2015-08-06 17:54:08 +00:00
Richard Alam
fbc3dc54f3 - add timestamps on client side log to correlate webcam stopping 2015-08-06 15:11:41 +00:00
Richard Alam
1f3cff06b3 - add more information on the logs to track down webcam disconnections 2015-08-05 19:55:12 +00:00
Richard Alam
df71d8a689 - keep track of user's number of connections to red5 to manage auto-reconnect 2015-07-28 18:29:00 +00:00
Maxim Khlobystov
5f491bf43b Cleaning up. 2015-07-15 16:58:15 -04:00
Pedro Beschorner Marin
39350257b4 Cleanup 2015-07-15 15:24:33 +00:00
Pedro Beschorner Marin
ca6fbc31b6 Syncing note names for new users 2015-07-15 14:59:18 +00:00
Pedro Beschorner Marin
2b8b315ef5 Adding name to shared notes windows 2015-07-14 20:22:21 +00:00
Richard Alam
007a13d0e9 - add more logging to determine who detects the disconnect first 2015-07-13 20:50:38 +00:00
Richard Alam
822b319440 - add number of responders on poll result 2015-07-13 19:18:37 +00:00
Anton Georgiev
6560da3632 cleaning up 2015-07-10 15:33:27 +00:00
Anton Georgiev
15a9e670b8 forward videoWidth, videoHeight to flash client(rtmp) 2015-07-08 16:05:04 +00:00
Richard Alam
3ed524a34c - upgrade bbb-commons-message version 2015-07-07 21:36:01 +00:00
Maxim Khlobystov
ceb3a3911c Made sure the image served for HTML5 client is in SVG format. 2015-07-07 12:19:05 -04:00
Richard Alam
5060726035 - format poll result data correctly 2015-07-06 22:12:15 +00:00
Anton Georgiev
aec3f119b9 work on displaying rtmp stream in the client 2015-07-06 20:24:06 +00:00
Maxim Khlobystov
cf1c6390be Made SVG images accessible by HTML5 client. 2015-07-06 14:26:13 -04:00
Pedro Beschorner Marin
6582cb6dd3 Saving role and waitingForAcceptance status when user left so can be updated if user reconnect 2015-07-03 14:44:49 +00:00
Pedro Beschorner Marin
324ed1b9ab Merge branch 'auto-reconnect' into mconf-live0.6.4 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/branding/default/style/css/assets/images/icons-license.txt
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2015-07-03 14:35:08 +00:00
Pedro Beschorner Marin
ed12579fb0 Some refactoring 2015-07-03 12:29:44 +00:00
Richard Alam
72659e62ac - try displaying poll result as whiteboard shape 2015-07-02 22:16:11 +00:00
Richard Alam
6d7b93e6a4 - upgrade bbb-common-message version 2015-07-02 19:23:36 +00:00
Anton Georgiev
766fea281d send rtmp broadcast notification to viewers(flash has to handle) 2015-07-02 16:24:53 +00:00
Richard Alam
d9295115c8 - handle voting, stop, and show result in the client 2015-06-23 21:50:38 +00:00
Richard Alam
dcfa4ee8fb - cleanup unneded polling events 
- process start poll message
 2015-06-23 19:34:58 +00:00
Richard Alam
acb8a8c89a - implement sending of polling messages thru redis 2015-06-22 21:27:44 +00:00
Richard Alam
b8128945f4 - add new polling messages 2015-06-22 21:13:11 +00:00
Felipe Cecagno
c79be37591 Merge branch 'mconf-live0.6.4' into base-for-0.6.4 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
 2015-06-22 17:18:26 -03:00
Pedro Beschorner Marin
addd1b455b Avoid kicked user to reconnect 2015-06-16 20:49:34 +00:00
Richard Alam
468217200f - fix welcome message bug 
- fix private chat bug
 - start implementing polling
 2015-06-16 19:18:23 +00:00
Richard Alam
36b9dc0104 - use bbb-common-message 2015-06-10 19:11:31 +00:00
Richard Alam
d4663c2573 - use bbb-common-message instead of having own message classes 2015-06-10 17:58:26 +00:00
Richard Alam
198d45489f - remove messages from bbb-apps red5 2015-06-10 17:11:36 +00:00
Richard Alam
e72a828628 - get users in voice conference when meeting is started 2015-06-05 21:57:26 +00:00
Richard Alam
70f725ef93 - add keep alive monitoring of bbb-apps 2015-06-05 19:49:36 +00:00
Richard Alam
7f06d2a766 - fix switch presenter display in user's list 2015-06-04 20:50:38 +00:00
Richard Alam
7c173c1db6 - fix parsing of message 2015-06-04 20:47:49 +00:00
Richard Alam
f2a2e2d1ee - rename message publisher 2015-06-02 20:04:11 +00:00
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
a4af68377a - finish presentation messages 2015-06-02 17:52:18 +00:00
Felipe Cecagno
a819933ebf Merge branch 'webrtc-reconnect' into mconf-live0.6.3 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2015-06-01 22:48:23 -03:00
Felipe Cecagno
cd37bf184d reuse the muted state before the reconnection of webrtc 2015-06-01 22:43:44 -03:00
Richard Alam
00988e2da6 - remove apps from red5 2015-05-28 17:58:35 +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
9d020b0e7d - start converting voice messages 2015-05-27 21:06:44 +00: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
Richard Alam
b922fd3437 - start implementing presentation messages 2015-05-26 22:12:45 +00:00
Richard Alam
dd6d22ce94 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/conference/service/whiteboard/WhiteboardListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/Util.java
 2015-05-26 19:04:03 +00:00
Richard Alam
1f5bce2228 - implement layout messages 2015-05-26 18:49:53 +00:00
Richard Alam
9a28cbc516 - remote chat application (cleanup) 2015-05-26 16:58:52 +00:00
Richard Alam
3c14827c27 - initialize permissions messages 2015-05-26 16:51:04 +00:00
Anton Georgiev
0982e28449 accommodate for drawing text shapes 2015-05-26 11:58:37 -04:00
Anton Georgiev
1a7c0076a0 -whiteboard events red5->redis 2015-05-26 11:35:21 -04:00
Richard Alam
f4cbc0ef13 - finish users messages 2015-05-26 15:29:15 +00:00
Richard Alam
79d48df4cf - implement user messages from red5 to bbb-apps 2015-05-26 15:20:10 +00:00
Richard Alam
c603702259 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/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/GetChatHistory.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/GetChatHistory.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/GetChatHistoryRequestMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
 2015-05-25 22:14:49 +00:00
Richard Alam
6a8dc89793 - determine if message is published or subscribed message type 2015-05-25 21:54:46 +00:00
Richard Alam
ee3280af44 - organize messages 2015-05-25 21:38:11 +00:00
Richard Alam
3619fd4bd9 - cleanup 2015-05-25 20:38:37 +00:00
Anton Georgiev
33f189c965 Merge branch 'upgrade-to-scala-2.11' of https://github.com/ritzalam/bigbluebutton into encode-decode-json 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/Constants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/Util.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/red5/ChatClientMessageSender.scala
 2015-05-25 16:32:53 -04:00
Anton Georgiev
bb415779cb -chat reply to redis 2015-05-25 16:16:12 -04:00
Richard Alam
55449282b6 - split out the client message senders 2015-05-25 20:06:59 +00:00
Richard Alam
81cde8c9ff - finish converting users messages 2015-05-25 19:36:49 +00:00
Richard Alam
22acfdada1 - fix listen only 2015-05-25 19:08:16 +00:00
Richard Alam
2570b704d5 - get users reply message 2015-05-25 18:52:25 +00:00
Richard Alam
d345517482 - convert recording messages 2015-05-25 17:37:28 +00:00
Richard Alam
163d2ec552 - convert meeting state and meeting muted messages 2015-05-25 16:14:48 +00:00
Richard Alam
8ad21545b8 - convert more voice messages 2015-05-25 15:04:13 +00:00
Richard Alam
d52795f66b - add voice messages 2015-05-25 14:44:19 +00:00
Richard Alam
96a7bff10e - convert webcam messages 2015-05-25 14:08:29 +00:00
Richard Alam
b100862087 - convert raise hand messages 2015-05-22 22:12:58 +00:00
Anton Georgiev
f1b5fdda73 package moved 2015-05-22 17:21:37 -04:00
Anton Georgiev
12b8ecf0ac cleaning up 2015-05-22 16:45:10 -04:00
Richard Alam
6018ff2290 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/conference/service/presentation/PresentationMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/Red5BBBInGw.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
 2015-05-22 20:41:34 +00:00
Richard Alam
b542cd6382 - convert more messages 2015-05-22 20:17:57 +00:00
Anton Georgiev
a79c5f4122 lock settings to redis 2015-05-22 16:12:01 -04:00
Richard Alam
00866892c4 - make joining work 2015-05-22 18:30:37 +00:00
Richard Alam
97262f721f - restructure messages into package 2015-05-22 15:16:40 +00:00
Richard Alam
7ad9e64ec3 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/core/api/Red5BBBInGw.java
 2015-05-21 16:17:47 -07:00
Anton Georgiev
40a45bb09d keep only red5BBBInGW 2015-05-21 18:51:31 -04:00
Anton Georgiev
bf60874703 more presentation messages to redis 2015-05-21 18:15:20 -04:00
Anton Georgiev
5aaa606076 goToSlide to redis 2015-05-21 17:21:18 -04:00
Anton Georgiev
cfe465c69a use bbbIn and red5In depending on message 2015-05-21 16:42:49 -04:00
Anton Georgiev
d30c408ee2 presentation through redis part1 2015-05-21 13:38:09 -04:00
Richard Alam
9d437302f3 - process user left message 2015-05-20 16:04:20 -07:00
Richard Alam
aa92b572b3 - rename user leaving message 2015-05-20 14:11:11 -07:00
Richard Alam
734c5fa956 - send user left message through redis 2015-05-20 13:51:57 -07:00
Richard Alam
9f95ed0eaf - create red5 redis pubsub message receiver 2015-05-20 13:02:02 -07:00
Richard Alam
077e30326e Revert "Revert "Merge branch 'upgrade-to-scala-2.11' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11"" 
This reverts commit 11a51995e7.
 2015-05-20 10:45:24 -07:00
Richard Alam
11a51995e7 Revert "Merge branch 'upgrade-to-scala-2.11' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11" 
This reverts commit 117369dcda, reversing
changes made to 6d786f1422.
 2015-05-20 10:23:06 -07:00
Richard Alam
117369dcda Merge branch 'upgrade-to-scala-2.11' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11 2015-05-20 09:58:59 -07:00
Richard Alam
6d786f1422 - process validate token through redis pubsub 2015-05-20 09:33:17 -07:00
Anton Georgiev
a0b30d3d4f Merge branch 'upgrade-to-scala-2.11' of https://github.com/ritzalam/bigbluebutton into upgrade-to-scala-2.11 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/Red5BBBInGw.java
 2015-05-20 11:29:03 -04:00
Anton Georgiev
c9bb7c33f1 send chat through redis 2015-05-20 11:26:08 -04:00
Richard Alam
3bca899649 - send validate token through redis 2015-05-20 07:20:15 -07:00
Richard Alam
0e45080d84 - wire redis pubsub 2015-05-19 10:21:19 -07:00
Felipe Cecagno
2a5f4ebedb cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code 2015-05-17 23:08:41 -03:00
Felipe Cecagno
7cb12f8b49 Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release 
Conflicts:
	bbb-api-demo/src/main/webapp/demo10_helper.jsp
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/locale/bg_BG/bbbResources.properties
	bigbluebutton-client/locale/cs_CZ/bbbResources.properties
	bigbluebutton-client/locale/cy_GB/bbbResources.properties
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_419/bbbResources.properties
	bigbluebutton-client/locale/es_ES/bbbResources.properties
	bigbluebutton-client/locale/et_EE/bbbResources.properties
	bigbluebutton-client/locale/fa_IR/bbbResources.properties
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/locale/fr_FR/bbbResources.properties
	bigbluebutton-client/locale/hu_HU/bbbResources.properties
	bigbluebutton-client/locale/hy_AM/bbbResources.properties
	bigbluebutton-client/locale/it_IT/bbbResources.properties
	bigbluebutton-client/locale/ms_MY/bbbResources.properties
	bigbluebutton-client/locale/no_NO/bbbResources.properties
	bigbluebutton-client/locale/pl_PL/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/locale/sk_SK/bbbResources.properties
	bigbluebutton-client/locale/tr_TR/bbbResources.properties
	bigbluebutton-client/locale/uk_UA/bbbResources.properties
	bigbluebutton-client/locale/zh_CN/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/resources/prod/lib/deployJava.js
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2015-05-17 19:25:26 -03:00
Richard Alam
4cfe3b5772 - add redis pubsub receiver 2015-05-15 21:53:37 +00:00
Richard Alam
d8994c0cd8 - add detour of red5 messages to BigBlueButtonActor to redis instead of direct method call 2015-05-15 21:04:58 +00:00
Richard Alam
23b6297e11 - rename package 2015-05-15 15:57:20 +00:00
Richard Alam
bf683be215 - restructure 2015-05-15 15:35:00 +00:00
Richard Alam
503b5dabee - rename package 2015-05-15 15:27:48 +00:00
Richard Alam
09b7d5e14e - cleanup 2015-05-15 14:27:17 +00:00
Richard Alam
371c7507cc - clean up 2015-05-14 20:58:57 +00:00
Richard Alam
362f375180 - clean up 2015-05-14 20:23:16 +00:00
Richard Alam
8966138d1d - clean up 2015-05-13 20:24:57 +00:00
Richard Alam
2999459efc - try adding scheduler but it's not working 2015-05-13 20:24:29 +00:00
Richard Alam
3ab2fc6c3a - make fs work 2015-05-12 17:47:13 +00:00
Richard Alam
f88f66af61 - start bbb 2015-05-12 16:45:19 +00:00
Richard Alam
82f2cfcfe4 - try to upgrade bbb-apps to using akka 2015-05-11 22:24:33 +00:00
Felipe Cecagno
19e54bfe66 refactored the autoreconnect capability 
- multiple disconnections are reestablished in order, first the main bigbluebutton connection, then the other connections
- if the user was sharing video, and the video connection drops, the video views close and it reconnect in a consistent state
- if the user is connected to webrtc and the main connection drops, the webrtc connection will still be active, then the server will send a UserLeft message to everyone and will reconnect the user as a phone user, so the UI continues consistent; when the user reconnects, it will reuse the voice information

IMPORTANT: modify external.xml in order to disable media timeout
/opt/freeswitch/conf/sip_profiles/external.xml:    <param name="rtp-timeout-sec" value="0"/>
 2015-05-08 12:43:25 -03:00
Felipe Cecagno
884ae22d97 renamed a few functions on apps and client 2015-05-08 12:36:51 -03:00
Maxim Khlobystov
d03defeb33 (merging from Maxim) Implemented switching slides. 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-presentation.xml
	labs/meteor-client/client/views/whiteboard/whiteboard.coffee
	labs/meteor-client/client/views/whiteboard/whiteboard.html
	labs/meteor-client/server/redispubsub.coffee
 2015-05-06 19:55:29 +00:00
Mateus Dalepiane
0662a242aa Merge branch 'bigbluebutton/master' into 090-new-videodock 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
 2015-04-29 12:10:41 -03:00
Mateus Dalepiane
1d2f980f85 Reset line endings to original 2015-04-29 11:12:50 -03:00
Anton Georgiev
70d3c00e74 include permissions info in the reply for GetAllMeetingsRequest 2015-04-24 21:21:10 +00:00
Felipe Cecagno
12cab928de Merge branch '090-guest-role-refactoring' into mconf-live0.6.3 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/User.java
 2015-04-23 14:37:17 -03:00
Anton Georgiev
ff934cf472 Merge branch 'master' into listen-only-prototype 2015-04-22 14:05:05 +00:00
perroned
554ce1d06b Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 
Conflicts:
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/style.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
 2015-04-22 06:03:46 -07:00
Felipe Cecagno
b24debe225 more cleanup 2015-04-20 23:39:02 -03:00
Felipe Cecagno
a47a264fc3 cleanup 2015-04-20 22:56:24 -03:00
Felipe Cecagno
71f327f45a fixed line ending 2015-04-20 21:26:57 -03:00
Felipe Cecagno
63e6da47de reduced the number of messages exchanged between server and client regarding the guest access; fixed the problem of bbb-web answering the meeting is not running when there's a guest connected 2015-04-20 21:25:37 -03:00
Anton Georgiev
fa4cd71ff4 publishing to redis channel "meeting" instead of handling the event on channel "voice" 2015-04-16 19:06:04 +00:00
Richard Alam
933b9d04ef - make a moderator presenter when the current presenter leaves (e.g. disconnected). This way, as long as 
there is a moderator in the meeting, there will always be a presenter.
 2015-04-14 14:40:24 +00:00
Anton Georgiev
fdbc62ccd1 Cherry pick Anton's server side listen only. Fix conflicts 2015-04-06 05:10:56 -07:00
Felipe Cecagno
13d15d0761 Merge branch 'issue1534' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
 2015-04-01 10:19:17 -03:00
Mateus Dalepiane
645d54933b Reject duplicate connections from same session 
bbb-apps now rejects duplicate connection attempts from the same session.
This fixes the problems that happened when a user connected to the same
conference in two different browser tabs, and ended up with two clients
in the same session.
 2015-04-01 09:50:46 -03:00
Felipe Cecagno
71313059e0 Merge branch 'meeting-created-params' into meeting-created-params-master 2015-03-20 12:39:17 -03:00
Felipe Cecagno
6bab3adf61 Merge branch 'meeting-created-params' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/Constants.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/Constants.java
 2015-03-20 12:37:58 -03:00
Mateus Dalepiane
85497ea6c3 Adding information to the event "meeting_created_message" 
The following information was added:
+ moderator_pass (Moderator password)
+ viewer_pass (Viewer password)
+ create_time (Create time)
+ create_date (Create date)
 2015-03-20 12:32:43 -03:00
Tiago Daniel Jacobs
4fff479e03 Added lockOnJoinConfigurable property to lock config. 2015-03-12 20:52:38 +00:00
Fred Dixon
cf5ab25ca0 Revert "Revert "Bbb lock settings fix"" 2015-03-04 16:47:35 -05:00
Chad Pilkey
34fdfb9f83 Revert "Bbb lock settings fix" 2015-03-04 11:49:13 -05:00
Tiago Daniel Jacobs
34e2e48be2 Merging 2015-03-03 06:52:56 +00:00
Tiago Daniel Jacobs
647c0a83bc Code clean up and fixes to lock settings 2015-03-03 04:49:56 +00:00
Tiago Daniel Jacobs
95cf0167f2 Restored ability to lock/unlock individual users 2015-03-03 00:44:34 +00:00
Tiago Daniel Jacobs
bf62dd66a2 Fixed mute on start, added lock on join option 2015-03-02 18:06:09 +00:00
Richard Alam
e8c61c5356 - lower log level on some logs so we can filter 
- add a detection when a meeting actor has hung resulting in users not being able to do anything
 2015-02-26 16:02:21 +00:00
Anton Georgiev
b6bde6fb97 removing merging traces for smooth pull req 2015-02-19 21:06:01 +00:00
Anton Georgiev
6416469172 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	bbb-api-demo/src/main/webapp/demoHTML5.jsp
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2015-02-19 20:47:08 +00:00
Anton Georgiev
7911046a70 allowing " and \ chars in the chat strings from the HTML5 client 2015-02-19 19:29:26 +00:00
Richard Alam
1baf405a31 - remove storing of connection as we query the connection from Red5 directly 2015-02-18 01:31:32 +00:00
Anton Georgiev
cd0fe0bd58 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2015-02-17 23:47:23 +00:00
Richard Alam
55059a4c60 - remote CollectorActor as we don't use it. Found that sometimes it's sendBuffer gets too large and 
not sure if the Actor died and isn't processing the messages.
 2015-02-17 17:01:17 +00:00
Felipe Cecagno
6d52b3eeea Merge branch '090-guest-role' into mconf-live0.6.2 2015-02-12 15:47:40 -02:00
Mateus Dalepiane
5de1af44e0 Fix NPE in the register_user_request [Bug #1462] 2015-02-12 15:37:15 -02:00
Richard Alam
18403d03bc - update red5 to bring in fix for connections not cleanedup properly which may be cause OOM Exception 2015-02-11 22:31:23 +00:00
Richard Alam
96e8fde865 - change format of logs to add timezone 2015-02-09 18:40:31 +00:00
Anton Georgiev
ee4db621fc Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into chat-quotes 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
 2015-02-03 15:28:35 +00:00
Anton Georgiev
dced2a0902 allowing " and \ chars in the chat strings from the HTML5 client 2015-02-02 23:33:17 +00:00
Richard Alam
d2a2b4b5db - use the new userid information to identify the red5 connection 2015-02-02 19:40:25 +00:00
Richard Alam
b91b7087c5 - treat authToken and userid differently. Before, userid and authtoken had the same values. 2015-02-02 19:38:18 +00:00
Richard Alam
fd061d82d1 - use the userid instead of having sessionid as the sessionid is just a duplicate info 2015-02-02 19:37:00 +00:00
Richard Alam
f17ae89b6f - remove duplicate register user as we now only process the register user message from bbb-web not from the client 2015-02-02 19:35:50 +00:00
Richard Alam
98c9868bb3 - try to fix usr joining sequence 2015-01-31 09:39:43 -08:00
Richard Alam
a900eed3ce - start modifying messages to use sessionid to identify user 2015-01-30 23:01:48 +00:00
Anton Georgiev
1f7b751ee6 user join was not triggering for html5 client users. using the token instead of userID to find the user 2015-01-30 22:12:31 +00:00
Felipe Cecagno
14f112cf42 Merge branch '090-new-videodock' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ControlButtons.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	record-and-playback/deploy.sh
 2015-01-28 22:50:55 -02:00
Felipe Cecagno
9a7bae79a8 Merge branch '090-new-videodock' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	record-and-playback/deploy.sh
 2015-01-28 20:33:28 -02:00
Richard Alam
332c252b92 - fix the presentation text file url 2015-01-28 21:52:17 +00:00
Felipe Cecagno
a4d5c2a67b fix the problem where the user shares two cameras, then unshare one of them, and a new user receives hasStream=false for that particular user 2015-01-28 19:18:38 -02:00
Felipe Cecagno
c3e29d2114 Merge branch '090-multinotes' into mconf-live0.6.2 2015-01-26 13:25:31 -02:00
Felipe Cecagno
ecb4f82dd7 fixed the issue of not opening the correct number of additional notes when requested 2015-01-26 13:25:09 -02:00
Felipe Cecagno
03ba8b2866 Merge branch 'edit-layouts' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/branding/default/style/css/assets/images/ic_file_download_16px.png
	bigbluebutton-client/branding/default/style/css/assets/images/ic_file_upload_16px.png
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/BroadcastButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
 2015-01-26 11:49:22 -02:00
Felipe Cecagno
eb4e5aa360 redo the edition of layouts feature; now moderators receive the broadcasted layout as well as presenter and viewers 2015-01-26 11:21:04 -02:00
Felipe Cecagno
25ff17d906 Merge branch '090-guest-role' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-25 21:01:10 -02:00
Felipe Cecagno
f6d6e4e40c Merge branch '090-guest-role' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2015-01-25 18:36:30 -02:00
Felipe Cecagno
899cfd1358 Merge branch '090-multinotes' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
 2015-01-25 12:50:49 -02:00
Felipe Cecagno
2c255dc9ae Merge branch '090-multinotes' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
 2015-01-25 12:12:53 -02:00
Felipe Cecagno
df1fe03c29 Merge branch '090-expanded-status' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-24 17:48:19 -02:00
Felipe Cecagno
e65fa1d28e Merge branch '090-expanded-status' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-24 17:34:53 -02:00
Richard Alam
5798f727c5 - add sessionId in user info so we know if user is connected using Red5 or NodeJS 2015-01-23 20:00:13 +00:00
Richard Alam
192a2ccd0d - remove unused code 2015-01-23 19:54:15 +00:00
Felipe Cecagno
f2d1e24580 Merge branch '090-audio-video-on-api' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/User.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingConstants.java
 2015-01-23 15:36:52 -02:00
Felipe Cecagno
1ea57596d0 Merge branch '090-audio-video-on-api' into HEAD 2015-01-23 15:05:18 -02:00
Felipe Cecagno
2761c31e52 Merge branch '090-encrypted-recording' into mconf-live0.6.2 
Conflicts:
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2015-01-21 18:11:56 -02:00
Richard Alam
0d44571674 - update to latest red5 with local connection ishared object fix 2015-01-13 18:08:03 +00:00
Anton Georgiev
a6d2ecc8a4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
 2015-01-09 16:32:10 +00:00
Richard Alam
53630e758c Merge branch 'master' into format-logging-when-user-joins-global-audio 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
 2015-01-08 21:19:19 +00:00
Richard Alam
fca1798868 - increase the number of log history 2015-01-08 20:21:47 +00:00
Richard Alam
e1c4edae45 - add more logging to help debug where demo meeting disappears on test-install 2015-01-07 13:39:56 -08:00
Richard Alam
ca9931e2dc - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1850 2015-01-05 19:59:46 +00:00
Richard Alam
7936ee3e7c - upgrade to red5 1.0.4 release 2014-12-29 10:37:35 -08:00
Richard Alam
8d80e1d527 - try one more time...please make it align! :) 2014-12-16 18:59:44 +00:00
Richard Alam
74f07d4e3a - try to fix indents 2014-12-16 18:54:51 +00:00
Richard Alam
d65fd73e68 - format the log when user joins/leaves global audio 2014-12-16 18:44:59 +00:00
Anton Georgiev
7e3c2f6eb0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-ui-less 2014-12-15 20:11:49 +00:00
Felipe Cecagno
d712b886a3 Merge branch 'multinotes' of github.com:mconf/bigbluebutton into 090-multinotes 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharedNotes/SharedNotesApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharedNotes/SharedNotesRoom.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharedNotes/SharedNotesRoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharedNotes/SharedNotesService.java
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/managers/SharedNotesConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMap.mxml
 2014-12-12 19:40:52 -02:00
Pedro Beschorner Marin
0b883d5392 Refactored apps new multinotes service 2014-12-11 14:35:48 -02:00
Pedro Beschorner Marin
d414d98bd9 More cleanup 2014-12-11 14:35:41 -02:00
Pedro Beschorner Marin
128c3b19bd Automatically creating shared notes 2014-12-11 14:35:16 -02:00
Pedro Beschorner Marin
9b4bafb8bf Refactored the notes counter index control so removed ones can come back 2014-12-11 14:35:06 -02:00
Felipe Cecagno
2dfe4a1aac Merge branch '090-expanded-status' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
 2014-12-10 18:33:18 -02:00
Felipe Cecagno
76f2e53cd3 cleanup 2014-12-10 18:06:54 -02:00
Felipe Cecagno
12f7aacf4b Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
 2014-12-09 16:52:43 -02:00
Felipe Cecagno
4e29bbfa2a Merge remote-tracking branch 'bigbluebutton/master' into 090-expanded-status 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
 2014-12-02 20:42:15 -02:00
Felipe Cecagno
a45bbfb29a Merge branch '090-multinotes' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
 2014-12-02 20:04:23 -02:00
Richard Alam
ce07751d79 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1837 2014-11-28 14:24:28 -08:00
Anton Georgiev
4172537f24 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml
 2014-11-28 20:33:11 +00:00
Chad Pilkey
acde1ef3ed Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-chat-translation 2014-11-26 09:14:18 -08:00
Chad Pilkey
5cbb059aa6 removed all of the old google translate code in apps and client 2014-11-25 15:17:06 -08:00
Leonardo Crauss Daronco
2c63aa6796 Merge remote-tracking branch 'upstream/master' into webhooks 2014-11-24 13:55:55 -02:00
Felipe Cecagno
e9122a9637 Merge branch '090-download-presentation' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
 2014-11-23 23:02:22 -02:00
Felipe Cecagno
8caa85f333 Merge branch '090-change-role' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2014-11-23 21:58:27 -02:00
Felipe Cecagno
a3acb00893 Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-config/web/default.pdf
 2014-11-22 20:28:39 -02:00
Richard Alam
9f63905a7b Merge pull request #439 from bigbluebutton/cleanup-logging 
- remote logging noise
 2014-11-21 16:44:15 -05:00
Richard Alam
b9b9328151 - remote logging noise 2014-11-20 22:33:25 +00:00
Richard Alam
1d234e13be - for some reason we either (a) get duplicate events for user join from FS or (b) FS-ESL isn't handling 
the event properly. This results in duplicate entries on the user's list when user calls in from the
   phone. Check if a voice user with the same id is already in the voice conference and ignore the second
   event.
 2014-11-20 18:53:09 +00:00
Lucas Zawacki
7d401dab53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2014-11-14 15:33:17 -02:00
Leonardo Crauss Daronco
81f5a109b6 Merge remote-tracking branch 'upstream/master' into webhooks-2.0 2014-11-14 14:28:35 -02:00
Felipe Cecagno
8a89cd1a71 sending the externalMeetingId from bbb-web to bbb-apps, so bbb-apps can use it on redis pubsub message meeting_created_message 2014-11-11 17:54:17 -02:00
Richard Alam
000ddbd9d7 - add more logging about the connection to red5 2014-11-07 22:09:49 +00:00
Mateus Dalepiane
ef043602c6 Merge branch '090-guest-role' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2014-11-07 14:49:28 -02:00
Mateus Dalepiane
cced7c5390 Fixed missing comma on get guests waiting reply 2014-11-07 14:18:48 -02:00
Mateus Dalepiane
339acc9166 Send UserJoined only after guests are accepted 
This means that the guest will be displayed on participants list
only after they accepted
 2014-11-03 17:54:39 -02:00
Pedro Beschorner Marin
1de0756aac Refactoring to bbb-090 2014-11-03 14:13:53 -02:00
Pedro Beschorner Marin
2c5ff4f7cd Merging with mconf old branch 2014-11-03 14:12:47 -02:00
Felipe Cecagno
5a5a3aecc2 Merge branch 'multinotes' into 090-multinotes 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2014-10-31 15:01:29 -02:00
Jonata Teixeira Pastro
41a484ee3d Loading expanded status on startup. Added proper message exchange via bbbInGw. 2014-10-31 13:34:18 -02:00
Richard Alam
8ba0f1855e - add more loggig 2014-10-29 21:54:33 +00:00
Richard Alam
06d47f6cb6 - extracted the wrong boolean from the message which broke recording 2014-10-29 21:53:23 +00:00
Mateus Dalepiane
c97cd3f3af Sending guest flag also through redis now 
This parameter was missing, and causing exceptions in bbb-web.
 2014-10-29 18:58:12 -02:00
Mateus Dalepiane
d7d93c04ce Fixed problem with guest logout 
The guest is removed from the waiting list if he logout.
 2014-10-29 18:12:32 -02:00
Jonata T. Pastro
ae6eef497d Merging expanded-status and master(090) into 090-expanded-status 2014-10-27 18:29:53 +00:00