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

19553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
João Francisco Siebel
6bb031076b Resolve merge problems 2018-02-19 14:00:43 -03:00
Fred Dixon
5190d7670e
Merge pull request #5126 from prlanzarin/api-v2.0 
Updated bbb-web apiVersion to 2.0
 2018-02-16 08:09:46 -07:00
Anton Georgiev
1a8d2eee52
Merge pull request #5146 from Tainan404/fix-webcam-disconnect-bug 
Fix when the user disconnects stay a ghost webcam.
 2018-02-14 11:35:17 -05:00
Anton Georgiev
ce1b12a2e6
Merge pull request #5147 from antobinary/double-webcams 
Increase ideal webcam resolution for kurento webrtc webcams
 2018-02-14 11:34:17 -05:00
Anton Georgiev
bd62ffdac9
Merge pull request #5129 from lfzawacki/settings-lock-video-dock 
Stop sharing webcam and receiving video streams when video-dock component is unmounted in HTML5
 2018-02-14 11:34:01 -05:00
Anton Georgiev
cf1ab0283e increase ideal webcam resolution 2018-02-14 11:23:49 -05:00
Lucas Fialho Zawacki
9967e0f66e Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into settings-lock-video-dock 2018-02-14 16:22:35 +00:00
Lucas Fialho Zawacki
fcca273f8f Merge branch 'settings-lock-video-dock' of https://github.com/Tainan404/bigbluebutton into settings-lock-video-dock 2018-02-14 15:55:10 +00:00
Tainan Felipe Pauli de Almeida
ec14d1ac3c fix when the user disconnects gets a ghost webcam 2018-02-14 10:51:24 -02:00
Tainan Felipe Pauli de Almeida
473fdea28b revert changes in en.json 2018-02-14 09:39:15 -02:00
Richard Alam
13a5095719
Merge pull request #5139 from kepstin/recording-cleanup-2 
Rework audio processing to avoid seeking past end of file
 2018-02-13 15:44:09 -05:00
Anton Georgiev
a8189b3a36
Merge pull request #5141 from oswaldoacauan/videodock-new 
Improvements for PR#5117
 2018-02-13 15:02:04 -05:00
Oswaldo Acauan
afc5d597a7 Fix console error 2018-02-13 17:45:03 -02:00
Oswaldo Acauan
ac46f534d5 Fix mutating state with delete when destroying a video 2018-02-13 14:20:59 -02:00
Anton Georgiev
8505f2d8eb
Merge pull request #5140 from OZhurbenko/fix-issue-5137 
Added an extra check for the Pencil's DRAW_END message
 2018-02-13 10:38:42 -05:00
Oleksandr Zhurbenko
bfb41d74c7 Added an extra check to prevent an issue described in #5137 2018-02-12 14:59:05 -08:00
Calvin Walton
e30d5e3940 Rework audio processing to avoid seeking past end of file 
In some cases when there is a slight mismatch between audio file
duration and event timestamp difference, and we have a record
status or chapter break event in a certain location, it could
trigger a seek past the end of an audio file. Detect this
condition and just render silence instead.

Also adjust the thresholds for the audio length scaling - they
were being triggered on short recordings that should be correct.
 2018-02-12 16:33:37 -05:00
Richard Alam
e9bed264e9
Merge pull request #5134 from kepstin/recording-cleanup-2 
Workaround video sync issue due to red5 timestamp offset
 2018-02-12 13:20:34 -05:00
Calvin Walton
0701bf87a8 Workaround video sync issue due to red5 timestamp offset 
Red5 sometimes writes webcam video files with a large offset in the
video frame offsets, sometimes up to 30 or even 60 seconds. However,
the start event in the events.xml file corresponds to the time at
which red5 received the first keyframe (recorded frame) in the video.

The end result is that the video will sometimes appear to be
delayed (out of sync) in the processed recording.

The correction is simple: We're already reading video metadata,
including the timestamp of the first frame, so we just have to apply
a correction during video processing to undo the frame timestamp
offsets in the video file.
 2018-02-12 11:54:18 -05:00
Anton Georgiev
417acf4d9d
Merge pull request #5125 from prlanzarin/screenshare-fps-ext-prompt 
Limited screensharing FPS to 5-10, resolution to screen size and fixed chrome extension prompt
 2018-02-12 10:39:48 -05:00
Fred Dixon
c201cd99c2
Merge pull request #5133 from ffdixon/fix-bbb-conf-2 
Fix bbb conf 2
 2018-02-11 12:26:59 -06:00
