BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,362 Commits 13 Branches 260 Tags 1.1 GiB
4727eb8e8e
Commit Graph

388 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
346be1d523 - put meeting properties into one class 2015-06-16 16:09:41 +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
8f476d3571 - do not send notification if duration=0 2015-06-10 19:21:55 +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