Commit Graph

5368 Commits

Author SHA1 Message Date
Anton Georgiev
d80d78589f
Merge pull request #6346 from KDSBrowne/html5-packages-upgrade
HTML5 packages upgrade
2018-12-13 14:43:47 -05:00
KDSBrowne
46d29fd553 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager 2018-12-13 19:14:52 +00:00
Anton Georgiev
12745605b4
Merge pull request #6393 from jfsiebel/presenter-default-pod
Set presenter in default pod
🤞
2018-12-13 12:52:46 -05:00
João Francisco Siebel
8ce7f85dde add meetingId to filter results and avoid a bug with multiple meetings 2018-12-13 15:45:46 -02:00
Anton Georgiev
fbb12b055e
Merge pull request #6276 from Tainan404/issue-6262
Add drag & drop grid for breakout rooms
2018-12-13 11:35:24 -05:00
Bobak Oftadeh
5dfbafb30f Implemented recording modal 2018-12-12 11:09:33 -08:00
KDSBrowne
775176d9cf Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager 2018-12-12 17:35:22 +00:00
Anton Georgiev
88575ccee8
Merge pull request #6386 from KDSBrowne/remove-active-tooltip
Remove tooltip for active buttons
2018-12-12 09:38:42 -05:00
Anton Georgiev
5f46e9c1f5
Merge pull request #6374 from Tainan404/css-quick-fix
Change the css variable imports to app component
2018-12-12 09:36:56 -05:00
KDSBrowne
f479059668 remove tooltip for active buttons 2018-12-12 14:01:33 +00:00
Tainan Felipe
ad9a7ef50f Add end line 2018-12-12 11:56:45 -02:00
João Francisco Siebel
e4eae33c8a implement setPresenterInPodReqMsg method as attempt to close #6109 and close #5941 2018-12-12 10:28:08 -02:00
Anton Georgiev
2539d55048 addressing a race condition causing Auth timeout 2018-12-11 23:46:21 +00:00
KDSBrowne
a9023965b0 Merge remote-tracking branch 'Upstream/master' into html5-packages-upgrade 2018-12-11 16:59:39 +00:00
KDSBrowne
f16366c305 hide toolbar when presentation is swapped 2018-12-11 16:28:37 +00:00
Tainan Felipe
eee11552b3 Change the css variable imports to app component 2018-12-11 09:46:42 -02:00
Bobak Oftadeh
49e705407c Merge branch 'fix-modal-structure' of https://github.com/BobakOftadeh/bigbluebutton into record-indicator 2018-12-10 12:36:21 -08:00
Anton Georgiev
0c05b7befa
Fix typos
Close #6369
2018-12-10 15:05:42 -05:00
Anton Georgiev
f375d4ab14
Merge pull request #6359 from jfsiebel/unread-chat-notification
Fix unread chat notification.
2018-12-10 13:36:33 -05:00
Tainan Felipe
ac9dff0c3e
Merge branch 'master' into async-await-test 2018-12-10 15:23:16 -02:00
Tainan Felipe
bbc249483c Fix liter errors 2018-12-10 15:05:17 -02:00
Tainan Felipe
e59e04a23f testing async await to join 2018-12-10 13:52:25 -02:00
João Francisco Siebel
46d65489d9 fix unread chat notification. close #6258 2018-12-10 09:28:29 -02:00
KDSBrowne
8b30fe00b3 Merge remote-tracking branch 'Upstream/master' into html5-packages-upgrade 2018-12-10 02:12:42 +00:00
KDSBrowne
5adac9c88b adjust packages / fix bug 2018-12-10 01:08:16 +00:00
Anton Georgiev
d3da7259d7
Merge pull request #6340 from antobinary/logs-post
Handle logs that cannot be stringified/parsed
2018-12-07 17:21:01 -05:00
Anton Georgiev
69873070b6
Merge pull request #6322 from MaximKhlobystov/html5-tests-v3
Update for the automated tests
2018-12-07 16:46:38 -05:00
Anton Georgiev
20386334f6
Merge pull request #6295 from BobakOftadeh/micsLocked-check-fix
Fixed micsLocked check
2018-12-07 11:36:31 -05:00
Anton Georgiev
08d3d8294a
Merge pull request #6347 from MaximKhlobystov/user-join-subscription-client-logging
Better client logs on user join/subscription
2018-12-07 11:10:24 -05:00
Bobak Oftadeh
95ddb01666 Improved fix on VideoService.isLocked error 2018-12-06 22:41:09 +00:00
Anton Georgiev
55f116cc95 revert presenter assign 6270 6326 2018-12-06 19:07:51 +00:00
Maxim Khlobystov
f548b46672 Improve the client logs appearing on user join/subscription 2018-12-06 12:26:08 -05:00
Bobak Oftadeh
1c162a9658 Added option to use modal component without header border 2018-12-05 14:49:36 -08:00
Anton Georgiev
dbb2a63d56 handle logs that cannot be stringified/parsed 2018-12-05 21:38:19 +00:00
KDSBrowne
462f20d9bb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade 2018-12-05 20:54:37 +00:00
KDSBrowne
39c75fd449 fix remaining bugs / console errors 2018-12-05 19:31:33 +00:00
Anton Georgiev
f322165e4e
Merge pull request #6331 from jfsiebel/improve-user-list-performace
Improve user-list-content performance
2018-12-05 12:32:15 -05:00
Joao Siebel
5d33da64b0 remove unnecessary meeting fetch 2018-12-05 15:06:03 -02:00
João Francisco Siebel
e1f3f259d6 fix messages for zoom controls 2018-12-05 09:40:35 -02:00
João Francisco Siebel
6a84618982 increase zoom increment factor to 25. close #6301 2018-12-05 09:00:12 -02:00
João Francisco Siebel
43b44ecc6a Improve user-list-content performance. close #6268 2018-12-04 15:29:40 -02:00
Anton Georgiev
c69cb2d454
Update html5 client BBB version 2018-12-03 17:34:11 -05:00
Anton Georgiev
eb231e8829
Merge pull request #6329 from antobinary/logs-audio-devices
Add logs for audio input/output devices to debug iOS
2018-12-03 19:48:53 -02:00
Anton Georgiev
a236fd071b modify clientLog structure for easier parse-edit 2018-12-03 21:36:40 +00:00
Anton Georgiev
22a4c495a8 add logs for audio input/output devices to debug iOS 2018-12-03 21:24:18 +00:00
Maxim Khlobystov
af7e601c82 package.json file for tests 2018-12-03 16:01:34 -05:00
Maxim Khlobystov
34c2ab3b74 Remove the webdriverio-related code and dependencies, remove package.json from the puppeteer folder 2018-11-30 16:22:58 -05:00
Maxim Khlobystov
b0cfc662c1 Fix the selectors in presentation tests 2018-11-30 15:56:21 -05:00
João Francisco Siebel
ec91afdd58 simplify assignPresenter flow 2018-11-30 17:34:00 -02:00
Maxim Khlobystov
835b07384a Fix the selectors in whiteboard tests 2018-11-30 12:59:14 -05:00
Maxim Khlobystov
30adab4c34 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into html5-tests-v3 2018-11-30 12:32:51 -05:00
Maxim Khlobystov
aa5a0f6dc9 Fix the selectors in user list tests and chat tests 2018-11-30 12:32:19 -05:00
Bobak Oftadeh
cdc6033c45 fixed VideoService.isLocked error 2018-11-30 16:41:08 +00:00
Anton Georgiev
8a2bbd4c01
Merge pull request #6317 from antobinary/timeouts
Change icon for clearing annotations in whiteboard
2018-11-29 20:40:24 -02:00
Anton Georgiev
362184db4e display properly logs on html5 join 2018-11-29 22:37:51 +00:00
Anton Georgiev
9c99457938
Edit poll label
Closes #6303
2018-11-29 15:43:20 -05:00
Anton Georgiev
5f5a7f00f2 change icon for clearing annotations in whiteboard 2018-11-29 20:35:34 +00:00
Tainan Felipe
d1ae927f6f Add warn message and open the breakouts room when create 2018-11-29 17:47:04 -02:00
Bobak Oftadeh
e51a09de0f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into micsLocked-check-fix 2018-11-29 18:08:43 +00:00
Anton Georgiev
2e0660db7c
Merge pull request #6307 from Tainan404/issue-6289
Change the buttons on actions bar to ghost buttons
2018-11-29 15:06:52 -02:00
Tainan Felipe
fee219ed07 Fix console warning 2018-11-29 14:58:39 -02:00
prlanzarin
01795860c8 Workaround on webcam viewer race condition when state changes rapidly 2018-11-28 22:27:44 +00:00
Anton Georgiev
4c7dc696d4
Merge pull request #6308 from antobinary/iframe-outside-commands
Improve signal for audio join/leave when in iframe
2018-11-28 19:48:46 -02:00
Anton Georgiev
452a12287b improve signal for audio join/leave when in iframe 2018-11-28 21:42:24 +00:00
Maxim Khlobystov
59446aa4f6 Merge branch 'html5-tests-v2' of github.com:pedrobmarin/bigbluebutton into html5-tests-v2 2018-11-28 15:08:36 -05:00
Tainan Felipe
3561681e75 Change the buttons on actions bar to ghost buttons 2018-11-28 10:59:03 -02:00
Tainan Felipe
eb989ea6bb Add selected state 2018-11-27 16:00:15 -02:00
Anton Georgiev
bc9c553819
Merge pull request #6273 from KDSBrowne/2.2-manage-menu-alignment
Fix manage user menu alignment
2018-11-27 14:18:01 -02:00
KDSBrowne
06caa2460f
Remove calc() 2018-11-27 10:53:30 -05:00
KDSBrowne
55139a747e
Fix lint issue 2018-11-27 10:51:19 -05:00
Tainan Felipe
27e012ac56 Add drag and drop grid to sort user by room 2018-11-27 10:44:22 -02:00
KDSBrowne
320e7e5e97 remove px 2018-11-26 13:15:06 +00:00
Pedro Beschorner Marin
b83e16e4ad Open user list before chat and user tests 2018-11-23 17:18:05 -02:00
Maxim Khlobystov
19786fa527 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into html5-tests-v2 2018-11-23 13:17:36 -05:00
Bobak Oftadeh
ad5cf5bd62 Fixed micsLocked check 2018-11-23 17:48:23 +00:00
Maxim Khlobystov
cd6f5a19cf Add --runInBand option to the jest command 2018-11-23 12:38:32 -05:00
Tainan Felipe
63a268b12f Add intl to free join and change the state to true by dafault 2018-11-23 15:20:49 -02:00
Pedro Beschorner Marin
fd715f3aa8 Getting rid of puppeteer timeouts for now 2018-11-23 12:43:35 -02:00
Pedro Beschorner Marin
b854cdccec Structured the tests in modules 2018-11-23 10:55:16 -02:00
KDSBrowne
c6851484bb rename toggle handlers / remove reactive source from render 2018-11-23 12:37:18 +00:00
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
2a65b33bdc change file EOL sequence from CRLF to LF 2018-11-22 20:55:49 +00:00
KDSBrowne
bf56dff85d omit px 2018-11-22 20:52:07 +00:00
Anton Georgiev
56820bcab1
Merge pull request #6286 from KDSBrowne/2.2-fix-access-to-chat-scroll
Make chat scrollbar accessible with mouse
2018-11-22 18:41:54 -02:00
KDSBrowne
ff82c8831a make chate scrollbar accessible with mouse 2018-11-22 20:27:45 +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
Pedro Beschorner Marin
fc31a0d394 Refactored base page and started chat saving test 2018-11-22 17:20:06 -02:00
Pedro Beschorner Marin
7a18655230 Testing chat copy and evaluating chat tests result 2018-11-22 17:20:06 -02:00
Pedro Beschorner Marin
3f85f421b7 Increasing jest timeout and setting it to run as a single thread 2018-11-22 17:20:06 -02:00
Pedro Beschorner Marin
345a7d343d Refactored chat message test and included chat clear 2018-11-22 17:20:06 -02:00
Pedro Beschorner Marin
11b46959e1 Missing screenshot update 2018-11-22 17:20:06 -02:00
Pedro Beschorner Marin
f817e38d5d Refactored puppeteer commands to avoid timeout errors 2018-11-22 17:20:06 -02:00
Anton Georgiev
2058fe2047
Merge pull request #6287 from MaximKhlobystov/tests-dependencies
Moving tests-related dependencies to the main package.json
2018-11-22 17:17:41 -02:00
Maxim Khlobystov
4b5193fa65 Moving tests-related dependencies to the main package.json 2018-11-22 13:22:52 -05:00
KDSBrowne
49556ac13d make menu position match design image 2018-11-22 17:33:05 +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
Anton Georgiev
ec3aa585ce
Merge pull request #6270 from jfsiebel/html5-set-presenter-default-pod
Set HTML5 client as presenter in default pod
2018-11-22 14:24:41 -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
Tainan Felipe
f6f1e696e1 Fix linter 2018-11-21 14:46:29 -02:00
Tainan Felipe
de66a7bd12 Add button for set free join status on create breakout room modal 2018-11-21 14:46:29 -02:00
Bobak Oftadeh
8f0142aac1 Improved check on lockSettingsProp 2018-11-21 16:39:34 +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
KDSBrowne
948b88aee4 fix css indentations 2018-11-21 00:02:11 +00:00
KDSBrowne
b506634731 make manage menu fullscreen for small devices 2018-11-20 23:57:48 +00:00
KDSBrowne
b1a9228904 fix user manage menu alignment bug 2018-11-20 23:32:42 +00:00
João Francisco Siebel
877b9335b3 rename variable and add comments for better understanding 2018-11-20 18:14:17 -02:00
Tainan Felipe
c660e656f7 Fix logout handler isn't working on error screen 2018-11-20 18:13:34 -02:00
João Francisco Siebel
d8a2cb3883 set html5 client as pod presenter. close #6109 and close #5941 2018-11-20 17:44:05 -02:00
KDSBrowne
86af1e0e9d fix key warning for non resizable panels 2018-11-20 19:18:30 +00:00
Bobak Oftadeh
7edb133825 removed allowModeratorToUnmuteAudio property from settings.yml 2018-11-20 18:29:49 +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
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
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
Maxim Khlobystov
6a546fca33 Using the constraints from the configuration file in webcam preview. 2018-11-14 16:12:02 -05: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
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
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
fea8c267cc improve on listeners for state outside iframe 2018-11-13 17:14:30 +00:00
Anton Georgiev
e3729a7bf3 better updates 2018-11-12 22:09:04 +00:00
Bobak Oftadeh
91592a5d80 cleaned up code for moderator menu 2018-11-12 09:40:18 -08:00
bobakoftadeh
c33723ac14 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C 2018-11-12 09:15:55 -08:00
Anton Georgiev
98ac77dc03 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands 2018-11-12 17:01:06 +00:00
KDSBrowne
f9ec2c3759 fix null event error in firefox 2018-11-12 16:45:37 +00:00
bobakoftadeh
04421e631b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-mange-b 2018-11-12 08:40:47 -08:00
Anton Georgiev
ce26a3ed5e
Merge branch 'master' into remove-client-side-acl 2018-11-12 11:29:43 -05:00
Tainan Felipe
460cbdbcde Re-add settings 2018-11-12 09:46:20 -02:00
bobakoftadeh
87f63baa5a Improved interface for lock settings modal 2018-11-09 16:25:15 -08:00
João Francisco Siebel
076864ffd0 merge with master 2018-11-09 13:54:33 -02:00
Tainan Felipe
164835d49b
Merge branch 'master' into breakout-room-html5 2018-11-09 13:49:15 -02:00
Anton Georgiev
adbe9bb546 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands 2018-11-08 19:34:57 +00:00
KDSBrowne
718942668e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-recording-label 2018-11-08 19:15:17 +00:00
KDSBrowne
32dd7ce944 use calc() instead of new variables 2018-11-08 19:13:14 +00:00
Anton Georgiev
423d3a5819
Merge pull request #6225 from Tainan404/add-meteor-disconnect
Add meteor disconnect
2018-11-08 14:03:04 -05:00
bobakoftadeh
020ac800af Implemented functionality of lock settings 2018-11-08 10:55:12 -08:00
Anton Georgiev
9555cd68b8
Merge pull request #6105 from KDSBrowne/start-poll-01
Add start, stop and publish a poll for Presenter
2018-11-08 13:52:36 -05:00
Maxim Khlobystov
9b27c89bc8 Adjustments to the autoShareWebcam 2018-11-07 16:45:52 -05:00
Maxim Khlobystov
a2c490f4f6 Stopping the tracks to avoid fetching two cameras at the same time + Making the constraints less restricted 2018-11-07 16:16:36 -05:00
Maxim Khlobystov
91dad9d882 Fixing some linter error 2018-11-07 14:30:36 -05:00
KDSBrowne
565b55e8e7 remove unused styles 2018-11-07 13:00:21 +00:00
KDSBrowne
10d5d0706e remove visible recording label / add missing formatted string / fix recording icon 2018-11-07 02:20:19 +00:00
Maxim Khlobystov
9f67ce4106 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice 2018-11-06 18:17:52 -05:00
Maxim Khlobystov
90f38561c3 Add Webcam Settings to choose a camera 2018-11-06 18:10:56 -05:00
bobakoftadeh
856459e989 Merge branch 'user-manage-b' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-C 2018-11-06 13:47:38 -08:00
Bobak Oftadeh
edc941da9e Implementation of lock-view modal menu 2018-11-06 13:39:07 -08:00
Oswaldo Acauan
44c7e5c10a Fix husky pre-commit 2018-11-06 16:49:27 -02:00
Tainan Felipe
060435d54e Rename from Breakout-room to breakout-room 2018-11-06 13:42:30 -02:00
Oswaldo Acauan
2ac4490366 Fix tippy wait option to the new version 2018-11-06 13:41:11 -02:00
Oswaldo Acauan
a8c1df7f22 Upgrade all npm and meteor packages and fix compatibility issues introduced 2018-11-06 12:59:53 -02:00
João Francisco Siebel
016efcc0eb Remove ACL from client side. close #6138 2018-11-05 17:30:37 -02:00
KDSBrowne
c552b3522c prevent breakout and poll pane both open 2018-11-05 17:52:06 +00:00
Tainan Felipe
958e7b06ba Remove the intl id 2018-11-05 14:02:04 -02:00
Tainan Felipe
50d8995600 Add the meteor disconnect on meeting ended and error screen 2018-11-05 13:51:39 -02:00
Tainan Felipe
1768c49169 Add the meteor disconnect on meeting ended and error screen 2018-11-05 13:48:57 -02:00
Tainan Felipe
fd8a63fbbb Change the method permissions for moderator 2018-11-05 10:27:56 -02:00
KDSBrowne
8378606889 move presenter and poll check to UserPolls 2018-11-02 21:43:49 +00:00
KDSBrowne
538e248058 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-11-02 21:25:40 +00:00
Ghazi Triki
ff80b30df1 Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master
# Conflicts:
#	bigbluebutton-html5/imports/ui/services/audio-manager/index.js
2018-11-02 21:02:02 +01:00