Commit Graph

26445 Commits

Author SHA1 Message Date
Richard Alam
2b859079da
Merge pull request #8376 from bigbluebutton/master
Branching off 2.2.x so we can start using 'master' for next release(s)
2019-11-28 16:43:48 -05:00
Anton Georgiev
b3a37d42f7
Merge pull request #8375 from ritzalam/fix-handling-of-redirect-for-callback-2.2-beta-17-based
- since the endcallbackurl is passed as meta parameter, we expect it…
2019-11-28 16:39:25 -05:00
Fred Dixon
d8bea1113e
Merge pull request #8373 from prlanzarin/2.2-sfu24x-upstream
[HTML5] Compatibility changes for SFU 2.4.x
2019-11-28 14:13:30 -05:00
Pedro Beschorner Marin
cb53b1b5b7 Getting user name from Auth object 2019-11-28 19:00:31 +00:00
prlanzarin
4e55145381 Change VideoService userName fetch to Auth and pass it again to video-provider 2019-11-28 18:49:20 +00:00
prlanzarin
19bf430760 Add userId and userName to the SFU start calls where they were missing 2019-11-28 18:46:23 +00:00
Fred Dixon
eeceb18b2a
Merge pull request #8372 from prlanzarin/2.2-cam-icq-reconn-upstream
Improvements to camera viewer reconnections and added an outbound ICE queue for cameras
2019-11-28 13:16:47 -05:00
prlanzarin
52d69156ca Fix viewer camera reconnection timers
Also try to reconnect when ICE fails, a server-side error comes through or the WebRTC stack throws a tantrum, not only when the first connection fails.
2019-11-28 18:03:14 +00:00
prlanzarin
d3fa2f6508 Add an outbound ice queue to video-provider peers
Only send candidates after the SDP exchange was locked due stop-start glare
2019-11-28 18:01:32 +00:00
Richard Alam
bea18c31ce
Merge pull request #8369 from antobinary/audio-log
Replaced "Audio Error" with a template literal of the error
2019-11-28 09:56:04 -05:00
Anton Georgiev
2d2c09e914 Replaced "Audio Error" with a template literal of the error 2019-11-27 13:47:40 +00:00
Anton Georgiev
c7c29e37e9
Merge pull request #8368 from felcaetano/enable-change-slides-with-page-up-down
Swapping PAGE_UP and PAGE_DOWN key bindings
2019-11-26 17:13:34 -05:00
felcaetano
e13cf362b2
Swapping PAGE_UP and PAGE_DOWN key bindings
Swapping the keys as requested by @kaitkrull  to fit most of the remotes.
2019-11-26 19:00:28 -03:00
Anton Georgiev
e6b8f0c038
Merge pull request #8359 from KDSBrowne/update-whos-talking
Update talking indicator styles
2019-11-26 12:52:59 -05:00
KDSBrowne
3cd81682f7 make talking indicator display users with the same name 2019-11-26 16:44:58 +00:00
KDSBrowne
7e1727f652 make talking indicator scrollable horizontally 2019-11-26 15:59:26 +00:00
KDSBrowne
b61fa7f9fc fix indicator clipping on safari 2019-11-25 19:24:12 +00:00
KDSBrowne
feba820568 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into update-whos-talking 2019-11-25 15:41:48 +00:00
Fred Dixon
3f77b645b3
Merge pull request #8360 from KDSBrowne/talking-indicator-padding
Increase padding of talking indicator elements
2019-11-23 18:44:46 +01:00
KDSBrowne
a3350b6f63 increase padding for talking indicator elements 2019-11-23 17:42:26 +00:00
KDSBrowne
17996bd742 use actual Buttons in indicator / imp spacing 2019-11-22 22:29:41 +00:00
KDSBrowne
2fb55a9325 sort talking users by start time 2019-11-22 22:29:28 +00:00
Anton Georgiev
4ccec9203f
Merge pull request #8358 from capilkey/audio-improvements
Hangup sip.js on timeout and stop audio join double click
2019-11-22 17:23:10 -05:00
Anton Georgiev
6cb79e4cf2
Merge pull request #8357 from capilkey/sipjs-autoplay
Handle sip.js autoplay failure
2019-11-22 17:22:11 -05:00
Fred Dixon
dd2ae19ca0
Merge pull request #8277 from SilentFlameCR/master
edited rap-caption-inbox.rb to get appropriate files in presentation
2019-11-22 23:11:18 +01:00
Fred Dixon
bb76dc9be9
Merge pull request #8349 from kepstin/screenshare-breakout
screenshare recording format: add breakout room info to metadata.xml
2019-11-22 23:04:46 +01:00
Fred Dixon
9fa0832bd3
Merge pull request #8350 from kepstin/bbb-record-skip-norecord
bbb-record: Skip ".norecord" meetings when running --rebuildall
2019-11-22 23:03:57 +01:00
Chad Pilkey
e2eabfb44f attempt to stop accidental audio join double clicks 2019-11-22 13:55:26 -08:00
Chad Pilkey
66a705a87d hangup the sip.js call when a timeout hits 2019-11-22 13:48:46 -08:00
Chad Pilkey
d114d381bd handle sip.js autoplay failure - temp UI 2019-11-22 21:38:52 +00:00
Anton Georgiev
655bf800df
Merge pull request #8353 from Tainan404/dont-skip-preview
Don't skip video preview if called via interface
2019-11-22 16:02:45 -05:00
Anton Georgiev
d9f8694070
Merge pull request #8356 from antobinary/loca
Pulled HTML5 locales Nov 22, 2019
2019-11-22 15:57:15 -05:00
Anton Georgiev
81bfbb75f3 Pulled HTML5 locales Nov 22, 2019 2019-11-22 15:54:03 -05:00
Tainan Felipe
6e7cdb1f6b Don't skip video preview if called via interface 2019-11-21 14:18:42 -03:00
Fred Dixon
a65df842ae
Merge pull request #7057 from kepstin/rec-vp9
Recording: Switch from vp8 to vp9, use better x264 options
2019-11-21 04:43:22 +01:00
Anton Georgiev
fc663a1547
Merge pull request #8319 from Tainan404/issue-8297
Add Skip video preview
2019-11-20 14:53:07 -05:00
Tainan Felipe
310f5efb4b
Update bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
Co-Authored-By: Anton Georgiev <antobinary@users.noreply.github.com>
2019-11-20 16:51:14 -03:00
Calvin Walton
13fe03b74f bbb-record: Skip ".norecord" meetings when running --rebuildall
Users don't expect not-recorded meetings to appear when rebuilding
all of their existing recordings.

