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

19932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghazi Triki
f430f363af Fix role change and page reload not taking in account webcam display when webcamsOnlyForModerator is on? 2018-04-25 20:56:57 +01:00
Anton Georgiev
45dc263fdf
Merge pull request #5382 from jfsiebel/audio-settings-retry 
Add friendly iteration on audio settings retry
 2018-04-25 14:01:21 -04:00
Anton Georgiev
f99897bf89
Merge pull request #5393 from antobinary/meta-params 
Add JSP for HTML5 Video Chat
 2018-04-25 13:39:32 -04:00
Anton Georgiev
e5d4f601b2
Merge pull request #5383 from oswaldoacauan/meta-params-video-conf 
Add meta params for auto share the webcam, auto swap the layout and disable presentation.
 2018-04-25 13:36:27 -04:00
Anton Georgiev
a2e5620ac4
Merge pull request #5374 from KDSBrowne/xx.02.fix.5370 
Prevent client breaking when settings are saved while userlist is-open
 2018-04-25 11:22:30 -04:00
Anton Georgiev
768a8733eb
Merge pull request #5386 from jfsiebel/fix-direct-message-problem 
Fix private chat messages
 2018-04-25 11:18:37 -04:00
João Francisco Siebel
9e2d517052 add user verification and narrow down search 2018-04-25 11:29:55 -03:00
Oswaldo Acauan
fb6aeb90f9 Fix autosharewebcam option not working on first join 2018-04-25 11:23:44 -03:00
Anton Georgiev
e930372a74 add client type as parameter in bbb api 2018-04-24 22:53:49 +00:00
Richard Alam
bfd7738831 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release 2018-04-24 15:06:33 -07:00
Richard Alam
e8208281ad Merge branch 'riadvice-change-user-role-bbb-web' into v2.0.x-release 2018-04-24 15:06:02 -07:00
Richard Alam
a3d1e18a77 - format 2018-04-24 15:04:52 -07:00
Richard Alam
87a8a03067 Merge branch 'change-user-role-bbb-web' of https://github.com/riadvice/bigbluebutton into riadvice-change-user-role-bbb-web 2018-04-24 14:47:53 -07:00
Fred Dixon
7f0d8db451
Merge pull request #5392 from kepstin/recording-webcam-fix 
Fix handling webcam videos that end early in recording processing
 2018-04-24 17:01:47 -04:00
Calvin Walton
8e0a79014f Fix handling webcam videos that end early in recording processing 
In some cases (due to network issues), the webcam video can be shorter
than the time between the start/stop events. Pad the input video with a
blank video to make sure that there's input to the video tiling filters,
to fix a problem where the video won't render correctly with ffmpeg v3.4
and later.
 2018-04-24 16:58:14 -04:00
Richard Alam
de446d379e
Merge pull request #5131 from riadvice/2.0-ui-fixes 
Show lock image if webcamsOnlyForModerator is enabled
 2018-04-24 16:57:37 -04:00
Fred Dixon
7cf9ae659f
Merge pull request #5388 from kepstin/webrtc-webcams 
Include WebRTC webcams in processed recordings
 2018-04-24 16:55:34 -04:00
Chad Pilkey
54e82f5acd
Merge pull request #5391 from riadvice/v2.0.x-screenshare-size 
Fix centering screenshare video
 2018-04-24 16:44:00 -04:00
Ghazi Triki
2700995876 Fix centering screenshare video. 2018-04-24 21:41:28 +01:00
Chad Pilkey
7570839211
Merge pull request #5389 from riadvice/v2.0.x-screenshare-size 
Delete centering videoHolder in all cases from ScreenshareViewWindow
 2018-04-24 16:08:36 -04:00
Ghazi Triki
310759b7b3 Delete centering videoHolder in all cases from ScreenshareViewWindow.mxml 2018-04-24 20:52:53 +01:00
Calvin Walton
ce84c5517b Include webrtc webcams in recording processing 2018-04-24 15:20:35 -04:00
Calvin Walton
c45fa74da0 Archive the webcam files from kurento webcam sharing 2018-04-24 15:18:02 -04:00
Chad Pilkey
80b0f084bb
Merge pull request #5384 from riadvice/v2.0.x-screenshare-size 
Fix full-size screen-sharing issue
 2018-04-24 15:08:45 -04:00
