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

13228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
10c10ba455 Merge pull request #3293 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
Allow pausing and resuming of screen sharing
 2016-08-17 18:16:44 -04:00
Richard Alam
8103162d61 - try to handle getting disconnected. 2016-08-17 21:51:35 +00:00
Jaeeun Cho
8a32f61f2f Dropdown with dropdown_v2 branch 2016-08-17 16:03:22 -04: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
1da50feb5e - cleanup 2016-08-17 18:44:08 +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
Lajellu
8e7b1d6317 HTML5 - Changes config organization and all files dependant on config files 2016-08-17 08:48:03 -07:00
Richard Alam
dd774fabeb - add some comments. 2016-08-17 14:55:51 +00:00
Richard Alam
cc80f1c2ff - trigger starting of screen capture from the server side. 2016-08-16 21:01:41 +00:00
Richard Alam
080a3557c3 - stop jws when user that's sharing gets disconnected 2016-08-16 20:21:29 +00:00
Richard Alam
59d192ee62 - make sure there is only one screen sharing in a meeting. 2016-08-16 17:18:21 +00:00
Richard Alam
12a383cb9d - close jws app when sharing is cancelled (not started) 2016-08-15 21:50:38 +00:00
Richard Alam
9945cb7c5b - stop sharing from the screen share toolbar button. 2016-08-15 20:56:29 +00:00
Anton Georgiev
4f4f2a71ef Merge pull request #3290 from oswaldoacauan/fix-3277 
Change operation order when switching slides. Fix #3277
 2016-08-15 16:25:05 -04:00
Jaeeun Cho
7ac2a83575 Dropdown with dropdown_v2 branch 2016-08-15 15:44:20 -04:00
Oswaldo Acauan
5489090672 Merge branch 'master' into fix-3277 
* master:
  Archive more logs with zip option and show more applications with status using "bbb-conf"
  When is user is logged out from the breakout room conference the window is closed.
  RoomActionsRenderer listenBtn style is correctly updated when the leaves audio conference then joins it again.
  Don't appy recording marks twice to audio
  RnP: Use correct directory when loading captions.json
  Minor playback.js cleanups
  Various updates to the rnp edl handling
  Make shape rendering in presentation recordings closer to live BBB
  hide the randomAssign button (temporarily)
  server side changes for switching recordType:String to record:Boolean
  breakout rooms:change record to checkbox + boolean
  Ensure invalid CC messages aren't sent to the server after owner change
  bbb-web: Set defaultMaxUsers=0 in bigbluebutton.properties
  RnP: Generate blank video when the recording has captions
 2016-08-15 19:26:33 +00:00
Oswaldo Acauan
e5c29a9bec Change operations order to prevent currentSlide being undefined 2016-08-15 19:25:36 +00:00
Richard Alam
9c7759dc73 - display screen share stream 2016-08-15 18:25:56 +00:00
Richard Alam
c3a3bd89bf - generate new streamId from server side when restarting screen sharing. 2016-08-15 17:56:49 +00:00
Jaeeun Cho
a113774369 Dropdown with dropdown_v2 branch 2016-08-15 13:26:22 -04:00
Fred Dixon
938e6a0313 Merge pull request #3285 from riadvice/breakout-room-logout 
Close browser window in breakout rooms logout
 2016-08-15 11:01:32 -04:00
Fred Dixon
0a65d564c3 Merge pull request #3276 from capilkey/cc-message-check 
Ensure invalid CC messages aren't sent to the server after owner change
 2016-08-15 10:57:54 -04:00
Fred Dixon
27861597fa Merge pull request #3288 from riadvice/improve-bbb-conf 
Updated zip and status option for bbb-conf to handle 1.1-dev applications
 2016-08-15 10:57:04 -04:00
Ghazi Triki
f04798405a Archive more logs with zip option and show more applications with status using "bbb-conf" 2016-08-15 11:41:02 +01:00
Ghazi Triki
f0a6223dcc When is user is logged out from the breakout room conference the window is closed. 2016-08-13 20:02:50 +01:00
Fred Dixon
a4af989e45 Merge pull request #3284 from riadvice/fix-breakout-room-audio-transfer 
RoomActionsRenderer listenBtn style is correctly updated
 2016-08-13 11:32:10 -04:00
