Commit Graph

23077 Commits

Author SHA1 Message Date
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
8b852d232c
Merge pull request #6249 from Tainan404/issue-6194
Transform joinRouterHandler and aunthenticatedRouteHandler in components
2018-11-19 15:14:54 -03: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
097d79f2bc Merge branch 'issue-6194' of https://github.com/Tainan404/bigbluebutton into issue-6194 2018-11-19 13:47:00 -02:00
Tainan Felipe
da54c41510 Rename misspell function names 2018-11-19 13:40:42 -02:00
Tainan Felipe
5a341535de
Merge branch 'master' into issue-6194 2018-11-19 12:09:16 -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
Chad Pilkey
216cebe619
Merge pull request #6254 from ritzalam/merge-v20-master-nov16
Merge v20 master nov16
2018-11-16 16:31:54 -05:00
Richard Alam
6dcb310a66 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-master-nov16 2018-11-16 13:29:36 -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
Chad Pilkey
9f2b53ab72
Merge pull request #6253 from ritzalam/fix-issue-where-recording-processing-start
- fix issue where we process recording even if meeting is not recorded
2018-11-16 16:19:10 -05:00
Richard Alam
67c4a3d7ec - fix issue where we process recording even if meeting is not recorded 2018-11-16 13:10:41 -08: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
Chad Pilkey
2607bb0e83
Merge pull request #6250 from ritzalam/end-meeting-asap-when-last-user-leaves
- end the meeting asap when the last user leaves by setting meetingE…
2018-11-16 14:50:55 -05: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
Richard Alam
ff3f8239c8 - end the meeting asap when the last user leaves by setting meetingExpireWhenLastUserLeftInMinutes=0 in
bbb-web's bigbluebutton.properties
2018-11-16 10:36:10 -08: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
bafa4c15cc Added log message when meeting is muted 2018-11-15 14:07:47 -08: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
Chad Pilkey
d3f0176745
Merge pull request #6248 from ritzalam/merge-v20-master-nov14
Merge v20 to master nov14
2018-11-15 15:50:21 -05: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
Fred Dixon
4db70857c3
Update bigbluebutton-release 2018-11-14 22:19:48 -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
Maxim Khlobystov
6a546fca33 Using the constraints from the configuration file in webcam preview. 2018-11-14 16:12:02 -05:00
Ghazi Triki
8e10280614 Fix configuration for akka and bbb-web projects. 2018-11-14 20:18:12 +01:00
Tainan Felipe
5a3649791b Transform joinRouterHandler and aunthenticatedRouteHandler in components 2018-11-14 15:11:10 -02:00
Richard Alam
d1dad75898 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-master-nov14 2018-11-14 08:47:21 -08:00
Ghazi Triki
6b4bbd6301 Updated bbb-apps-common project to use sbt 1.2.6 and scala 2.12.7 2018-11-14 12:25:52 +01:00
Bobak Oftadeh
cd6aae26e4 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C 2018-11-13 14:20:50 -08:00
Bobak Oftadeh
6dd6fb714f Implemented listen-only on startup when viewer joins with mic locked settings 2018-11-13 14:18:26 -08:00
Chad Pilkey
1603564bfa
Merge pull request #6247 from ritzalam/fix-meeting-not-ending-issue
Fix issue: Meeting doesn't end when last user leaves
2018-11-13 16:16:33 -05:00
Richard Alam
ddc391b3d9 - fix issue where meeting doesn't end when lasr user leaves or when meetign is never joined.
- the client to server rtt message is always updating the meeting activity. This prevents the meeting
   from ending due to inactivity.
2018-11-13 13:01:16 -08:00
Anton Georgiev
2513409f3a
Merge pull request #6215 from antobinary/iframe-outside-commands
Handle iframe toggle recording and toggle self muting
2018-11-13 13:46:12 -05:00
Anton Georgiev
d15305e352 comment out MYDOMAIN config lines and add description 2018-11-13 18:07:44 +00:00
Anton Georgiev
23e3034b70 add missing functions for toggling 2018-11-13 17:23:31 +00:00
Anton Georgiev
a0fc60ca93 remove unused css 2018-11-13 17:16:47 +00:00
Anton Georgiev
fea8c267cc improve on listeners for state outside iframe 2018-11-13 17:14:30 +00:00