Fred Dixon
098c7b8a20 Make moderator role default for HTML5 demo 2018-02-11 12:16:28 -06:00
Fred Dixon
6a237f86dd Fixed error restarting bbb-transcode-akka 2018-02-11 12:15:19 -06:00
Richard Alam
565bce12e7
Merge pull request #5122 from riadvice/config-xml-encoding 
Force reading config.xml in utf-8 format
 2018-02-09 16:40:13 -05:00
Anton Georgiev
32abdc8344
Merge pull request #5102 from MaximKhlobystov/handle-reconnected-voice-users 
[HTML5 Client] Adjustments in handling of reconnected voice users
 2018-02-09 14:50:32 -05:00
Lucas Fialho Zawacki
333bba0a77 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into settings-lock-video-dock 2018-02-09 19:33:55 +00:00
Anton Georgiev
4c8970abe6
Merge pull request #5108 from KDSBrowne/z.0.8-settings-userlist-bug 
Prevent error on settings change with userlist open
 2018-02-09 11:56:58 -05:00
Anton Georgiev
6db4a91846
Merge pull request #5116 from MaximKhlobystov/attendee-mute-from-userlist 
[HTML5 Client] Self mute/unmute from userlist for attendees.
 2018-02-09 10:09:37 -05:00
Anton Georgiev
5dd704dc95
Merge pull request #5115 from OZhurbenko/fix-meteor-exceptions 
Fixed exceptions thrown during meeting destruction and presenter assignment
 2018-02-09 10:09:09 -05:00
prlanzarin
750d537618 Updated bbb-web apiVersion to 2.0 2018-02-09 03:22:11 +00:00
prlanzarin
81afe84079 Limiting screensharing FPS to 5-10 and resolution to screen size 
Also fixes the extension prompt for chrome users in the HTML5 client
 2018-02-08 22:53:18 +00:00
Ghazi Triki
b848beb04a Force reading config.xml in utf-8 format. 2018-02-08 20:19:07 +01:00
Maxim Khlobystov
7968a55bf3 Simplified the toggleSelfVoice code. 2018-02-08 14:00:29 -05:00
Fred Dixon
8cda909783
Merge pull request #5118 from ffdixon/update-bbb-conf-8 
Updates to bbb-conf to support HTML5
 2018-02-08 12:28:07 -05:00
Fred Dixon
dea8addc9b Updates to bbb-conf to support HTML5 2018-02-08 11:26:31 -06:00
Augusto Bennemann
65bf18e6ca Fix typo 2018-02-08 16:49:02 +00:00
Oleksandr Zhurbenko
607e2decad Removed a comment 2018-02-08 08:42:32 -08:00
Augusto Bennemann
95c172a8f0 Videodock adjusts for screenshare 2018-02-08 16:32:12 +00:00
Maxim Khlobystov
483f543f17 Made sure non-moderators can user userlist for mute/unmute. 2018-02-08 11:06:41 -05:00
KDSBrowne
ff78e14835 switch indexOf() with includes() 2018-02-08 07:14:00 -08:00
Augusto Bennemann
d5cda55220 Improve video adjusting code 2018-02-08 12:52:29 -02:00
Lucas Fialho Zawacki
23b635b4ff Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into settings-lock-video-dock 2018-02-08 14:48:33 +00:00
Oleksandr Zhurbenko
894e2b94f2 Fixed exceptions thrown on PresenterAssignedEvtMsg event 2018-02-07 15:10:15 -08:00
Oleksandr Zhurbenko
dddc388a10 Fixed an exception thrown on meeting destruction 2018-02-07 14:57:34 -08:00
Anton Georgiev
22b1d5662a
Merge pull request #5114 from bigbluebutton/revert-5110-update-bbb-conf-7 
Revert "Give mongod a moment to startup before bbb-html5"
 2018-02-07 16:59:49 -05:00
Anton Georgiev
710cca2d8e
Revert "Give mongod a moment to startup before bbb-html5" 2018-02-07 16:57:48 -05:00
Chad Pilkey
c1fbb22c79
Merge pull request #5106 from antobinary/redirect-mobile-to-html5 
Redirect Android, iOS users to html5 except on Puffin browser
 2018-02-07 16:13:57 -05:00
Augusto Bennemann
323cdd3232 Fix camera button style and improve videodock code 2018-02-07 17:20:10 -02:00
Lucas Fialho Zawacki
30b26a0a0c Unshare webcam and dispose peers when video component is unmounted 2018-02-07 18:06:58 +00:00
Augusto Bennemann
b0b16498fb Fixes #5056 2018-02-07 14:57:09 -02:00