Ghazi Triki
0fc895b8f7 RoomActionsRenderer listenBtn style is correctly updated when the leaves audio conference then joins it again. 2016-08-13 16:28:54 +01:00
Fred Dixon
8f5173710d Merge pull request #3283 from kepstin/recording-cleanups 
Recording cleanups
 2016-08-12 16:19:39 -04:00
Calvin Walton
ab0dac1192 Don't appy recording marks twice to audio 2016-08-12 15:53:56 -04:00
Fred Dixon
f46e4d7ca6 Merge pull request #3282 from kepstin/recording-captions 
RnP: Use correct directory when loading captions.json
 2016-08-12 15:43:29 -04:00
Calvin Walton
fc4ae4c6b4 RnP: Use correct directory when loading captions.json 2016-08-12 15:41:41 -04:00
Calvin Walton
d06b3468ac Minor playback.js cleanups 
Use a function that handles parameters correctly when updating the
timestamp in the url for links, fix indentation in caption loading code.
Treat exceptions when checking for url existence as errors.
 2016-08-12 15:24:55 -04:00
Fred Dixon
d0638df437 Merge pull request #3275 from jfederico/bbb-web_fixMaxParticipants-by-tracking-joins-III 
bbb-web: Set defaultMaxUsers=0 in bigbluebutton.properties
 2016-08-12 14:34:24 -04:00
Fred Dixon
82d6f96535 Merge pull request #3281 from kepstin/recording-captions 
RnP: Generate blank video when the recording has captions
 2016-08-12 14:34:03 -04:00
Anton Georgiev
c074c189b0 Merge pull request #3280 from antobinary/breakout-rooms-changes 
Server side changes for switching recordType:String to record:Boolean
 2016-08-12 14:18:00 -04:00
Calvin Walton
e4735a12b3 Various updates to the rnp edl handling 
Main change is to rewrite the start/stop event handling to do fewer
passes and use simpler logic (it no longer has to track durations).

The temporary work audio codec is switched to flac; slightly lower hard
drive use and it avoids the 4-hour length limit of wav.

Some improvements to the video seeking when processing deskshare and
webcam videos, to avoid video dropouts.

Tweaks to the audio encoding quality settings.

Remove an unused function.
 2016-08-12 14:17:51 -04:00
Calvin Walton
bfb987dc01 Make shape rendering in presentation recordings closer to live BBB 2016-08-12 11:53:01 -04:00
Fred Dixon
e0e415b2eb Merge pull request #3279 from antobinary/master 
Breakout rooms: hide the randomly Assign button (temporarily)
 2016-08-11 17:42:33 -04:00
Anton Georgiev
b7c40ec99e hide the randomAssign button (temporarily) 2016-08-11 21:40:32 +00:00
Anton Georgiev
9fb1c343f2 server side changes for switching recordType:String to record:Boolean 2016-08-11 21:30:06 +00:00
Jaeeun Cho
8e47a5f937 dropdown _v2 2016-08-11 16:05:26 -04:00
Fred Dixon
aaf2164b8b Merge pull request #3278 from antobinary/master 
Breakout rooms:change record to checkbox + boolean
 2016-08-11 16:00:59 -04:00
Anton Georgiev
e839d2610b breakout rooms:change record to checkbox + boolean 2016-08-11 19:54:10 +00:00
Anton Georgiev
f7cb97737d ask akka-apps if allowed to start screenshare 2016-08-11 19:18:56 +00:00
Anton Georgiev
02fb1e15da Merge pull request #3274 from oswaldoacauan/connection-status 
Add notification bar and show notification for bad connection status
 2016-08-11 10:04:37 -04:00
Richard Alam
673baa1c84 - reinit restart button label in client. 2016-08-10 21:18:53 +00:00
Richard Alam
4f996890ec - reinit screen share 2016-08-10 21:18:28 +00:00