BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,427 Commits 13 Branches 260 Tags 1.1 GiB
8bfe0a9b99
Commit Graph

1843 Commits

Author SHA1 Message Date
Anton Georgiev
2e0f6d8610 trigger syncing with state from akka-apps 2017-06-30 11:19:11 -04:00
Anton Georgiev
19d89c6f92 trigger syncing with state from akka-apps 2017-06-30 10:58:49 -04:00
Richard Alam
50acc517af Merge branch 'fix-2.0-layout' of https://github.com/capilkey/bigbluebutton into capilkey-fix-2.0-layout 2017-06-29 18:20:40 -07:00
Chad Pilkey
4e5df30ac4 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into fix-2.0-layout 2017-06-29 16:57:28 -04:00
Richard Alam
fcf41c9f61 - move to different packages 2017-06-29 13:55:37 -07:00
Chad Pilkey
9f904e6267 reorganized the layout code in akka-apps and fixed layout broadcast 2017-06-29 16:55:25 -04:00
Richard Alam
a11c45fa02 - implement handlers for guest policy 2017-06-29 11:34:08 -07:00
Chad Pilkey
15c938e9cd fixed layout message response and removed redundant props 2017-06-29 14:32:31 -04:00
Richard Alam
29052e6f79 - send layout response to requester user instead of whole meeting 2017-06-29 07:31:23 -07:00
Richard Alam
0aed46c986 - add validate token handler tests 2017-06-28 14:56:35 -07:00
Richard Alam
f4bf6912d4 - add create meeting request test for BigBlueButtonActor 2017-06-28 09:01:45 -07:00
Richard Alam
04e55a1dd4 Merge branch 'move-caption-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-caption-messages-2x 2017-06-28 07:47:56 -07:00
Richard Alam
30827f680e - move messages into different package 2017-06-27 19:44:47 -07:00
Richard Alam
a32193bd68 - reorganize messages 2017-06-27 15:01:42 -07:00
Richard Alam
03010eedb2 - put users messages in one file 
- put guest policy into it's own class
 2017-06-27 13:05:38 -07:00
Chad Pilkey
4c66393dbd Merge remote-tracking branch 'upstream/bbb-2x-mconf' into move-caption-messages-2x 2017-06-26 18:09:56 -04:00
Richard Alam
f4bcb2421a - send poll voting to client 2017-06-26 14:39:52 -07:00
Richard Alam
2316e73c26 Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls 2017-06-26 14:00:38 -07:00
Chad Pilkey
7c19972d24 remove pre-2.0 caption server code 2017-06-26 16:47:18 -04:00
Chad Pilkey
d690b49898 clear transcript owner when they leave the meeting 2017-06-26 16:46:09 -04:00
Anton Georgiev
f98bd01c3f send poll result without extra stringify 2017-06-26 15:45:15 -04:00
Richard Alam
99046fb685 - handle emoji status changed message in client 2017-06-26 12:38:00 -07:00
Chad Pilkey
76026da06c moved caption messages to 2.0 format 2017-06-26 15:00:32 -04:00
Richard Alam
9dc41437e8 - handle user left 2017-06-26 10:34:22 -07:00
Richard Alam
dfa1557116 - display default presentation 2017-06-26 07:24:38 -07:00
Richard Alam
f7376e11c0 - get presentation info 2017-06-25 16:11:29 -07:00
Richard Alam
2931b719c6 - get presentation info 2017-06-25 13:26:37 -07:00
Richard Alam
9317cdfcc0 Merge branch 'capilkey-move-presentation-messages-2x' into merge-presentation 2017-06-25 11:25:23 -07:00
Richard Alam
34cab65b2e Merge branch 'move-presentation-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-presentation-messages-2x 2017-06-24 15:46:22 -07:00
Richard Alam
dd175bee89 - mute user 2017-06-24 14:56:06 -07:00
Richard Alam
ae4fc536b1 - fix use leaving voice conf 2017-06-24 06:47:19 -07:00
Richard Alam
77da487c60 - handle user muted and talking messages 2017-06-23 18:14:55 -07:00
Richard Alam
002a447273 - user talking message 2017-06-23 15:18:30 -07:00
Richard Alam
ceb4d74e55 - handle user join and left voice conference 2017-06-23 14:34:05 -07:00
Anton Georgiev
9a0a4d5669 work on displaying poll result annotation in flash client 2017-06-23 17:26:53 -04:00
Richard Alam
7ffd1a80bd - assign presenter when no presenter present 2017-06-23 11:12:17 -07:00
Chad Pilkey
1c226fd3af 2.0 presentation message work, presentation conversion msgs in bbb-web missing 2017-06-23 13:27:56 -04:00
Richard Alam
c4616f1ce0 - load modules after validate token 2017-06-22 14:42:10 -07:00
Richard Alam
c41b9b9a7a - display users list 2017-06-21 13:32:37 -07:00
Richard Alam
281108b1ab - send waitForApproval for guest on validate token 2017-06-21 10:49:08 -07:00
Richard Alam
30bafd7983 - try using new user data instead of BBBUser 2017-06-21 09:41:59 -07:00
Richard Alam
582cdf07ec - fix compile issue due to breaking of messages 2017-06-21 08:05:49 -07:00
Richard Alam
71d8b26ec1 - fake user generator so we can populate meeting with fake users for development 2017-06-20 13:44:26 -07:00
Ghazi Triki
46556a8405 Add Layout server messages for V2. 2017-06-20 17:14:46 +01:00
Richard Alam
bd46c386fc Merge branch 'bbb-2x-mconf' into refactor-client 2017-06-19 13:28:51 -07:00
Richard Alam
d0343b40d2 - delay processing of pre-uploaded presentation to make sure that meeting has been created before 
presentation conversion has completed.
 2017-06-19 13:04:07 -07:00
Richard Alam
bb8944570b - fix validate auth token race condition where the validate auto token is sent to the meeting before 
the meeting has been created
 2017-06-19 12:34:53 -07:00
Richard Alam
6021bb93c9 - send users, voice users, webcams on validate auth token 2017-06-19 11:21:51 -07:00
Ghazi Triki
5fc84b50f0 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/UserJoinMeetingReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2017-06-19 17:46:46 +01:00
Ghazi Triki
c7c39989a3 Added all breakout rooms events handlers in akka-bbb-apps project. 2017-06-19 16:57:36 +01:00
Richard Alam
e80a3de440 - put message into it's own sender 2017-06-17 19:28:43 -07:00
Richard Alam
e7ffcbfbe7 - merging latest bbb-2x-mconf 2017-06-16 18:12:29 -07:00
Richard Alam
5c76f413bb Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls 2017-06-16 17:38:06 -07:00
Richard Alam
dc1c1e8b9e Merge branch 'move-whiteboard-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-whiteboard-messages-2x 2017-06-16 17:18:50 -07:00
Chad Pilkey
f3ab70f060 convert whiteboard messages to the 2.0 method and remove old 2017-06-16 18:09:25 -04:00
Anton Georgiev
522227da51 startPoll does not need to return anything. Avoid .get 2017-06-16 17:19:09 -04:00
Anton Georgiev
b3c323bdc7 cleanup 2017-06-16 17:05:12 -04:00
Anton Georgiev
c6e7a17085 sendGetCurrentPollRespMsg with Option[PollVO] 2017-06-16 17:03:21 -04:00
Anton Georgiev
b61fe6faaf send events straight to meeting eventBus 2017-06-16 14:54:38 -04:00
Anton Georgiev
77b78a1ae7 Polls 2.0 - the rest of the messages 2017-06-16 12:01:14 -04:00
Anton Georgiev
882b4215d4 added Polls model, StartPollReqMsg and StartPollRespMsg 2017-06-16 11:51:07 -04:00
Richard Alam
5c84354715 - try to consolidate meeting state in one place 2017-06-15 19:09:32 -07:00
Richard Alam
596800e8d9 - breakdown handlers 2017-06-14 13:49:28 -07:00
Ghazi Triki
1e3f91bb6e Improve code and replace deprecated parts. 2017-06-14 15:11:38 +01:00
Richard Alam
326ba5e481 - put message into it's own hdlr 2017-06-13 19:26:04 -07:00
Richard Alam
b677b4490f - partially convert some messages 2017-06-13 14:42:02 -07:00
Pedro Beschorner Marin
15c6420e97 Merge tag 'v1.1.0' into 1.1-transcode 
tagging v1.1.0 release

 Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bbb-web-api/src/main/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-06-13 17:44:12 +00:00