João Francisco Siebel
742303015d handle only HTML5 direct messages ignoring flash messages 2018-04-24 15:42:59 -03:00
Ghazi Triki
f26490a4e3 Fix full-size screen-sharing issue. 2018-04-24 18:39:17 +01:00
Anton Georgiev
82f272fb12 Merge branch 'meta-params-video-conf' of github.com:oswaldoacauan/bigbluebutton into meta-params 2018-04-24 17:12:13 +00:00
Anton Georgiev
2f35cb6f0c add jsp page for html5 login with meta -- init 2018-04-24 17:11:46 +00:00
Oswaldo Acauan
ad57657b18 Add metatag html5hidepresentation 2018-04-24 13:18:12 -03:00
Oswaldo Acauan
46559833e2 Add metatag html5autosharewebcam 2018-04-24 12:51:41 -03:00
Oswaldo Acauan
6beada63eb Add metatag html5autoswaplayout 2018-04-24 12:23:54 -03:00
João Francisco Siebel
3f797b9602 Add friendly interation on audio settings retry 2018-04-24 11:52:37 -03:00
Chad Pilkey
3e4a310418
Merge pull request #5372 from riadvice/2.0-screenshare-fix 
Remove remnant verto screensharing and use kurento instead
 2018-04-24 10:43:43 -04:00
KDSBrowne
7f7605a033 remove condition and push current path 2018-04-23 13:47:13 -07:00
Anton Georgiev
8cbbdb1e1d
Merge pull request #5371 from Tainan404/issue-5366 
set audio messages in a own function.
 2018-04-23 16:16:44 -04:00
Anton Georgiev
c4226e0c95
Merge pull request #5369 from Tainan404/issue-4901 
Change hand to pointer icon in Whiteboard toolbar.
 2018-04-23 14:35:40 -04:00
Tainan Felipe
1e8558c77a Remove hand key in en.jon 2018-04-23 15:34:20 -03:00
Anton Georgiev
b0ef575baf
Merge pull request #5365 from Tainan404/issue-4894 
Change status label to comply with client
 2018-04-23 14:30:37 -04:00
Anton Georgiev
62e84c1996
Merge pull request #5375 from KDSBrowne/xx.02.fix.5217 
Display open userlist on meeting join
 2018-04-23 14:15:27 -04:00
Anton Georgiev
7d95d06f59
Merge pull request #5342 from Tainan404/issue-5332 
Don't handle flash client direct messages in html5 client.
 2018-04-23 14:13:27 -04:00
Anton Georgiev
f8be0d2cd8
Merge pull request #5364 from jfsiebel/fix-media-tab-indication 
Fix problem on joining audio in Firefox
 2018-04-23 13:01:40 -04:00
Tainan Felipe
be0ce09af0 pass message for allowed functions 2018-04-23 09:30:14 -03:00
KDSBrowne
599ba78b72 add comment 2018-04-21 13:19:42 -07:00
KDSBrowne
a4cb68f387 redirect users on meeting join based on device 2018-04-21 13:09:22 -07:00
KDSBrowne
44c70a9199 prevent client breaking when settings are saved while userlist is open 2018-04-20 13:05:33 -07:00
KDSBrowne
c6bd3fabc8 improve code readability 2018-04-20 09:07:39 -07:00
Ghazi Triki
722decd85f Remove remnant verto screensharing and use kurento instead. 2018-04-19 22:45:22 +01:00
Tainan Felipe
60ae723dd4 add function setAudioMessages in audio manager service 2018-04-19 16:57:54 -03:00
Anton Georgiev
2505f04904
Merge pull request #5368 from prlanzarin/video-regpack 
Follow up on #5327 and #5333
 2018-04-19 11:28:21 -04:00
KDSBrowne
a570eeaf77 use matchMedia() to determin if we open the Userlist on meeting join 2018-04-18 19:37:06 -07:00