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

2916 Commits

Author SHA1 Message Date
KDSBrowne
6d2836dfd3 clean up poll container render() 2018-11-23 04:08:48 +00:00
KDSBrowne
5c43613a47 replace switch in panel manager reander() 2018-11-23 03:37:39 +00:00
KDSBrowne
d2a77e80af Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager 2018-11-22 20:08:55 +00:00
Tainan Felipe
a95281c274 Removes finally on meeting eneded component 2018-11-22 15:03:39 -02:00
Tainan Felipe
77417c63f7 Merge remote-tracking branch 'upstream/master' into Remove-finally 2018-11-22 15:02:23 -02:00
Tainan Felipe
dcfaae25cd Removes the finally to have MS edge compatibility 2018-11-22 14:54:40 -02:00
Anton Georgiev
fa117ea684
Merge pull request #6271 from Tainan404/fiz-logout-handler 
Fix logout URL handler isn't working on error screen
 2018-11-22 14:47:05 -02:00
KDSBrowne
e6398ea56f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager 2018-11-22 14:46:24 +00:00
Anton Georgiev
2e7a2aeda0
Merge pull request #6282 from BobakOftadeh/userlist-scroll-fix 
Fixed user list scroll
 2018-11-22 12:31:49 -02:00
Anton Georgiev
92683f741f
Merge pull request #6237 from BobakOftadeh/user-manage-C 
Moderator menu (lock viewers implementation)
 2018-11-22 12:09:39 -02:00
Bobak Oftadeh
98d8136367 Fixed user-list scroll 2018-11-22 13:48:06 +00:00
Anton Georgiev
addb3952e2
Merge pull request #6275 from prlanzarin/sfu-2.2-vb 
Added voiceBridge prop to video-provider and forward it to SFU
 2018-11-21 14:07:22 -02:00
Anton Georgiev
a216703cec avoid race condition when detecting user join from outside iframe 2018-11-21 13:46:13 +00:00
Bobak Oftadeh
ce2eb21b57 changed micLocked check 2018-11-21 12:59:30 +00:00
Bobak Oftadeh
70b533ba2e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C 2018-11-21 12:25:53 +00:00
Tainan Felipe
c660e656f7 Fix logout handler isn't working on error screen 2018-11-20 18:13:34 -02:00
KDSBrowne
86af1e0e9d fix key warning for non resizable panels 2018-11-20 19:18:30 +00:00
KDSBrowne
38812065a5 make userlist open on join except on mobile phones 2018-11-20 16:37:15 +00:00
KDSBrowne
79c168d2a4 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager 2018-11-20 16:30:39 +00:00
Bobak Oftadeh
e6e40d8c84 removed ALLOW_MODERATOR_TO_UNMUTE_AUDIO check 2018-11-20 16:15:02 +00:00
KDSBrowne
149b4f091a move render functions from app to panel-manager 2018-11-20 15:28:00 +00:00
Bobak Oftadeh
282fd4055d removed option to unmute other users 2018-11-20 13:12:43 +00:00
prlanzarin
d652eb7f9b Added voiceBridge prop to video-provider and forward it to SFU 2018-11-20 13:05:16 +00:00
Bobak Oftadeh
4d0e694724 improved meeting query 2018-11-20 12:46:21 +00:00
KDSBrowne
99e15b20ba add panel manager component 2018-11-19 23:29:48 +00:00
Bobak Oftadeh
51ff9230fa changed meeting query 2018-11-19 20:55:09 +00:00
Bobak Oftadeh
caabc100ac fixed spacing in lock-modal styles 2018-11-19 20:07:39 +00:00
Bobak Oftadeh
15a252ecbf Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C 2018-11-19 19:00:58 +00:00
Bobak Oftadeh
89be9ef23f Improved micsLocked implementation 2018-11-19 18:59:47 +00:00
Anton Georgiev
6135b52b08
Remove trailing spaces 2018-11-19 13:53:25 -03:00
Tainan Felipe
ae812d2358 Remove unsedvars and fix linter error 2018-11-19 14:14:26 -02:00
Tainan Felipe
da54c41510 Rename misspell function names 2018-11-19 13:40:42 -02:00
Tainan Felipe
b9cd478533 Merge remote-tracking branch 'upstream/master' into issue-6194 2018-11-19 12:05:17 -02:00
Bobak Oftadeh
4649fe7c76 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C 2018-11-16 13:32:29 -08:00
Anton Georgiev
557f22a7fb
Merge pull request #6161 from BobakOftadeh/user-manage-b 
User manage button clear status, mute meeting implementation
 2018-11-16 16:21:05 -05:00
Bobak Oftadeh
95564a6acd cleaned up code for user-options 2018-11-16 13:08:53 -08:00
Bobak Oftadeh
15d4e84d55 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C 2018-11-16 12:06:57 -08:00
Bobak Oftadeh
34d525e4c6 Moved api functions to the lock-viewers container 2018-11-16 12:04:21 -08:00
Anton Georgiev
fb0610076c
Merge pull request #6230 from MaximKhlobystov/webcam-choice 
Webcam Settings modal for choosing a webcam
 2018-11-16 14:33:54 -05:00
Maxim Khlobystov
ce5c20ba7c Unsharing a webcam when page reloads. 2018-11-16 14:03:20 -05:00
Maxim Khlobystov
f29131b7f3 Fix the issue with a weird state of the camera dropdown. 2018-11-16 13:56:39 -05:00
Maxim Khlobystov
f0cb8ffa42 Using client logger for errors caught when switching between cameras in webcam settings modal. 2018-11-16 12:59:15 -05:00
Maxim Khlobystov
1013e967a4 Prevent the webcam settings modal from resizing when switching between cameras. 2018-11-16 12:49:46 -05:00
Tainan Felipe
b86d89f0fc Re-add logger messages 2018-11-16 13:58:49 -02:00
Bobak Oftadeh
5fb58cd604 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-11-15 12:55:57 -08:00
Bobak Oftadeh
31d59e21ec Viewers join listen only when microphones are locked 2018-11-15 12:53:03 -08:00
Maxim Khlobystov
694ba0b4c7 Throwing a toast notification when there is a getUserMedia error on switching between webcams in the preview. 2018-11-15 15:00:11 -05:00
Maxim Khlobystov
3a313ad529 Make sure the video preview and audio modals don't interfere with each other. 2018-11-15 14:38:04 -05:00
Maxim Khlobystov
e9a6d387e4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice 2018-11-14 17:20:43 -05:00
Maxim Khlobystov
e819ae2fd2 Make the webcam preview's border rounded 2018-11-14 16:17:44 -05:00