Ghazi Triki
ed939d74a7 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgDeserializer.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
 2017-06-13 17:58:46 +01:00
Richard Alam
0c189059ff - see if we can simplify routing of deserialized message 
- user TypeTag instead of Manifest
 2017-06-12 18:15:17 -07:00
Richard Alam
55209b0685 - simplify deserializing of messages 2017-06-12 14:12:28 -07:00
Ghazi Triki
0478a3f658 First pass moving breakout rooms messages to v2 format. 2017-06-12 20:32:10 +01:00
Richard Alam
c0cc7138b3 - add new user joined voice event message 2017-06-12 11:39:53 -07:00
Richard Alam
de0001bb74 - webcam streams model 2017-06-11 18:07:19 -07:00
Richard Alam
35b449b199 - create new status models 2017-06-10 11:11:22 -07:00
Richard Alam
4727eb8e8e - send messages from fs to akka apps 2017-06-09 11:04:17 -07:00
Richard Alam
1ccf71cad7 - add new voice conf messages 2017-06-08 17:55:27 -07:00
Richard Alam
9b9b93c779 - record new messages 2017-06-08 13:11:46 -07:00
Pedro Beschorner Marin
d6b1dd09b9 Merge remote-tracking branch 'mconf-akka-transcoding' into 1.1-transcode 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VideoApp.scala
 2017-06-08 18:57:37 +00:00
Richard Alam
b3e5bd1c37 - remove jedis dependecy 2017-06-08 11:29:44 -07:00
Richard Alam
aa99cb45eb - use redis scala to record events to redis instead of jedis 2017-06-08 11:16:18 -07:00
Pedro Beschorner Marin
40aeabb41c Cleaning up some unused transcode akka-apps methods 2017-06-08 15:53:49 +00:00
Richard Alam
b6f1b6447d - start refactoring recording service 2017-06-07 14:48:33 -07:00
Pedro Beschorner Marin
555c7e351f Merge remote-tracking branch 'mconf-akka-transcoding' into merging-into-bbb-1.1 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/java/org/bigbluebutton/app/video/converter/H263Converter.java
	bigbluebutton-config/bin/bbb-conf
 2017-06-07 18:18:54 -03:00
Pedro Beschorner Marin
719ef1377a Merge remote-tracking branch 'mconf' into merging-into-bbb-1.1 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/java/org/bigbluebutton/app/video/converter/VideoRotator.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-config/bin/bbb-conf
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/core/scripts/rap-worker.rb
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2017-06-07 19:31:15 +00:00
Richard Alam
7e14c133b3 - send start/stop broadcasting webcam from client to server 
- send webcam broadcast started/stopped event from server to client
 2017-06-07 11:08:46 -07:00
Richard Alam
5ef4dd9e88 - change how we deserialize message so we can log errors 
- add helper methods to add routing info for messages
 - add a way to deserialize message from client
 2017-06-06 14:25:40 -07:00
Richard Alam
7f9809459c - try to simpify deserializer 2017-05-31 11:50:59 -07:00
Richard Alam
2999e71530 - remove meeting model 2017-05-29 18:59:00 -07:00
Richard Alam
47b0ada045 - track meeting status 2017-05-29 14:41:37 -07:00
Richard Alam
84bfd93701 - handle register user message 2017-05-29 12:17:25 -07:00
Richard Alam
bd83dc012e - fix test 2017-05-28 18:12:52 -07:00
Richard Alam
240176ca32 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-05-27 18:30:50 -07:00
Richard Alam
272df3c23d - send message to client 2017-05-26 20:00:33 -07:00
Richard Alam
73ec6bb25d - implement validate auth token 2017-05-26 10:04:38 -07:00
Chad Pilkey
09ec1e6151 first pass at multi whiteboard cursors 2017-05-25 23:45:27 -04:00
Richard Alam
18cce3a818 - send and handle meeting created event 2017-05-25 14:34:46 -07:00
Richard Alam
72f7272eb7 - handle create meeting request message 2017-05-25 13:02:26 -07:00
Richard Alam
e56a758c5f - send create message from bbb-web 2017-05-24 15:19:03 -07:00
Richard Alam
467598ffd2 - turn off keep alive message 2017-05-23 17:36:05 -07:00
Richard Alam
d30b5c4aac - start up the client 2017-05-19 20:00:20 -07:00
Pedro Beschorner Marin
6966bfc5af Added VideoApp in akka-apps to manage the video transcoding 2017-05-17 18:01:25 +00:00
Mario Gasparoni
9a3fc66687 Stop Meeting Transcoders 
Stop any remaining transcoder used by the meeting. Useful for mediaSource transcoders.

Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
 2017-05-17 17:43:30 +00:00
Mario Gasparoni
16698f7489 Introducing bbb-transcode-akka 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
	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/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VoiceApp.scala
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoderObserver.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegCommand.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegConstants.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffprobe/FFProbeCommand.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitor.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitorObserver.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessStream.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/Constants.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/IMessagingService.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgentObserver.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java
	bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
	bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
 2017-05-17 15:54:44 +00:00
Richard Alam
aeb4445453 - finish wiring up actor system for bbb-apps 2017-05-17 08:20:01 -07:00
Richard Alam
f610e4e2ce Merge branch 'move-java-classes-from-bbb-web-to-bbb-common-web' of github.com:ritzalam/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-05-12 15:34:54 -07:00
Richard Alam
c0e4a4d681 - handle json message in akka apps 2017-05-12 15:33:46 -07:00
Richard Alam
a077748c57 - start setup akka system for bbb-apps 2017-05-12 13:11:28 -07:00
Richard Alam
76a6d99ca3 - move java classes from bbb-web into bbb-common-web 2017-05-10 13:22:50 -07:00
Richard Alam
0c200871da - add Jackson Json dependencies 2017-05-09 14:19:22 -07:00
Richard Alam
422ee08ea1 - setup tests 2017-05-09 11:47:44 -07:00
Richard Alam
2aa12e9301 - comment out println 2017-05-08 12:57:32 -07:00
Richard Alam
ddf5eb9caa - upgrade dependencies versions 2017-05-08 12:43:19 -07:00
Richard Alam
a97dd6ec58 Merge pull request #16 from pedrobmarin/life-cycle-management 
Moving the meeting life cycle management from bbb-web to akka-apps
 2017-05-04 10:22:06 -04:00
Richard Alam
b1740ebec5 Merge pull request #17 from capilkey/multi-user-2.0-take3 
Updates to make the text tool work
 2017-05-04 10:21:39 -04:00
