Commit Graph

24502 Commits

Author SHA1 Message Date
Richard Alam
b50c22f445 - propagate privateChatEnabled value from parent meeting to breakout room 2019-04-10 13:53:03 -07:00
bobakoftadeh
465c265d75 Implemented option for audioDial in audio modal 2019-04-10 20:51:06 +00:00
Anton Georgiev
d716f8360e provide safe value for user id and name in kurento bridge 2019-04-10 20:49:45 +00:00
Anton Georgiev
c3087b9c4d
Merge pull request #7074 from vitormateusalmeida/issue-7021
Fix End Meeting errors
2019-04-10 16:45:19 -04:00
Anton Georgiev
33a6a24a54
Merge pull request #7086 from jfsiebel/error-boundaries-implementation
Implement error boundary
2019-04-10 16:41:49 -04:00
Joao Siebel
b19f86c8bf fix Fallback warning 2019-04-10 17:29:50 -03:00
Maxim Khlobystov
cc8119ee58 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into user-information-lookup 2019-04-10 15:50:28 -04:00
Maxim Khlobystov
de3c2c12ca Code improvements 2019-04-10 15:40:40 -04:00
Vitor Mateus
cacb4a3f16 Code improvements 2019-04-10 15:20:31 -03:00
KDSBrowne
ce98eeee77 fix remaining outline issues 2019-04-10 14:59:25 +00:00
Pedro Beschorner Marin
9579b6086d Disabling breakout rooms on HTML5 client based on breakoutProps 2019-04-10 11:58:34 -03:00
Diego Benetti
6648b622be Improves the manipulation of the data to be outputed to file 2019-04-10 11:34:23 -03:00
Diego Benetti
7e35f03581 Feature download user names list for moderators 2019-04-10 10:59:19 -03:00
Pedro Beschorner Marin
141170e695 Refactoring lockSettingsProps 2019-04-10 10:44:34 -03:00
Pedro Beschorner Marin
3f2cb781d7 Adjusted lockSettingsProps for the HTML5 client 2019-04-10 13:04:27 +00:00
Fred Dixon
caa6b9a85e
Fix path for bbb_api_conf.jsp 2019-04-09 20:00:48 -04:00
Fred Dixon
06fa63c46f
Merge pull request #7211 from ffdixon/fix-bbb-web-23
Fix check for shared secret mismatch with bbb-demo
2019-04-09 19:55:01 -04:00
Fred Dixon
8bfecb0869 Fix check for shared secret mismatch with bbb-demo 2019-04-09 18:54:16 -05:00
Fred Dixon
b0545d9c4b
Merge pull request #7210 from ffdixon/beta4
Added check for default shared secret
2019-04-09 19:15:36 -04:00
Fred Dixon
1e29d04ea9 Added check for default shared secret 2019-04-09 18:14:52 -05:00
Richard Alam
f6c0d21fda - pass breakout and lock setting using create meeting message 2019-04-09 14:33:08 -07:00
Vitor Mateus
0ae555949d Fix client stuck on loading after ending the meeting and reload 2019-04-09 16:37:06 -03:00
Anton Georgiev
6be7227108
Merge pull request #7206 from diegobenetti/issue7195-audible-notifications
Fix audible notifications
2019-04-09 14:01:01 -04:00
Anton Georgiev
d9dfc9b999
Adjust path to audioSample.mp3
Closes #7207
2019-04-09 13:57:25 -04:00
Vitor Mateus
5cc41dd728 Fix console warning 2019-04-09 14:55:10 -03:00
Diego Benetti
86aa331ddb Fix audible notifications 2019-04-09 14:04:33 -03:00
Anton Georgiev
2a8860f120
Merge pull request #7135 from BobakOftadeh/update-webcam-label
Update webcam locked label
2019-04-08 18:38:18 -04:00
Anton Georgiev
1a6ca170eb
Merge pull request #7175 from Tainan404/fix-dropdown-console-error
Open breakout room in new tab automatically when request new join url
2019-04-08 18:35:32 -04:00
Anton Georgiev
75a85dbc06
Merge pull request #7173 from BobakOftadeh/record-button-state-update
Fix state for record-indicator
2019-04-08 18:18:10 -04:00
Fred Dixon
4bc3b13741
Merge pull request #7201 from ffdixon/bump-version
Bump to 2.2-beta4
2019-04-08 17:59:46 -04:00
Fred Dixon
37829b2d9a Bump to 2.2-beta4 2019-04-08 16:59:10 -05:00
Anton Georgiev
ee69e002d0
Merge pull request #7158 from Tainan404/add-remember-checkbox
Add remember checkbox for remember guest policy choice
2019-04-08 17:06:27 -04:00
Anton Georgiev
784dd76526
Typo in bbb-conf 2019-04-08 16:52:28 -04:00
Anton Georgiev
3775d1ebc2
Merge pull request #7199 from diegobenetti/issue7060-change-close-to-hide-presentation
Change close presentation to hide presentation
2019-04-08 15:52:02 -04:00
Diego Benetti
9fcc4b7228 Changes close presentation to hide presentation 2019-04-08 15:48:45 -03:00
Anton Georgiev
3364d879d3
Merge pull request #7168 from KDSBrowne/2.2-restrict-spacebar-shortcut
Restrict when spacebar shortcut is activated
2019-04-08 12:19:30 -04:00
KDSBrowne
38ba8f8895 add outlines for high contrast themes (windows) 2019-04-08 14:22:22 +00:00
Maxim Khlobystov
d7d69d1c98 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into user-information-lookup 2019-04-05 18:46:47 -04:00
Maxim Khlobystov
3fa22c6908 User information lookup feature in HTML5 client. 2019-04-05 18:32:21 -04:00
Anton Georgiev
1b2ee2e09e
Merge pull request #7103 from Tainan404/issue-7071
Fix modal closing when get conversion error
2019-04-05 15:16:55 -04:00
Vitor Mateus
49942f003c Merge remote-tracking branch 'upstream/master' into issue-7021 2019-04-05 15:44:39 -03:00
Vitor Mateus
1d41ce65c3 code cleanups 2019-04-05 15:33:09 -03:00
Vitor Mateus
32067f2f7a Fixes and improvements 2019-04-05 15:10:05 -03:00
Anton Georgiev
0dea2fe4bf
Merge pull request #7180 from bigbluebutton/improve-handler-base
Fix copy-paste error on handlers for base.jsx
2019-04-05 13:55:23 -04:00
Anton Georgiev
d927cde23a
Fix copy-paste error on handlers for base.jsx 2019-04-05 13:03:24 -04:00
Anton Georgiev
205471040c
Merge pull request #7177 from pedrobmarin/meteor-guest-fix
Sending an extra message for guest management in Meteor
2019-04-05 11:13:19 -04:00
Pedro Beschorner Marin
3ac5204141 Filtering only Flash moderators 2019-04-05 14:47:43 +00:00
Anton Georgiev
901bf566d6
Merge pull request #7070 from diegobenetti/issue7049-lock-notifications
Issue 7049 - Notification for locks
2019-04-05 10:20:58 -04:00
Anton Georgiev
c37d022f6f
Merge branch 'master' into issue7049-lock-notifications 2019-04-05 10:20:22 -04:00
Pedro Beschorner Marin
3d1c6a22d8 Removed extra empty line 2019-04-05 14:12:06 +00:00