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

12966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
jfederico
aac104c77d bbb-web: Set defaultMaxUsers=0 in bigbluebutton.properties 2016-08-09 15:24:46 -04:00
Oswaldo Acauan
1dd5aa8ec5 Revert wrong config 2016-08-09 19:23:01 +00:00
Oswaldo Acauan
3a16921a49 Fix typo 2016-08-09 19:22:23 +00:00
Oswaldo Acauan
390d00015e Add notification bar and show notification for bad connection status 2016-08-09 16:28:49 +00:00
Richard Alam
f720aa083c Merge pull request #3271 from capilkey/logout-exception 
Fix logout exception
 2016-08-09 10:25:56 -04:00
Chad Pilkey
1e48b75cf7 fix logout exception by delaying function until after Alert closes 2016-08-08 15:49:17 -07:00
Anton Georgiev
250b196bb5 Merge pull request #3255 from Lajellu/presentationControls 
Presentation controls
 2016-08-08 13:18:25 -04:00
Fred Dixon
a233715cda Merge pull request #3270 from kepstin/bbb-11-cron 
Use correct directories and service names in daily cron
 2016-08-08 12:36:59 -03:00
Calvin Walton
db4a731480 Use correct directories and service names in daily cron 
Some of the stuff has gotten moved around in the 1.1 dev process.
 2016-08-08 11:16:51 -04:00
Lajellu
33061b3a01 HTML5 slide controls: chgs zoomForm to zoomWrapper and adds a min width to zoomWrapper 2016-08-05 13:40:34 -07:00
Lajellu
76679c9cb9 removes HTML5 whiteboard extra code, whiteboard css trailing space, and rename service in slide controls 2016-08-05 13:13:48 -07:00
Lajellu
94dc0f7c73 Merge remote-tracking branch 'upstream/master' into presentationControls 2016-08-05 13:09:18 -07:00
Lajellu
41019e81a9 HTML5 slide controls 'order' attribute moved to a higher line 2016-08-05 12:13:37 -07:00
Lajellu
12ec76d375 Fixes slide control PR comments 2016-08-05 11:39:24 -07:00
Richard Alam
6e9d6656c9 Merge pull request #3266 from riadvice/fix-breakout-room-audio-transfer 
Make listenBtn in RoomActionsRenderer aware of the two different audio states
 2016-08-05 14:17:49 -04:00
Richard Alam
dd79c2537f Merge pull request #3265 from ritzalam/cleanup-screenshare-logging 
Logging
 2016-08-05 13:55:01 -04:00
Ghazi Triki
ecc085b2ca Make listenBtn in RoomActionsRenderer aware of the two different audio states: the user in the audio conference and he is able to transfer & the user is transferred to a breakout room conference. 2016-08-05 18:54:24 +01:00
Richard Alam
4cb817ada5 Logging 
Add more logging to determine if user has successfully shared his desktop or not.
 2016-08-05 17:47:57 +00:00
Lajellu
db371c41a3 Merge remote-tracking branch 'upstream/master' into slideControls 2016-08-05 09:45:06 -07:00
Richard Alam
08eee29898 Merge pull request #3264 from ritzalam/fix-how-clients-get-notified-on-screenshare-started 
Cleanup
 2016-08-05 10:13:25 -04:00
Richard Alam
322328dac6 Remove commented out code. 2016-08-05 14:05:45 +00:00
Richard Alam
2148812e14 Merge pull request #3259 from capilkey/cc-combined-messages 
Make the CC updates smarter
 2016-08-05 10:01:23 -04:00
Richard Alam
871d9d64fa Merge pull request #3263 from ritzalam/transfer-user-to-breakout-room 
Joining voice conf of breakout room
 2016-08-05 10:00:56 -04:00
Richard Alam
8e9b16776c Joining voice conf of breakout room 
A moderator should be able to listen-in on the breakout room. During a previous merge, the
 handler of the transfer message in FSESL was accidentally removed. The user isn't able to
 the breakout room's voice conference anymore.
 2016-08-05 13:58:07 +00:00
Anton Georgiev
832bf2bba7 Merge pull request #3262 from Gcampes/patch-1 
Fixes login in html when flash is not supported
 2016-08-05 09:36:13 -04:00
Gabriel Carvalho de Campes
44c8ae4f59 Fixes login in html when flash is not supported 2016-08-05 10:34:07 -03:00
Chad Pilkey
8eed1b72d8 wait to process transcript updates until after the history has been loaded 2016-08-04 14:59:29 -07:00
Chad Pilkey
23790b4f98 remove empty function in CC OptionsTab 2016-08-04 14:58:52 -07:00
Richard Alam
f6c01806c7 Cleanup 
Remove unneeded code which is part of the old desktop sharing.
 2016-08-04 21:50:14 +00:00
Chad Pilkey
45ff003941 enforce a maximum paste length in CC window 2016-08-04 11:52:55 -07:00
Chad Pilkey
1c6efa1945 add cc window to other layouts so it doesn't show up when not wanted 2016-08-04 10:30:17 -07:00
Chad Pilkey
35e8ab77a9 add extra logic around cc updates for less frequent updates 2016-08-04 10:29:27 -07:00
Chad Pilkey
82766adb6a fixed issue with the shortcut window not initializing properly 2016-08-04 10:28:16 -07:00
Calvin Walton
c4d4e1a08a RnP: Generate blank video when the recording has captions 
Right now the captions are only rendered if there's a video present. If
the meeting doesn't have a video (webcam or desktop sharing), we'll need
to just make up a blank one.
 2016-08-04 13:23:15 -04:00