Chad Pilkey
85d525172b rewrote the text tool to be like other annotations and removed redundant processing 2017-05-03 18:06:26 -04:00
Pedro Beschorner Marin
66a12c9c7a Moving the meeting life cycle management from bbb-web to akka-apps 2017-05-03 17:02:16 +00:00
Richard Alam
401d0f8b78 - minor restructure 2017-04-28 14:21:37 -07:00
Richard Alam
cce0fdd0be - add chat models 2017-04-28 14:20:46 -07:00
Richard Alam
9a2c017375 - modify some handlers 2017-04-27 08:37:37 -07:00
Richard Alam
0262ee97fc - access registered users through RegisteredUsers object 2017-04-26 10:47:41 -07:00
Richard Alam
859e161729 - manipulate users through Users object 2017-04-26 10:31:29 -07:00
Richard Alam
488b038731 - hardcode test results 2017-04-25 13:34:30 -07:00
Richard Alam
c94fe7a9c6 - switch from java map to scala immutable map 2017-04-25 13:21:08 -07:00
Richard Alam
c5edabd33d - use lenses when changing case class values 2017-04-25 13:20:41 -07:00
Richard Alam
2fd18e7c09 Merge branch 'multi-user-2.0' of https://github.com/capilkey/bigbluebutton into bbb-2.x-dev-mconf 2017-04-25 11:21:34 -07:00
Richard Alam
e61220e933 Merge branch 'bbb-2.x-dev' of github.com:ritzalam/bigbluebutton into bbb-2.x-dev-mconf 2017-04-25 11:06:31 -07:00
Richard Alam
d4950a769d - fix assign presenter 2017-04-21 15:39:43 -07:00
Richard Alam
77c4b6fae8 - checng how polling module handle messages 2017-04-21 14:51:32 -07:00
Chad Pilkey
c97aed4057 line smoothing, shape location zoom drift fix, shape drawing efficiency 2017-04-21 17:29:31 -04:00
Richard Alam
d7f7ccbee9 - remove inGW from live meeting 2017-04-21 09:01:28 -07:00
Richard Alam
ae207f6671 - remove outGW from live meeting 2017-04-21 08:58:52 -07:00
Richard Alam
0bb9a0244b - make users model private 2017-04-21 08:48:45 -07:00
Richard Alam
535278a6a8 - do not use users model 2017-04-21 07:39:55 -07:00
Richard Alam
c7d7b91f76 - refactor UsersModel 2017-04-20 21:41:54 +00:00
Richard Alam
f3b7d21202 - remove Role class 2017-04-20 20:46:42 +00:00
Richard Alam
76d58851bb - extract our users and registered users 2017-04-20 20:38:18 +00:00
Richard Alam
dc6be589e2 - move handlers from livemeeting to meetingactor 2017-04-20 18:54:33 +00:00
Richard Alam
339fa1fa7a - move livemeeting into runningmeeting 2017-04-20 17:56:26 +00:00
Richard Alam
1f9a608e3c - move MeetingActor class 2017-04-20 17:32:36 +00:00
Richard Alam
b0910aecf3 - move RunningMeeting class 2017-04-20 16:02:18 +00:00
Richard Alam
f035356bc7 - move LiveMeeting class 2017-04-20 15:56:12 +00:00
Richard Alam
a9590976c2 - allow setting default guest policy for meeting 2017-04-18 19:45:32 +00:00
Richard Alam
b8de0c9231 - add authorized role to registered user 2017-04-17 21:23:17 +00:00
Richard Alam
262c7250c8 Merge branch 'master' with bbb-mconf 2017-04-17 15:57:31 +00:00
Richard Alam
6717308530 Check userId when validating token 
- check if the client validating the token mathes the userId of the registered user. If
   we don't, the client can pass any token and impersonate other users.
 2017-04-11 19:32:18 +00:00
Pedro Beschorner Marin
4beed571fa Also keep reconnecting voice users that are in listen only 2017-04-10 15:15:39 +00:00
Pedro Beschorner Marin
86841167e1 Merge remote-tracking branch 'pedrobmarin/reconnection-timeout' into mconf/mconf 
Conflicts:
	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/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConference.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2017-04-07 21:00:30 +00:00
Richard Alam
6537e99981 Merge branch 'multiuser-whiteboard' of https://github.com/capilkey/bigbluebutton into merge-multi-user-whiteboard 2017-04-06 19:12:42 +00:00
Chad Pilkey
1a78091d01 multi-user whiteboard little bit of polish 2017-04-05 19:54:40 -04:00
Chad Pilkey
f7b9782ef3 multi-user whiteboard clear works 2017-04-04 16:43:15 -04:00
Pedro Beschorner Marin
f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1 2017-04-04 20:42:15 +00:00
Pedro Beschorner Marin
84fd8d4101 Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images! 2017-04-03 17:06:16 +00:00
Chad Pilkey
1f5aff74b9 multi-user whiteboard undo works 2017-03-30 19:26:08 -04:00
Chad Pilkey
14d8c8dea4 multi-user whiteboard gethistory now works 2017-03-30 16:48:34 -04:00
Chad Pilkey
cc2c461df3 first pass as multiuser whiteboard, can mutli draw 2017-03-29 20:12:15 -04:00
Pedro Beschorner Marin
0ab207c997 Merge remote-tracking branch 'mconf/mconf' 2017-03-21 19:47:11 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Richard Alam
e6a121d3bc Fix presentation slide coordinates 
Forgot to assign the values correctly.
 2017-02-14 16:05:16 +00:00
Richard Alam
cb161ac118 - when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds 2017-02-13 20:43:04 +00:00
Ghazi Triki
dfbf8c8c0a Avoid converting some pptx files with certain properties and inform the user. 2017-01-30 19:50:10 +01:00
Anton Georgiev
87c71f2d86 fix for the case where last voice user was kicked 2017-01-25 00:02:11 -02:00
Anton Georgiev
2f702d89d4 fix for the case where last voice user was kicked 2017-01-11 19:14:31 -05:00
Pedro Beschorner Marin
980c5d2ad0 Merge pull request #365 from alexandrekreis/mconf 
Whiteboard annotations on deskshare video
 2017-01-03 15:59:25 -02:00
Ghazi Triki
4c4d768883 Added new "webcamsOnlyForModerator" parameter for create meeting API. 2017-01-02 16:56:32 +01:00
Pedro Beschorner Marin
14b480c8ce Working on avoiding reconnection when ending a meeting by API call 2016-12-09 20:33:03 +00:00
Richard Alam
8242a8b871 - eject users from the voice conference when the meeting is ended through the 
API
 2016-12-02 17:05:17 +00:00
Richard Alam
145c40a459 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into upgrade-red5-nov-22-2016-snapshot 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
 2016-11-24 23:00:56 +00:00
Richard Alam
68e6060166 Merge pull request #3476 from riadvice/request-join-url-update 
RequestBreakoutJoinURL returns two join urls
 2016-11-22 13:39:18 -05:00
Richard Alam
7242b90412 Merge pull request #3470 from riadvice/monitoring-schedule-period 
Update schedule period of MonitorNumberOfWebUsers.
 2016-11-22 13:38:40 -05:00
Richard Alam
3ead2b449b - minor formatting from IDE 2016-11-22 15:59:05 +00:00
Ghazi Triki
59a0f4665d Updated RequestBreakoutJoinURL to return two join urls, the first with redirection enable and the second without redirection. 2016-11-21 18:01:22 +01:00
Felipe Cecagno
8f4ca962cc Merge branch 'undo-stack-size' of github.com:pedrobmarin/bigbluebutton into mconf 
Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
 2016-11-20 21:20:16 -02:00
Felipe Cecagno
1014aa77fa changed possible values for inactivity_deadline to (1 minute; 6 hours), and inactivity_timeleft to (30 seconds; 30 minutes); changed client strings related to inactivity 2016-11-20 15:50:42 -02:00
Felipe Cecagno
faba97fdee Merge branch 'inactivity-metadata' of github.com:pedrobmarin/bigbluebutton into mconf 
Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
 2016-11-20 00:41:28 -02:00
kreismann
4d13d7e20f Updating poll id and setting polling whiteboard id according to the poll Id 2016-11-17 16:04:19 -02:00
Ghazi Triki
40e16b0002 Use local context instead of the global context for scheduleOnce. 2016-11-17 14:12:41 +01:00
Ghazi Triki
727a671b55 Update schedule period of MonitorNumberOfWebUsers. 2016-11-17 12:12:17 +01:00
Ghazi Triki
ab9f85b852 Delay sending DisconnectAllUsers at EndMeeting handler in akka-bbb-apps to avoid a synchronisation issue noticed when users are streaming using RTMPT. 2016-11-17 11:16:14 +01:00
Pedro Beschorner Marin
e87420e44c Fixed a maximum stack size for shared notes undo feature and refactored resync detection 2016-11-16 14:41:31 +00:00
Pedro Beschorner Marin
7d43bed1ff Renamed inactivity metadata ids to fit a naming pattern 2016-11-01 19:58:42 +00:00
Pedro Beschorner Marin
4331aaa8d6 Any sign of activity will interrupt and clean the inactivity warning message 2016-10-31 17:28:56 +00:00
Pedro Beschorner Marin
1e014f9298 Included metadata reading at server. Setting meeting timeleft and deadline as meta_inactivity-timeleft and meta_inactivity-deadline on create params 2016-10-31 16:51:07 +00:00
Pedro Beschorner Marin
5416d01dcc Syncing note if a problem is detected while patching 2016-10-26 17:25:49 +00:00
Pedro Beschorner Marin
67189dff4e Sending sharednotes undo and redo status with current documents message as client starts 2016-10-24 15:42:45 +00:00
Pedro Beschorner Marin
c2decd1d2a Cleanup 2016-10-21 19:46:32 +00:00
Pedro Beschorner Marin
ddd1459d4c Refactored sharednotes UNDO operation and implemented REDO 2016-10-21 19:33:30 +00:00
Richard Alam
2facff623a Merge pull request #3411 from riadvice/unique-meeting-id-breakout-rooms 
Unique meeting id for breakout rooms & additional improvements
 2016-10-21 15:11:28 -04:00