You can still use bbb-record --rebuild on a single not-recorded
meeting to force it to process.

Fixes #6394
2019-11-20 14:31:55 -05:00
Calvin Walton
ccf5f57602 screenshare recording format: add breakout room info to metadata.xml
Fixes #8252
2019-11-20 13:59:48 -05:00
Tainan Felipe
3bc9933960 Remove preview timer 2019-11-20 15:35:16 -03:00
Tainan Felipe
f908972cec Remove changes on unecessary components 2019-11-20 14:24:54 -03:00
Tainan Felipe
6e9b2da562 Remove auto play component and reuse Video preview gUM 2019-11-20 14:17:42 -03:00
Anton Georgiev
98f4f731d0
Merge pull request #8235 from jfsiebel/update-annotations-streamer
Update annotations/cursor streamer logic
2019-11-19 11:56:49 -05:00
Anton Georgiev
1561c7dbea
Merge pull request #8330 from KDSBrowne/who-is-talking
Add mute functionality to talking indicator
2019-11-19 11:56:06 -05:00
Fred Dixon
1aa02d0272
Merge pull request #8337 from ffdixon/update-bbb-1804
Updates to detect 18.04
2019-11-17 20:01:46 +01:00
Fred Dixon
0ea6780028 Updates to detect 18.04 2019-11-17 13:01:10 -06:00
Fred Dixon
0bf6a40074
Merge pull request #8335 from ffdixon/updates-1804
Modify bbb-conf for 18.04
2019-11-17 00:37:37 +01:00
Fred Dixon
00221c6be7 Modify bbb-conf for 18.04 2019-11-16 17:35:21 -06:00
Fred Dixon
0b0e5b23dc
Merge pull request #8334 from ffdixon/updates-1804
bump to 2.2-rc2
2019-11-16 23:58:37 +01:00
Fred Dixon
f2b5a7e359 Merge remote-tracking branch 'upstream/master' 2019-11-16 10:57:46 -06:00