Commit Graph

20092 Commits

Author SHA1 Message Date
Lucas Fialho Zawacki
6fcdc61e69 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into stop-streams 2018-05-07 17:12:44 +00:00
Fred Dixon
ef52348fb5
Merge pull request #5477 from ritzalam/update-locales-may-7-2018
- update locales to latest
2018-05-07 11:43:31 -04:00
Richard Alam
1be8ba7f98 - update locales to latest 2018-05-07 08:36:50 -07:00
Fred Dixon
2ceaa40b7c
Merge pull request #5464 from antobinary/enable-kurento-recording
Enable kurento screenshare recording, disable red5 video-broadcast ss recording
2018-05-06 08:43:17 -04:00
Fred Dixon
723b30dbd9
Merge pull request #5466 from capilkey/audio-callout
Show a call out when a user doesn't join audio
2018-05-06 08:42:53 -04:00
Fred Dixon
d488c3777b
Merge pull request #5468 from ffdixon/fix-bbb-conf-11
Fix update of URL for thumbnails with bbb-conf --setip
2018-05-05 11:14:35 -04:00
Fred Dixon
4f12774c08 Fix update of URL for thumbnails with bbb-conf --setip 2018-05-05 10:13:38 -05:00
Chad Pilkey
cb8878d078 show callout when user doesn't join audio 2018-05-04 16:25:31 -07:00
Fred Dixon
00efd4770a
Merge pull request #5449 from pedrobmarin/multiple-playbacks
Grouping playbacks inside the same recording
2018-05-04 17:52:56 -04:00
Richard Alam
225c877c5a
Merge pull request #5465 from ritzalam/improve-client-logging
- missing logCode
2018-05-04 17:39:14 -04:00
Richard Alam
59da111033 - missing logCode 2018-05-04 14:37:28 -07:00
Anton Georgiev
195b688676 enable kurento screenshare recording, disable red5 video-broadcast ss recording 2018-05-04 21:22:22 +00:00
Richard Alam
c348d29f07
Merge pull request #5460 from ritzalam/improve-client-logging
Improve client logging
2018-05-04 17:02:50 -04:00
Richard Alam
d468402a6d Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into improve-client-logging 2018-05-04 14:02:21 -07:00
Lucas Fialho Zawacki
aed6ffc3cb Pausing streams server side when client is not vieweing them 2018-05-04 20:58:35 +00:00
Anton Georgiev
6802064b49
Merge pull request #5457 from prlanzarin/recording-stop-fix
Fixed recording stop in SFU
2018-05-04 14:32:35 -04:00
Richard Alam
49ce5f58f6 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into improve-client-logging 2018-05-04 10:28:38 -07:00
Richard Alam
d0fe175220 - organize client logs better 2018-05-04 08:48:32 -07:00
Chad Pilkey
28e0627bde fallback to simple pencil line drawing if commands are missing 2018-05-03 15:04:28 -07:00
prlanzarin
b52b059086 Fixed recording stop in SFU 2018-05-03 21:56:03 +00:00
Anton Georgiev
1ecc070226
Merge pull request #5450 from antobinary/temp-fix
Partially revert #5447
2018-05-03 11:23:14 -04:00
Anton Georgiev
f973fedf4d commenting out code that breaks client loading 2018-05-03 15:21:46 +00:00
Anton Georgiev
544c4ab474
Merge pull request #5447 from prlanzarin/sfu-ping-pong
Added websocket ping pong to SFU clients
2018-05-03 10:08:08 -04:00
Pedro Beschorner Marin
ce6ff8bf7c Grouping playbacks inside the same recording at getRecordings API response 2018-05-03 14:06:58 +00:00
prlanzarin
01f87d2718 Added websocket ping pong to SFU clients
Also updated SFUs package-lock
2018-05-03 13:57:03 +00:00
Lucas Fialho Zawacki
5b65cde0de Stop remote stream tracks for HTML5 video viewers when window is hidden 2018-05-02 20:09:22 +00:00
Richard Alam
7080871401 - use JSON stringify to convert Object to JSON 2018-05-01 15:07:20 -07:00
Anton Georgiev
a3e175ae95
Merge pull request #5430 from Tainan404/fix-whiteboard-toolbar
Hide thickness and color buttons in whiteboard toolbar
2018-05-01 15:55:42 -04:00
Richard Alam
8c123fcd8e
Merge pull request #5440 from ritzalam/improve-client-logging
Improve client logging
2018-05-01 13:39:15 -04:00
Richard Alam
e1e0f8b9b4 - change client log format 2018-05-01 10:34:27 -07:00
Richard Alam
107a359e86 - do not log filename as we don't need it 2018-05-01 10:31:45 -07:00
Richard Alam
07b0ede4b3 - modify connection and flash call logging 2018-05-01 08:05:48 -07:00
Fred Dixon
6767885e6c
Merge pull request #5437 from capilkey/screenshare-type-chooser
Update WebRTCDesktopViewWindow and add connecting dots for view and publish windows
2018-05-01 09:38:33 -04:00
Chad Pilkey
c8e12a0839 update WebRTCDesktopViewWindow to match Java view and add connecting dots to view and publish windows 2018-04-30 16:45:02 -07:00
Richard Alam
d29137698b - change format of client logs to easily parse 2018-04-30 14:34:23 -07:00
Fred Dixon
6ae175ebed
Merge pull request #5434 from ffdixon/update-thumbnail-links
Fix for #5211
2018-04-29 21:02:04 -04:00
Fred Dixon
49484bcb21 Fix for #5211 2018-04-29 21:01:01 -04:00
Fred Dixon
76296b95df
Merge pull request #5429 from kepstin/screenshare-video-rec
New "screenshare" recording format
2018-04-27 16:41:51 -04:00
Tainan Felipe
ac1e6d4423 hide thickness and color buttons in whiteboard toolbar when is pointer tool 2018-04-27 16:44:33 -03:00
Calvin Walton
eb04276897 Minor fixups from testing 2018-04-27 15:25:36 -04:00
Fred Dixon
b6f53246d7
Merge pull request #5427 from bigbluebutton/dropdown-trigger-webcam-padding
Fix webcam dropdown padding
2018-04-27 12:04:57 -04:00
Fred Dixon
aca972700d
Merge pull request #5423 from Tainan404/fix-userlist-alignment
Fix aligment between last chat item and user list title
2018-04-27 12:04:35 -04:00
Fred Dixon
19afbe147b
Merge pull request #5425 from prlanzarin/fix-ss
Improved chrome screensharing constraints
2018-04-27 12:04:12 -04:00
Oswaldo Acauan
72498ca227
Fix webcam dropdown padding 2018-04-27 11:50:05 -04:00
prlanzarin
9fe4fecf2c Improved chrome screensharing constraints and fixed SFU exception 2018-04-27 14:37:18 +00:00
Tainan Felipe
e93a05ef30 add margin top in userlist participants 2018-04-27 08:47:40 -03:00
Anton Georgiev
35fae897fb
Merge pull request #5421 from antobinary/default-chrome-extension
add-on to pr #5420 - default chrome extension
2018-04-26 19:22:40 -04:00
Fred Dixon
46e9fecdad
Merge pull request #5420 from antobinary/default-chrome-extension
Set default KEY and LINK for Chrome screenshare extension
2018-04-26 19:13:52 -04:00
Calvin Walton
ca198ee9ce
Merge pull request #5385 from lfzawacki/html5-video-recording
HTML5 recording of cameras and screenshare
2018-04-26 19:11:36 -04:00
Anton Georgiev
8e6e14f902 add custom vs default key and link 2018-04-26 22:55:45 +00:00