Pedro Beschorner Marin
1eb1aea65e More sofisticated control of sharednotes undo button 2016-10-20 19:56:57 +00:00
Pedro Beschorner Marin
758adb3b8e First functional version of sharednotes undo operation 2016-10-20 17:52:37 +00:00
Ghazi Triki
2b7c7d84e4 Monitoring for number of user is not triggered for breakout rooms. 2016-10-17 10:15:02 +01:00
Ghazi Triki
415e34fb28 Added new property redirectOnJoin to CreateBreakoutRoomsRequest. 2016-10-14 21:28:44 +01:00
Ghazi Triki
c694f632ea Added redirect property to RequestBreakoutJoinURL. 2016-10-14 20:46:34 +01:00
Ghazi Triki
e187634c2a Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room. 2016-10-14 16:33:17 +01:00
Ghazi Triki
b078628ad9 Store breakout room externalMeetingID to be used for generating join URL. 2016-10-13 17:17:47 +01:00
Ghazi Triki
5e002d845e Store breakout room sequence in akka-apps and bbb-web. 2016-10-13 12:53:53 +01:00
Ghazi Triki
ff9bc17c15 Send sequence number when creating breakout rooms and correctly generate a unique externalMeetingId for breakout rooms. 2016-10-12 19:55:20 +01:00
Ghazi Triki
f8beb9e4e7 Breakout rooms are now sorted by their sequence number. 2016-10-12 12:41:57 +01:00
Ghazi Triki
c95d208da7 Added sequence property breakout room. 2016-10-11 22:13:22 +01:00
Ghazi Triki
f7be426305 Breakout rooms refactoring: generated uniques external ID and internal ID. 2016-10-11 20:50:51 +01:00
Richard Alam
403665feb6 - add senderId when recording publish chat message 2016-10-07 21:45:56 +00:00
Ghazi Triki
b10237ebad Upgrade commons-codec dependency version to 1.10 2016-10-05 17:29:37 +01:00
Fred Dixon
3552fca5c5 Merge pull request #3397 from riadvice/breakout-rooms-use-current-presentation 
Breakout rooms use current presentation slide
 2016-09-30 17:16:33 -04:00
Ghazi Triki
0e72d7523d Make breakout rooms use the selected slide of the current presentation as default presentation. 2016-09-28 22:19:48 +01:00
Richard Alam
3cfcf057bb - record the external userid in join events. 2016-09-26 17:33:39 +00:00
Richard Alam
17e465409d - custom poll was sent to the wrong actor. Route it to the correct meeting actor. 2016-08-31 22:13:47 +00:00
Chad Pilkey
1b72f8b077 add property to closed caption transcript model for the locale code 2016-08-30 17:10:03 -04:00
Richard Alam
9f3189f5f1 - merged new screen sharing UI 2016-08-23 15:21:28 +00:00
Richard Alam
34d8e2fbb3 Merge pull request #3294 from riadvice/breakout-room-logout-fix 
Fix for breakout room logout issue
 2016-08-18 11:55:58 -04:00
Ghazi Triki
6b93bd3130 Block user from joining any breakout room until all of them are created. 2016-08-18 15:12:57 +01:00
Ghazi Triki
9e32890d1b Postpone sending breakout rooms invitations to after all breakout rooms are successfully created. 2016-08-18 08:03:34 +01:00
Richard Alam
76e7e6d568 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc 2016-08-17 18:44:49 +00:00
Richard Alam
6aab83589a Merge branch 'screenshare-1.1' of https://github.com/antobinary/bigbluebutton into antobinary-screenshare-1.1 
Conflicts:
	bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
	bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as
 2016-08-17 18:40:28 +00:00
Anton Georgiev
9fb1c343f2 server side changes for switching recordType:String to record:Boolean 2016-08-11 21:30:06 +00:00
Anton Georgiev
f7cb97737d ask akka-apps if allowed to start screenshare 2016-08-11 19:18:56 +00:00
perroned
c057111367 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
 2016-08-04 18:23:45 +00:00
perroned
4181ba2ee7 Merge remote-tracking branch 'anton/fix-webrtc-deskshare' into merge-webrtc-screenshare-1 2016-08-04 15:17:46 +00:00
Ghazi Triki
984717e195 Minor logging improvement into BigBlueButtonActor.scala 2016-08-02 17:14:42 +01:00
Anton Georgiev
2ae55432fd deskshare transition to webrtc screenshare changes 2016-07-29 16:16:55 +00:00
perroned
8c7fdc0036 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-client/resources/prod/lib/verto_extension.js
 2016-07-27 19:32:01 +00:00
Ghazi Triki
2638e6c9c1 Merge branch 'master' into breakout-rooms-recording 
# Conflicts:
#	akka-bbb-apps/src/main/resources/application.conf
 2016-07-26 17:27:50 +01:00
Ghazi Triki
a62db6c8b4 Breakout rooms uses password from the parent room. 2016-07-25 23:20:31 +01:00
Ghazi Triki
7d2cef9b9f Added recording options for breakout rooms. 2016-07-25 22:31:04 +01:00
Fred Dixon
7a75773680 Removed Windows line feeds from application.conf 2016-07-24 23:56:26 -04:00
Anton Georgiev
a4d173c1a4 fix missing lib for video-broadcast 2016-07-22 15:54:03 +00:00
Anton Georgiev
01e0c99c58 subscribe for -DESKSHARE in meeting, adjust for liveMeeting 2016-07-20 21:39:36 +00:00
Richard Alam
7882735076 Record breakout rooms 
If the parent meeting is recorded, record also the breakout rooms.
 2016-07-18 17:07:31 +00:00
Richard Alam
f66571e899 Fixes issue 3196 
End the breakout rooms when the parent meeting is ended from the API.
 2016-07-15 20:03:24 +00:00
Pedro Beschorner Marin
85e68a66ca Merge remote-tracking branch 'origin/inactivity-timeout' into merging-to-1.0 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
 2016-06-27 19:57:48 +00:00
Pedro Beschorner Marin
78313fda46 Merge remote-tracking branch 'rafael/feature-1944' into rafafp-branches-merged-1.0 2016-06-22 14:23:59 +00:00
Pedro Beschorner Marin
4c432ee5bd Merge branch 'feature-1931' into rafafp-branches-merged-1.0 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatToolbar.mxml
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-06-22 13:06:51 +00:00
Pedro Beschorner Marin
e12af55dc8 Merge remote-tracking branch 'rafael/fix-1969' into rafafp-branches-merged-1.0 2016-06-21 14:14:00 +00:00
Pedro Beschorner Marin
7aed9ac32a Merge remote-tracking branch 'origin/akka-logging-actors-exceptions' into merging-to-1.0 2016-06-20 17:09:16 +00:00
Anton Georgiev
a8e39edf15 allow reply for zero meetings too 2016-06-14 14:11:43 +00:00
Anton Georgiev
7fb2184c02 fix querry for existing meetings 2016-06-13 21:39:31 +00:00
Anton Georgiev
abe4ade1ca rework summary dispatcher for html5 client; add caption history 2016-06-02 20:26:32 +00:00
Anton Georgiev
1854855218 adjust captions and deskshare to use eventBus in akka apps 2016-06-02 16:06:01 +00:00
Richard Alam
f2819a6282 Setup application config 
Need to tell service location of application config.
 2016-05-30 14:11:32 -04:00
