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

282 Commits

Author SHA1 Message Date
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
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
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
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
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
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