Anton Georgiev
dd075faa2e config updates 2016-05-27 14:30:16 -04:00
Richard Alam
aafc420d53 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-24 20:17:47 +00:00
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.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/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04:00
Richard Alam
7ae9b7b204 Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 20:27:52 +00:00
Richard Alam
433f09f72d Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB 
Conflicts:
	bbb-common-message/build.sbt
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 15:40:50 +00:00
Anton Georgiev
228dfb4061 Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-fsesl-client/build.sbt
	bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-html5/app/client/NotificationControl.coffee
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
	bigbluebutton-html5/app/client/main.coffee
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
	bigbluebutton-html5/app/client/views/modals/settings.coffee
	bigbluebutton-html5/app/client/views/modals/settings.html
	bigbluebutton-html5/app/client/views/users/user_item.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
	bigbluebutton-html5/app/collections/collections.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/lib/router.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/collection_methods/users.coffee
	bigbluebutton-html5/app/server/publish.coffee
	bigbluebutton-html5/app/server/server.coffee
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-05-18 15:14:04 +00:00
Chad Pilkey
24c6d48dc2 removing files that should not have been committed 2016-05-02 12:45:25 -07:00
Richard Alam
b86f32b8c1 Sync with upstream repository 
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
 2016-04-26 20:01:20 -04:00
Ghaz Triki
11d86f6aa8 Merge 'branch air-ui' into 'mobile-client' 2016-04-26 09:19:17 +01:00
David Feng
67c14f9056 This enable avatar to be display in other participants video window 2016-04-20 14:08:13 +08:00
RafaFP
6a93432709 implemented a button to give moderators the option to end the meeting when they logout 
refs #1944
 2016-03-29 20:55:23 +00:00
Richard Alam
a684aa4dfc Merge into bbb-1.1.dev 
Merge master, breakout rooms, and closed captioning into bbb-1.1-dev branch.

Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
 2016-03-21 18:12:30 +00:00
Richard Alam
7fe44355d4 Merging breakout rooms with the master branch 
Merge breakout rooms feature with master branch. This
 also includes closed captioning feature.

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-web/.classpath
	bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-03-21 17:52:23 +00:00
Ghaz Triki
8edeb609db Send externalUserId instead of the internal user id to the main room. 2016-03-17 17:07:37 +01:00
Ghaz Triki
af07b8508b Make the breakout room user id composer from its original user id and the breakout room number. 2016-03-17 15:01:17 +01:00
Ghaz Triki
07d3028d10 Fetch all breakout rooms users and decorate BreakoutRoom class to display their the number of a breakout room users. 2016-03-16 19:12:10 +01:00
Ghaz Triki
6a559b05ec Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2016-03-16 14:27:41 +01:00
Felipe Cecagno
c818cd154b Merge remote-tracking branch 'bigbluebutton/master' into mconf 2016-03-09 12:05:32 -03:00
Pedro Beschorner Marin
6fd5e289eb Fixed empty sharednotes when connecting problem. Now patches are identified and buffered when client is connecting. 2016-03-08 20:31:42 +00:00
Pedro Beschorner Marin
64c186ae85 Changed monitor's overdue logic and implemented new messages for the client 2016-03-07 20:09:43 +00:00
Richard Alam
ef2470f33b Process JSON message from Redis on another thread 
Process converting of message from json on a different thread to protect the redis sub actor from
 dying when exception occurs due to invalid message.
 2016-03-07 16:42:40 +00:00
Felipe Cecagno
c2b139219b add externUserId to the ParticipantJoin event (exported to events.xml) 2016-03-04 20:23:20 -03:00
Pedro Beschorner Marin
7e0da6999c Cleanup 2016-03-04 21:08:15 +00:00
Pedro Beschorner Marin
b891be2e95 Client now react to warning messages and refactored server 2016-03-04 20:45:56 +00:00
RafaFP
89ac2fd60a Improved the code to meet the peer review results. 
refs #1931
 2016-03-04 17:40:48 +00:00
Pedro Beschorner Marin
225fbbb483 Meeting's inactivity detection. Still needs some refactoring and cleanup. 2016-03-03 20:30:56 +00:00
RafaFP
932de9c07f Updated class and method names to better correspond to the implemented function. 
Improved the recording code.

refs #1931
 2016-03-02 16:02:30 +00:00
Felipe Cecagno
e4da408c08 Merge branch 'mconf' into bigbluebutton/bigbluebutton@master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	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/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
	bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-03-02 01:19:09 -03:00
Ghaz Triki
990e786340 Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-web/.classpath
#	bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
#	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-02-28 21:34:33 +01:00
RafaFP
32f937def8 Implemented the clearing of text in the recordings player. 
Recordings will now clear the chat box for every clear command received during the recording.

refs #1931
 2016-02-26 21:18:14 +00:00
Ghaz Triki
93140364f9 Display breakout room timer in the parent room. 2016-02-23 17:47:25 +01:00
Ghaz Triki
9adc9c626c End all breakout rooms whenever the parent room is programatically ended. 2016-02-23 11:10:34 +01:00
RafaFP
65b181198c Implemented a button to clear chat history. 
New conversation joiners will not receive the history previous to the clearing.
Current conversation users will clear the local chat history and be notified that a moderator cleared the chat.

refs #1931
 2016-02-22 22:10:04 +00:00
Anton Georgiev
107fa7c07a fix for #3012 no presenter after ex-presenter kicked 2016-02-19 16:52:56 +00:00
Ghazi Triki
78af9a5030 Remaining time for the breakout room is calculated in seconds instead of minutes. 2016-02-10 15:23:44 +01:00
Ghazi Triki
da81a1bd72 Only display the number of users in breakout rooms list. 2016-02-08 21:03:35 +01:00
Richard Alam
9fac3d43db - merge latest form ghazi 2016-02-08 18:08:49 +00:00
Richard Alam
5f03fd5f0b Merge branch 'breakout-rooms-porto-algre-2015' of https://github.com/riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 2016-02-08 16:25:56 +00:00
Ghazi Triki
492315e0a7 Added log info to BreakoutRoomApp when EndAllBreakoutRooms message is received. 2016-02-05 17:30:21 +01:00
Ghazi Triki
2fb347bc25 Refactored the way that conference transfer between the parent room and breakout room is requested. 2016-02-03 22:30:08 +01:00
Pedro Beschorner Marin
e9cc024e5e Added exception handlers to deskshare actors and refactored the akka ones 2016-02-03 18:41:49 +00:00
Ghazi Triki
cf117282a7 BigBlueButtonActor is now responsible for informing the parent room that one if its children has been terminated. 2016-02-02 20:28:43 +01:00
Richard Alam
21b8c703a5 Merge branch 'breakout-rooms-porto-algre-2015' of https://github.com/riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 
Conflicts:
	akka-bbb-apps/scala/JsonTest.sc
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala
 2016-02-01 16:12:06 +00:00
Anton Georgiev
21f2d7a788 limit -DESKSHARE to fsesl only, not akka-bbb-apps 2016-01-29 20:52:14 +00:00
Pedro Beschorner Marin
d74c571958 Akka actors now print and log the exceptions and are kept alive 2016-01-28 18:15:24 +00:00
Anton Georgiev
1d4caa0195 get timestamp as per convention 2016-01-27 22:26:28 +00:00
Anton Georgiev
08d6ee36f9 recover videoWidth, videoHeight params 2016-01-27 21:42:10 +00:00
Ghazi Triki
16bd601735 Use ListenInOnBreakout event from client instead of TransferUserToMeeting. 2016-01-27 22:25:15 +01:00
Ghazi Triki
62a721b310 Update gson library version to 2.5 for all server projects. 2016-01-27 16:44:22 +01:00
Ghazi Triki
0385d05001 Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	akka-bbb-apps/build.sbt
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
#	akka-bbb-fsesl/build.sbt
#	bbb-common-message/build.sbt
#	bigbluebutton-apps/build.gradle
#	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2016-01-27 14:16:05 +01:00
Ghazi Triki
9b66cf30f9 Added transfer user from the parent voice conference to a selected breakout voice conference. 2016-01-27 12:00:32 +01:00
Felipe Cecagno
2a3b95daf7 Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-config/bin/bbb-conf
 2016-01-26 18:33:31 -02:00
Anton Georgiev
7bedb7d6f7 missed some lines in recorderActor. also clean up 2016-01-26 20:23:50 +00:00
Anton Georgiev
0d9c2d1472 remove dependency on vh, vw. remove obsolete code. clean up 2016-01-26 18:53:26 +00:00
Ghazi Triki
a396063981 Breakout rooms are terminated from the main parent room. 2016-01-25 19:49:27 +01:00
Ghazi Triki
afcc925380 Added missing message EndBreakoutRoom 2016-01-25 16:59:06 +01:00
Ghazi Triki
4f30127003 Ending a breakout room message goes to to bbb-web to be handled then send the response back to the client trgouh akka-apps and bbb-apps. 2016-01-23 18:44:50 +01:00
Richard Alam
3273912bd1 Merge pull request #2968 from ritzalam/expire-redis-keys-after-14-days 
Expire redis keys after 14 days
 2016-01-22 14:29:25 -05:00
Pedro Beschorner Marin
8890f46910 - avoid scala warning messages 2016-01-22 19:00:50 +00:00
Pedro Beschorner Marin
086e339653 Simple modification to avoid multiple start audio recording events 2016-01-22 16:43:17 +00:00
Richard Alam
f501fb5803 - expire redis recording keys after 14 days 2016-01-21 20:43:28 +00:00
Richard Alam
6956ddf723 - do not record events if the meeting is not recorded 2016-01-21 20:42:47 +00:00
Ghazi Triki
1dd4ddd6cb Created breakout rooms are now displayed in breakout rooms list. 2016-01-21 20:09:32 +01:00
Richard Alam
c66c180040 - make the flash client not attempt to reconnect when the user has been ejected from the meeting. 2016-01-19 16:16:12 +00:00
Ghazi Triki
e4cc61ad4e Fixed users marshalling in UpdateBreakoutUsers message. 2016-01-15 22:16:38 +01:00
Ghazi Triki
058a2170ee Added request breakout rooms list feature. 2016-01-15 22:13:53 +01:00
Richard Alam
d79d763857 Merge branch 'reconnect-fixes' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-reconnect-fixes 2016-01-14 19:43:08 +00:00
Anton Georgiev
c28bbce889 add data and clean up 2016-01-13 22:54:03 +00:00
Ghazi Triki
cc56ee8b2f Joining a breakout room made possible throught the client. 2016-01-13 21:33:54 +01:00
Ghazi Triki
0581c5186d End all breakout rooms handled in akka-bbb-apps 2016-01-13 20:29:17 +01:00
Ghazi Triki
3f049ec644 Added more scala worksheet to test breakout room feature. 2016-01-13 18:20:51 +01:00
Pedro Beschorner Marin
afb1cc44d6 Fixed SIP mic reconnection 2016-01-13 15:01:04 +00:00
Pedro Beschorner Marin
28bf1c9084 Fixed global audio reconnection 2016-01-13 13:50:38 +00:00
Ghazi Triki
6ad3b315ee Implemented EndAllBreakoutRooms in akka-bbb-apps 2016-01-12 20:45:35 +01:00
Ghazi Triki
48844648ee Send RequestBreakoutJoinUrl from client to server. 2016-01-12 20:18:23 +01:00
Felipe Cecagno
d98bee07cf Merge webrtc-reconnect into bigbluebutton/master 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2016-01-12 15:27:01 -02:00
Anton Georgiev
b5fafe25ca Removing recording code used in the past for recording to file via FS. obsolete as we now record in red5 2016-01-08 21:58:10 +00:00
Anton Georgiev
9a0383f35a after ds destroy, clean params, notify others 2016-01-08 19:38:36 +00:00
Anton Georgiev
23a83ab6e9 destoy deskshare on FS if presenter leaves 2016-01-08 19:07:57 +00:00
Richard Alam
838d6e0ad7 - merge Chad's closed caption work into Ghazi's breakout rooms work 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
 2016-01-08 19:06:42 +00:00
Richard Alam
53e0c375e0 - fix merge issues 2016-01-08 15:56:19 +00:00
Richard Alam
747f820173 - try to fix merge issues 2016-01-07 23:15:35 +00:00
Richard Alam
16499b3da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-fsesl/build.sbt
	bigbluebutton-web/build.gradle
 2016-01-07 22:58:04 +00:00
Chad Pilkey
311adeda42 added recording for the caption edit messages 2016-01-06 11:23:40 -08:00
Felipe Cecagno
8f08e13dcc Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
 2015-12-30 18:35:13 -02:00
Anton Georgiev
155aebdc65 allow late joining ds for html5 client, event if Meteor started late 2015-12-22 22:55:16 +00:00
Anton Georgiev
8ee6356b5a accommodate late joiners 2015-12-22 16:21:39 +00:00
Anton Georgiev
5bf05161af Merge branch 'html5client-mod-verto-addition' of github.com:perroned/bigbluebutton into webrtc-desktop-temp-4 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
 2015-12-11 17:23:27 +00:00
Chad Pilkey
71f8ff085f first try and adding caption ownership 2015-12-09 14:00:26 -08:00
Pedro Beschorner Marin
438e5fc1e6 Fixed guest policy getting, setting an changed messages 2015-12-04 15:16:09 +00:00
Pedro Beschorner Marin
59cd4f64bf Refactored shared notes app 2015-12-03 17:44:17 +00:00
Pedro Beschorner Marin
20231003ae Fixed additional note creation 2015-12-03 16:19:24 +00:00
Richard Alam
0bba549b38 - sometimes we see multiple wav files on recorded meetings. This was due to starting recording again 
when the user gets disconnected from bbb-apps but still connected to audio.
 2015-12-02 23:03:44 +00:00
Richard Alam
c024cd570c - fix where 2 events are recorded in redis for each voice event. 2015-12-02 21:37:18 +00:00
Pedro Beschorner Marin
ee3864e5ce Fixed sharednotes MAIN_WINDOW 2015-12-02 18:39:35 +00:00
Pedro Beschorner Marin
e868fb3cc9 Fixed user role change 2015-12-01 14:45:44 +00:00
Felipe Cecagno
555e037d79 fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0 2015-11-30 01:06:38 -02:00
Pedro Beschorner Marin
36bbcc06d6 Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-video/.classpath
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/webapp/WEB-INF/red5-web.xml
	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/ParticipantsListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.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/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	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/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/layout/LayoutApp.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/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.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-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_LA/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/src/BigBlueButton.mxml
	bigbluebutton-client/src/SharedNotesModule.mxml
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
	bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.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/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeMyRole.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeRoleEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/LowerHandEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/StreamStoppedEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/AddButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.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/managers/PresentManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/Client.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/HTTPServerConnection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/XMLServerConnection.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/users/views/StatusItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	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
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/GraphicsWrapper.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
	bigbluebutton-config/bigbluebutton-release
	bigbluebutton-config/bin/bbb-conf
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisStorageService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
 2015-11-25 15:58:36 +00:00
Chad Pilkey
0990c2c2ad Commiting with the caption module in a workable state 2015-11-24 15:19:39 -08:00
Chad Pilkey
3036a9740b caption module now tracks TextArea updates 2015-11-23 12:56:52 -08:00
Ghazi Triki
1bb3d4a197 MessageSenderActor handles BreakoutRoomStartedOutMessage, UpdateBreakoutUsersOutMessage and MeetingTimeRemainingUpdate and convert them to json. 2015-11-23 10:19:17 +01:00
Ghazi Triki
6e9b95e347 BreakoutRoomStarted event finally arrives to the client. 2015-11-20 19:06:11 -02:00
Ghazi Triki
924a8cbefd Added BreakoutRoomStartedOutMessage handler to MessageSenderActor 2015-11-20 15:26:34 -02:00
Richard Alam
06029aaba7 - figure out enums 2015-11-18 11:18:46 -05:00
Ghazi Triki
7989b897f3 Create breakout room and send the message to akka-bbb-apps 2015-11-19 16:54:06 -02:00
Ghazi Triki
5a6266e395 bbb-web sends back the breakout room created event to bbb-akka-apps 2015-11-19 12:33:00 -02:00
Ghazi Triki
a623443b16 Fixed breakout room default presentation URL 2015-11-19 12:32:37 -02:00
Ghazi Triki
b3dabfdf69 Fixed compile errors on akka-bbb-apps 2015-11-19 10:32:46 -02:00
Richard Alam
f7630bdc74 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 2015-11-17 14:33:57 -05:00
Ghazi Triki
b299e3fd50 Accept processing RequestBreakoutJoinURL message in akka-bbb-apps 2015-11-18 18:20:56 -02:00
Richard Alam
6a85afa430 - format out message 2015-11-17 14:33:15 -05:00
Richard Alam
6bcfbadf64 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
 2015-11-17 10:42:36 -05:00
Ghazi Triki
ef23cacefa Breakout room feature server updates. 2015-11-18 16:45:46 -02:00
Ghazi Triki
ce09a8d952 Minor fix for PresentationMessageListener when converting a presentation message. 2015-11-18 14:57:28 -02:00
Ghazi Triki
3c6586749f Updated gson library dependency to version 2.4 2015-11-18 14:35:32 -02:00
Richard Alam
1e1ee72ac0 - try to encode out messages 2015-11-17 10:41:15 -05:00
Richard Alam
39d9c5dd15 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
 2015-11-17 02:19:48 -05:00
Ghazi Triki
69acc57f2d Breakout related requests are sent to the correct "meeting" redis channel. 2015-11-17 18:34:13 -02:00
Ghazi Triki
b8eafcc11c Better processing of CreateBreakoutRoomsRequest in akka-bbb-apps 2015-11-17 17:29:37 -02:00
Richard Alam
bd8b38a22c - use spray json to decode messages 2015-11-17 02:11:14 -05:00
Ghazi Triki
402f337fd6 Handle CreateBreakoutRoomsRequest case in BigBlueButtonInGW.scala 2015-11-16 17:09:38 -02:00
Chad Pilkey
2d9d28f638 added a new caption message to push current line 2015-11-03 15:44:26 -08:00
Richard Alam
83934862fc - tell parent meeting that breakout room has been created 2015-10-30 21:28:01 +00:00
Richard Alam
ea2dbd541a - breakout room incoming message 2015-10-30 21:08:13 +00:00
Richard Alam
923d78719b - send messages to redis 2015-10-30 19:14:35 +00:00
Richard Alam
48e5f5f638 - formatting cleanup 2015-10-29 21:43:49 +00:00
Richard Alam
27f6aa0cfb - implement message handler for breakout rooms 2015-10-29 18:21:38 +00:00
Richard Alam
c224e58d5b - move meeting actor methods into class so it is easier to setup tests 2015-10-28 20:54:31 +00:00
Richard Alam
4154d9e531 - write tests to calculate checksum 2015-10-28 17:05:40 +00:00
Richard Alam
e3fdea517a - increment meeting id 2015-10-28 15:12:35 +00:00
Richard Alam
66eaef9032 - implement create breakout room handler 2015-10-28 15:00:37 +00:00
Richard Alam
aa15bc220a - add tests 2015-10-27 15:31:14 +00:00
Richard Alam
00e6e2b4db - externalise scheduled timer 2015-10-26 20:45:00 +00:00
Richard Alam
7db6144921 - add tests 2015-10-26 19:00:04 +00:00
Richard Alam
968a2ed98f - rename event bus 2015-10-23 21:08:30 +00:00
Richard Alam
4a10f04f8b - use akka event bus for messages 2015-10-23 19:37:13 +00:00
Richard Alam
75e0b0065a - fix duration 2015-10-23 15:14:46 +00:00
Anton Georgiev
8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bigbluebutton-apps/build.gradle
 2015-10-22 20:46:30 +00:00
Richard Alam
b899eeebcf - distinguish breakout rooms in create meeting request 2015-10-22 19:36:20 +00:00
Richard Alam
cecbc46d1d - create breakout room in bbb-web 2015-10-22 17:13:53 +00:00
Richard Alam
c9b4f7e9a0 Merge branch 'support-multiple-logins' into add-http-to-akka-apps 
Conflicts:
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
 2015-10-21 17:44:44 +00:00
Richard Alam
10f7f3f852 - play around with akka http 2015-10-20 15:43:41 +00:00
Richard Alam
acd021a113 - play around with akka http 2015-10-19 19:00:59 +00:00
Richard Alam
9696b0246b - add dependencies 2015-10-16 19:23:33 +00:00
Chad Pilkey
ad3ba6677c first two initial caption module messages finished 2015-10-15 15:40:23 -07:00
Anton Georgiev
f08cd5262e temp changes 2015-10-13 19:00:50 +00:00
Richard Alam
23383c8db4 - add scala worksheet for testing 2015-10-05 15:23:06 +00:00
Richard Alam
93dd5186b4 - user internal user id for user in the voice conf 2015-09-30 18:55:17 +00:00
Richard Alam
43c8f9b5ec - add more info on logs 2015-09-24 20:05:48 +00:00
Richard Alam
8ede5983ea - do not re-inject message into the actor but instead process the message inline to prevent 
race condition where a message gets processed before the injected message
 2015-09-21 14:42:07 +00:00
Richard Alam
1b8cb41152 - initialize voice user properly when disconnected from global audio 2015-09-17 20:26:00 -04:00
Richard Alam
2278ee01ec - upgrade bbb-commons-message version 2015-09-14 21:45:55 +00:00
Richard Alam
bbfbdf20e9 - cleanup 2015-09-14 21:25:27 +00:00
Richard Alam
44763bf283 - try to fix lock settings 2015-09-14 20:18:27 +00:00
Chad Pilkey
51650fb998 made the init audio and permissions message payloads actually contain something and corrected chatpermission message names 2015-09-11 15:02:28 -07:00
Anton Georgiev
8b58671948 cleaning up 2015-09-10 15:24:08 +00:00
Richard Alam
f78dc3653c - fix issue where other users get disconnected when a user refreshes browser after a reconnect 2015-09-08 20:27:10 +00:00
Richard Alam
dbbb4139d2 Merge pull request #2766 from capilkey/misc-client-changes-100 
Misc client changes 100
 2015-09-04 19:14:24 -04:00
Richard Alam
4b9e96cea2 - inject user join as message to prevent race condition of messages 2015-09-04 19:20:25 +00:00
Chad Pilkey
4df8c88b94 Swapped Yes/No and True/False in poll answers 2015-09-03 15:34:47 -04: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
796f71f642 - fix issue where users does not get refreshed after reconnect 2015-08-23 23:03:15 -04:00
Richard Alam
bda62afa4d - try to maintain userid when a user reconnects to be able to match the user 2015-08-23 18:22:48 -04:00
Richard Alam
52d2ed1666 - try to fix auto-reconnect for listen only users 2015-09-03 14:04:48 +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
3a11d30115 Fixed emojiStatus is correctly saved in UsersModel. 2015-08-27 21:25:54 +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
fb9c63dd50 move deskshare publisher to MessageSenderActor 2015-08-21 22:03:37 +00: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
39baecef24 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into redis-pubsub-keepalive 2015-08-21 13:46:42 +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
Fred Dixon
c875be4c1d Merge pull request #2727 from capilkey/variable-wb-poll-size 
Variable wb poll size
 2015-08-19 14:15:02 -04:00
Richard Alam
a3318e5f90 - send keep alive message 2015-08-19 14:33:46 +00:00
Richard Alam
8be746b4ac - start implementing round-trip pubsub monitoring 2015-08-18 21:51:48 +00:00
Chad Pilkey
7846add9e9 The Poll WB mark height increases with number of answers 2015-08-18 11:52:12 -04: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
Anton Georgiev
4db2ebb86e flag for ds started; cleaning up logs 2015-08-11 20:30:07 +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
987397250c - stop poll when presenter change happens while poll is running 2015-08-10 15:21:38 +00:00
Richard Alam
15a368f444 - remove some printlns to lessen noise 2015-08-07 21:37:16 +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
Richard Alam
839473395a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-leonardo-api-changes 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
 2015-08-07 15:06:40 +00:00
Anton Georgiev
b0b193e021 restrict rmpt notifications to only once and when applicable 2015-08-07 14:58:25 +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
8a09f6aaf7 Merge pull request #731 from bigbluebutton/pedrobmarin-development-auto-reconnect 
merge auto reconnect feature
 2015-07-28 17:13:21 -04:00
Richard Alam
335b87b8bf - mic icon not showing up beside user's name when reconnect occurs if user is joined using webrtc 2015-07-28 21:04:18 +00:00
Richard Alam
6297a60b7a - assign a presenter when there is none 2015-07-28 19:53:46 +00:00
Richard Alam
becfad11d6 - poll results recording has missing data required for processing 2015-07-28 18:48:47 +00:00
Richard Alam
d63b54d291 Merge branch 'development' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-development 2015-07-23 19:45:19 +00:00
Pedro Beschorner Marin
b1ccea37a1 Merge branch 'auto-reconnect' into development 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
 2015-07-23 18:44:21 +00:00
Chad Pilkey
be0e43baa2 translate the poll answers 2015-07-23 13:06:09 -04:00
Richard Alam
7ee0043f54 Merge pull request #703 from ritzalam/add-num-responders 
- change the background color of poll result and size of window
 2015-07-14 15:41:49 -04:00
Richard Alam
7c862a10aa - change the background color of poll result and size of window 2015-07-14 19:40:09 +00:00
Richard Alam
7ac6262411 Merge pull request #702 from ritzalam/add-num-responders 
- hardcode poll result display position on server side so different …
 2015-07-14 14:48:49 -04:00
Richard Alam
aa630e52fb - hardcode poll result display position on server side so different clients won't have to recalculate 
position
 2015-07-14 18:45:55 +00:00
Richard Alam
10ef6bec01 - only remove stream if present 2015-07-14 14:22:17 +00:00
Richard Alam
087c07a6a8 Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into add-num-responders 2015-07-13 19:20:31 +00:00
Richard Alam
822b319440 - add number of responders on poll result 2015-07-13 19:18:37 +00:00
Richard Alam
116c274519 Merge pull request #692 from ritzalam/put-outgw-into-actor 
- put message sender and recorders into actors to isolate meeting ac…
 2015-07-13 14:48:42 -04:00
Richard Alam
25ea23eb8d Merge pull request #693 from riadvice/improve-gitignore 
Improved .gitignore files with better patterns.
 2015-07-13 11:58:03 -04:00
Fred Dixon
2bf855543e Enable logging in redis publisher 2015-07-11 19:52:04 -04:00
Anton Georgiev
6560da3632 cleaning up 2015-07-10 15:33:27 +00:00
Ghazi Triki
1ac5a308b5 Improve .gitignore files with better patterns. 2015-07-09 16:13:09 +01:00
Richard Alam
e52e6e7f43 - put message sender and recorders into actors to isolate meeting actor. This hopefully 
will isolate the meeting actor from exceptions when sending to pusub and recording to redis
 2015-07-08 22:21:12 +00:00
Richard Alam
95ff9d0925 - specify location of poll result display 2015-07-08 20:57:16 +00:00
Richard Alam
ed271d41f4 - store poll result into whiteboard history 2015-07-08 17:30:38 +00:00
Richard Alam
0693b83fc8 - fix exception when recording poll result 2015-07-08 17:07:40 +00:00
Anton Georgiev
15a9e670b8 forward videoWidth, videoHeight to flash client(rtmp) 2015-07-08 16:05:04 +00:00
Richard Alam
d9e71196a9 - record poll result (Still need to fix the data) 2015-07-08 15:14:30 +00:00
Richard Alam
d9fdbe132a - minimize logging 2015-07-08 15:12:42 +00:00
Anton Georgiev
9f5783c0b4 use real meetingId+timestamp broadcast path 2015-07-08 14:35:51 +00:00
Richard Alam
a55711af2c - add whiteboardId into shape to be able to determine which page this poll result is related to 2015-07-07 21:36:35 +00:00
Richard Alam
3ed524a34c - upgrade bbb-commons-message version 2015-07-07 21:36:01 +00:00
Richard Alam
5060726035 - format poll result data correctly 2015-07-06 22:12:15 +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
Anton Georgiev
7192079977 send to BBB-Apps vh, vw, samplerate, fps, channels 2015-06-30 18:50:29 +00:00
Anton Georgiev
c926ee0858 set meetingModel flags when FS confirms 2015-06-29 21:13:01 +00:00
Anton Georgiev
28408796cc store rtmp url, implement stop rtmp broadcast 2015-06-29 15:52:25 +00:00
Anton Georgiev
d7682f97b8 auto start/stop rtmp broadcast 2015-06-29 14:27:35 +00:00
Anton Georgiev
09e907d2ba auto start/stop video rec based on meeting isRecorded 2015-06-26 19:54:07 +00:00
Richard Alam
36601345c2 - stop poll if presenter leaves or presentation page changed 2015-06-24 20:32:00 +00:00
Richard Alam
d9295115c8 - handle voting, stop, and show result in the client 2015-06-23 21:50:38 +00:00
Anton Georgiev
0e362e9762 FS deskshare serverside cont'd 2015-06-23 19:45:36 +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
8b84fd92b4 - implement redis messages for polling 2015-06-19 21:10:25 +00:00
Anton Georgiev
8b161e8217 record command; record messages 2015-06-19 20:38:54 +00:00
Richard Alam
7c3cfa665f - implement poll message handlers 2015-06-19 16:07:21 +00:00
Richard Alam
35ebeb3bce - try to fix log location 2015-06-19 14:24:29 +00:00
Richard Alam
cbce9d61eb - implement message handlers 2015-06-18 22:09:08 +00:00
Anton Georgiev
bdb56d4884 FS video share/view messages from fs to bbb-apps 2015-06-18 22:07:15 +00:00
Richard Alam
288baa7082 - bunch of cleanup and restructuring of code 
- start implement poll message handlers in meeting actor
 2015-06-17 19:21:14 +00:00
Anton Georgiev
a96524a31a move WhiteboardKeyUtil;remove VoiceKeyUtil 2015-06-17 18:24:21 +00:00
Anton Georgiev
1b24e0cae3 use ChatKeyUtil from bbb-common-messages 2015-06-17 15:47:20 +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
5f0ba65d20 Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into implement-polling-v3 2015-06-16 16:10:14 +00:00
Richard Alam
346be1d523 - put meeting properties into one class 2015-06-16 16:09:41 +00:00
Anton Georgiev
26176c9830 ignore logs 2015-06-16 15:59:31 +00:00
Richard Alam
81318e056f - cleanup 2015-06-15 22:08:17 +00:00
Richard Alam
0dabe2c9a1 - cleanup 2015-06-15 21:52:28 +00:00
Richard Alam
ef0377ebcf - remove version from messages 2015-06-15 20:54:40 +00:00
Richard Alam
c2f0801a17 - start implementing polling 2015-06-15 17:03:15 +00:00
Richard Alam
af390764e9 - cleanup 2015-06-10 20:45:57 +00:00
Richard Alam
8f476d3571 - do not send notification if duration=0 2015-06-10 19:21:55 +00:00
Richard Alam
36b9dc0104 - use bbb-common-message 2015-06-10 19:11:31 +00:00
Richard Alam
b89d3b2857 - use bbb-common-message lib 2015-06-10 15:50:06 +00:00
Richard Alam
59d4f0b587 - start implementing polling 2015-06-09 19:36:46 +00:00
Richard Alam
629f4ae337 - move bbb-apps-akka out of labs 2015-06-09 18:49:47 +00:00