Commit Graph

1123 Commits

Author SHA1 Message Date
Joao Victor
efb40e00bb fix(layout): don't show navbar/action-bar before layout has been calculated 2022-07-29 16:02:31 -03:00
Max Franke
75eef650e6 feat(audio-captions): reallocate button from mobile
Remove CC button toggle in the action bar only in mobile.
Add a new CC button toggle in settings dropdown only to mobile.
2022-07-20 17:20:53 +00:00
Pedro Beschorner Marin
944edf2ccf feat(captions): web speech prototype
Hardcoded pt-BR prototype for closed captions generated by the browser's
WebSpeech API.
2022-07-20 17:20:48 +00:00
Ramon Souza
d08ff18add Merge remote-tracking branch 'upstream/v2.6.x-release' into merge25-26-jul14 2022-07-15 11:12:25 -03:00
Ramon Souza
db5ac1428a Merge tag 'v2.5.3' into merge25-26-jul14 2022-07-15 11:08:02 -03:00
Ramón Souza
267a6f5c9c
Merge pull request #15203 from ramonlsouza/improve-ghost-button-border
style: improve ghost buttons border in low density display
2022-07-15 12:06:59 +01:00
Tiago Jacobs
75c8dcd491 Merge 2.6 2022-06-29 17:38:21 -03:00
Joao Victor
24504178a6 fix: screen sharing data saving option 2022-06-23 10:05:11 -03:00
Ramon Souza
04f3b50d0d improve ghost buttons border 2022-06-16 16:59:01 -03:00
Ramon Souza
edeb70de0d Merge tag 'v2.5.1' into merge25-26-jun16 2022-06-16 13:58:54 -03:00
Ramón Souza
f6b190aaa8
Merge pull request #15078 from lfzawacki/develop-layout
fix(layout): Fix propagation bugs and allow moderators to set the pushLayout flag
2022-06-02 19:48:07 +01:00
Ramon Souza
e199ef2c35 primary circle button - revised styles 2022-05-27 16:33:12 -03:00
Lucas Zawacki
cd13446c5a fix(layout): Moderators could not change layout if pushLayout was true 2022-05-24 17:31:35 -03:00
Lucas Zawacki
7ef7b52a30 feat(layout): Both presenters and moderators can set pushLayout 2022-05-24 15:38:47 -03:00
Joao Victor
e070b586c4 [2.5] fix: popover menus in RTL mode 2022-05-13 10:42:19 -03:00
prlanzarin
83e26b7f63 fix(screenshare): race condition - local stream ends while broker stars
There could be a race condition where the local getDisplayMedia stream ends
(eg via Chrome`s stop sharing toast) while the broker hasn't finished starting.
That would lead to a scenario where the broker wouldn't emit an end event,
causing screen sharing to be flagged as started with a blank/invalid stream.
2022-05-09 18:00:30 +00:00
Lucas
2db9a1b343
Merge branch 'develop' into develop-bbb 2022-04-26 15:08:43 -03:00
Lucas Zawacki
00f1b33456 feat(layout): Only propagate custom layout 2022-04-25 19:57:11 +00:00
Lucas Zawacki
378d0f18a0 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into develop-bbb 2022-04-14 18:48:02 +00:00
Gustavo Trott
70ee42237c Remove past invitation mode 2022-04-14 14:38:14 -03:00
Lucas Zawacki
83847a21aa Merge branch 'v2.5.x-release-Layouts' of github.com:lfzawacki/bigbluebutton into develop-bbb 2022-04-13 21:08:32 +00:00
Gustavo Trott
ecbfee26db Missing parts 2022-04-12 13:56:54 -03:00
Gustavo Trott
77a8aba1f5 Merge remote-tracking branch 'upstream/develop' into breakout-updated 2022-04-12 09:54:25 -03:00
Gustavo Trott
102eee3ba5 Backend portion of breakout Manage Users 2022-04-12 09:50:19 -03:00
Joao Victor
5baea83a4d Pick users from state instead of props 2022-04-06 14:35:44 -03:00
Joao Victor
923e52a03a fix conflicts 2022-03-24 11:16:12 -03:00
Joao Victor
0ea405b67f feat: allow for moving users among breakouts + modal design updates 2022-03-24 10:56:07 -03:00
Max Franke
93013d5ad1 fix(layout): layout modal styled components
Add custom layout svgs
If a custom style is set via bbb_custom_style_url or settings.yml,
the svgs applied will be the ones inside the /images/layouts/customStyle/ folder
2022-03-15 14:22:36 -03:00
Gustavo Trott
adc1c8cef8 Implements disabledFeatures=breakoutRooms 2022-03-14 15:30:41 -03:00
Lucas Zawacki
d30fc746a4 fix(layout): Fix code after merges 2022-03-09 18:28:12 -03:00
Lucas Zawacki
31ddd9a8d8 fix(layout): Better config names for layout push/toggle 2022-03-09 18:10:09 -03:00
Max Franke
f406d2fae5 feat(layout): distinguish pushLayout/keepPushingLayout
Change "Layout" icon in actions-dropdown
Change push layout toggle label locale
2022-03-09 17:57:41 -03:00
Max Franke
b2900deda9 Revert "feat(layout): action bar button"
This reverts commit 736f63ae
2022-03-09 17:12:12 -03:00
Max Franke
0f27b1add4 feat(layout): new layout modal
Add a new modal that makes it easier to switch between layouts
Adds a new flag in html5 settings that allows to enable/disable
keepPushing layout
2022-03-09 17:00:06 -03:00
Gustavo Trott
2719bd4f65 Implements disabledFeatures=externalVideos 2022-03-09 10:33:18 -03:00
Gustavo Trott
3013c2792b Implements disabledFeatures/polls 2022-03-08 15:05:24 -03:00
Ramón Souza
6be6398df3 refactor isMobile check in settings-dropdown 2022-03-03 18:03:05 +00:00
Ramón Souza
6d268c4092 refactor isMobile check in actions-dropdown 2022-03-03 17:46:20 +00:00
Lucas Zawacki
140e08a730 Adapt code for merge 2022-03-02 11:24:54 -03:00
Lucas Zawacki
43afef9bad feature(layout): Remove 'swap layout' concept 2022-02-24 16:05:18 -03:00
Lucas Zawacki
830c44702f feature(layout): Only use one place to store presentationIsOpen 2022-02-24 15:30:53 -03:00
Lucas Zawacki
0f687bef3e feature(layout): Set all layout elements via button 2022-02-24 14:23:29 -03:00
Ramón Souza
138f4d64e4 Merge remote-tracking branch 'upstream/v2.4.x-release' into v2.5.x-release 2022-02-24 14:49:56 +00:00
Pedro Beschorner Marin
7ed3338d6d refactor(layout): remove moderator push button 2022-02-23 18:08:13 -03:00
Lucas Zawacki
fc7f1d4457 fix(layout): Fix propagate layout with new code 2022-02-23 12:04:49 -03:00
Arthurk12
7b5049f14c feat(layout): settings
Adds settings flag to activate/deactivate layout propagation button in actions
bar menu.
2022-02-22 18:18:56 -03:00
Arthurk12
27e0e36372 feat(layout): propagate button
Adds propagate layout button to the actions dropdown.
2022-02-22 18:17:33 -03:00
Ramón Souza
4589ecb116 adjust bbbmenu position 2022-02-22 20:37:00 +00:00
Ramón Souza
1d1375b3cf move modal component to common folder 2022-02-15 15:54:55 +00:00
Ramón Souza
fa7af8fe27 move menu component to common folder 2022-02-15 15:38:55 +00:00
Ramón Souza
246e3b3e8f move button component to common folder 2022-02-14 20:20:50 +00:00
Ramón Souza
7c37b0f830 increase create breakout room users list height 2022-02-11 14:15:50 +00:00
Anton Georgiev
006a9f9ffc
Merge pull request #14293 from gustavotrott/api-param-disabledFeatures
feat: new api Create param: disabledFeatures
2022-02-10 15:51:34 -05:00
Ramón Souza
dba04834c7 Merge remote-tracking branch 'upstream/v2.4.x-release' into 2524-feb08 2022-02-09 15:52:42 +00:00
Gustavo Trott
de4688bcdc Implement new param disabledFeatures 2022-02-07 10:22:52 -03:00
Anton
8aa473ca78 add select random user and fix data-test prop in list items 2022-02-04 15:08:59 -03:00
Anton Georgiev
5aa4700ff7
Merge pull request #14238 from frankemax/fix-css-focus-button-cropped
fix(button): add button margin
2022-01-31 10:03:28 -05:00
Max Franke
ac3ab187d2 fix(button): add button margin
Add a margin on buttons that are "in focus" to avoid being cut off by other
components
2022-01-31 11:58:49 -03:00
Ramón Souza
16cd3c4ebb Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125 2022-01-25 16:56:52 +00:00
Pedro Beschorner Marin
810deb907b refactor(etherpad): access control et al.
Move all Etherpad's access control from Meteor to a separated [Node application](https://github.com/bigbluebutton/bbb-pads).
This new app uses [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
to create groups and manage session tokens for users to access them. Each group
represents one distinct pad at the html5 client.

- Removed locked users' access to pads: replaced readOnly pad's access with a new pad's content sharing routine
- Pad's access is now controlled by [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
- Closed captions edited content now reflects at it's live feedback
- Improved closed caption's dictation mode live feedback
- Moved all Etherpad's API control from Meteor to a separated [app](https://github.com/bigbluebutton/bbb-pads)
- Included access control both in akka-apps and bbb-pads
2022-01-21 16:56:01 -03:00
Anton
7f075be033 fix all test selectors 2022-01-20 10:03:18 -03:00
Maxim Khlobystov
746fb46df4 New chat tests, improved selectors 2022-01-13 10:11:17 -05:00
Ramón Souza
f6e65f58c5 merge 2.4 into develop and resolve conflicts - partial 2022-01-12 16:40:45 +00:00
KDSBrowne
16c823739a fix screen reader not entering actions menu in FF (via shortcut) 2021-12-13 04:19:23 +00:00
Ramón Souza
d1c516fef6 resolve html5 conflicts 2021-12-10 21:07:35 +00:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
prlanzarin
fa64708e87 fix: tackle fallout from lifting a handful of dislocated changes 2021-12-02 18:57:25 +00:00
Gustavo Trott
0b6ab8ccc7
Merge branch 'develop' into breakouts-n-groups-assignments-2.5 2021-11-25 11:16:34 -03:00
Ramón Souza
53c0c990f1 other components isPresenter rework 2021-11-23 16:43:49 +00:00
Ramón Souza
19e2891023 actions bar isPresenter rework 2021-11-23 16:04:45 +00:00
KDSBrowne
e184912311 prevent properties of undefined (reading 'toUpperCase') 2021-11-22 00:55:51 +00:00
Gustavo Trott
305e26172e Migrates breakout-history to new local collections 2021-11-19 16:34:37 -03:00
Gustavo Trott
0458212531 Merge remote-tracking branch 'upstream/develop' into breakouts-n-groups-assignments-2.5 2021-11-19 16:16:00 -03:00
Anton Georgiev
542db847ff
Merge pull request #13574 from Tainan404/smooth-reconnection-25
Improve data structure to not break on reconnections
2021-11-17 15:55:21 -05:00
Ramón Souza
e5293d9109 only use colorBackground in backgrounds 2021-11-16 17:15:02 +00:00
Gustavo Trott
f5977d6214 Improves rules readability 2021-11-12 17:02:29 -03:00
Gustavo Trott
ad4ab7ed48 Undo wrong changes 2021-11-11 14:08:01 -03:00
Gustavo Trott
8555187df3 Resolve conflicts with Develop branch 2021-11-11 14:02:03 -03:00
Gustavo Trott
02750b35ef Let interface define group name when its null (in favor of intl) 2021-11-11 10:25:40 -03:00
Gustavo Trott
e919e24b38 Auto assign breakout names and users using lastBreakout or groups 2021-11-11 10:10:31 -03:00
Ramón Souza
ea38609fc2 remove .scss files 2021-11-11 12:38:09 +00:00
Ramón Souza
07e4576ee1 convert dropdown content component 2021-11-09 17:24:42 +00:00
hiroshisuga
4c8f4f9abb
remove unused style 2021-11-06 16:51:25 +09:00
Ramón Souza
7403080082 convert actions-bar actions-dropdown menu 2021-11-05 19:13:33 +00:00
Tainan Felipe
f5eef03f3f Improve data structure to not break on reconnections 2021-11-03 14:37:54 -03:00
Anton Georgiev
a7c98311fd Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24 2021-11-03 14:04:32 +00:00
Ramón Souza
943aa27eb6 fix typo in raise-hand button 2021-10-27 11:54:40 +00:00
Anton
ff338c0198 add Hide/Restore presentation test 2021-10-26 14:59:40 -03:00
Ramón Souza
242b59308f import variables from js files 2021-10-26 12:37:26 +00:00
Ramón Souza
12583b9b23 restores .btn css (still used in other components) 2021-10-25 20:15:36 +00:00
Ramón Souza
ff86eebb22 fix lock icon + drop user 2021-10-25 19:58:37 +00:00
Ramón Souza
032b677cfc convert screenshare component 2021-10-25 19:49:51 +00:00
Ramón Souza
ca6b936df7 convert quick-poll-dropdown component 2021-10-25 19:34:40 +00:00
Ramón Souza
40feb47329 convert presentation-options component 2021-10-25 19:30:41 +00:00
Ramón Souza
47432b469f convert create-breakout-room component 2021-10-25 19:21:27 +00:00
Ramón Souza
90adccf09a convert reader-menu component 2021-10-25 15:02:24 +00:00
Ramón Souza
1234a8d344 convert caption button component 2021-10-25 14:15:16 +00:00
Ramón Souza
db3cd5249d convert actions-dropdown component - partial 2021-10-25 14:00:56 +00:00
Ramón Souza
351fe186a3 convert actions-bar component 2021-10-25 13:29:29 +00:00
Anton Georgiev
1622425cbc Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.4-into-develop 2021-10-22 19:12:58 +00:00
Ramón Souza
9e71583ec7 restore old minimize presentation button and add a flag to switch 2021-10-14 19:31:47 +00:00
Anton Georgiev
719afa6cd2 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-14 15:14:22 +00:00
Anton Georgiev
24d672a832 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-14 15:13:17 +00:00
Tainan Felipe
1de8e0779d Add server side reactivity to publications 2021-10-13 15:00:52 -03:00
KDSBrowne
f1773b28eb fix event listener placed on wrong element 2021-10-10 19:35:25 +00:00
Lucas Fialho Zawacki
47a20ffa01 feature(external-video): New external video icon 2021-10-04 17:22:13 +00:00
Anton Georgiev
5202cd47ca
Merge pull request #13306 from lfzawacki/develop-minimize-all
feature: Allow external video and screenshare to be minimized just like the presentation area
2021-10-04 11:45:51 -04:00
Lucas Fialho Zawacki
5e7e52b455 fix(presentation-toolbar): Fixed translations and added aria labels 2021-10-01 21:13:06 +00:00
Lucas Fialho Zawacki
d530498b3b feature(icons): presentation_off, external-video, external-video_off icons 2021-10-01 20:15:01 +00:00
Lucas Fialho Zawacki
6155f51a1e Typo in minimize button locales 2021-09-27 21:03:20 +00:00
Lucas Fialho Zawacki
b3f5cb965c Use correct minimize icons for screenshare/presentation 2021-09-27 21:03:20 +00:00
Lucas Fialho Zawacki
d7f3924350 Enable swap layout for screenshare and external video 2021-09-27 21:03:20 +00:00
Lucas Zawacki
c4f4641516 Make buttton work even with no presentation and add translations 2021-09-27 21:03:05 +00:00
Lucas Zawacki
0425d8753c Minimize button for presentation, external video and screenshare 2021-09-27 20:16:20 +00:00
Ramon Souza
2b2792102b fix hidePresentation parameter 2021-09-27 17:13:41 -03:00
Anton Georgiev
aa2089887c Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.4 2021-09-25 14:59:22 +00:00
Anton Georgiev
ab845b3078 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-rc-1-into-dev 2021-09-22 15:28:13 +00:00
Anton Barboza
bfb40eff29 add data-test to start/stop screen share 2021-09-21 17:39:01 -03:00
Ramon Souza
9300b9b382 Merge remote-tracking branch 'upstream/develop' into use-context-selector 2021-09-13 15:41:52 -03:00
KDSBrowne
0904c2d833 fix DOM nesting error 2021-09-13 16:47:48 +00:00
KDSBrowne
f4f85efda3 add aria alert for at least one user error 2021-09-11 16:09:09 +00:00
KDSBrowne
c00e785e80 add error message to input description for SR 2021-09-11 16:02:35 +00:00
Ramon Souza
098826c70a rename layout functions 2021-09-10 17:48:52 -03:00
Ramon Souza
981e707612 add selector to containers, remove old layoutContext + convert base component into function 2021-09-10 14:21:04 -03:00
Ramon Souza
1854911080 add use-context-selector to containers - partial 2021-09-09 17:49:15 -03:00
Ramon Souza
50d765036a fix breakout modal unmount 2021-09-06 10:07:14 -03:00
Pedro Beschorner Marin
9b94f7e422
Merge pull request #13010 from ramonlsouza/issue-13003
fix: Keyboard Access To Assign Users To Breakout Room Broken
2021-08-18 08:18:58 -03:00
Ramon Souza
2327e92138 set tabIndex to -1 in the users list of breakout modal 2021-08-17 08:21:51 -03:00
KDSBrowne
f59c20d350 add aria description tag to randomly assign button 2021-08-17 03:07:20 +00:00
Ramon Souza
d08a4eba2a restore keyboard access in breakout room modal 2021-08-16 17:10:40 -03:00
Ramon Souza
adb70bde41 capitalize A-I polls 2021-08-16 14:25:16 -03:00
Anton
6017960afa re-add data-test in BBBMenu buttons 2021-08-13 22:34:38 -03:00
Ramon Souza
99c41ca79e remove unused code 2021-08-12 15:47:37 -03:00
Ramon Souza
4b2e60cdcc fix poll menu in actions bar 2021-08-12 15:42:02 -03:00
Anton Georgiev
773e8385af
Merge pull request #12970 from KDSBrowne/bbb-remaining-menus
Update Dropdowns To Menus
2021-08-12 14:38:04 -04:00
KDSBrowne
d9f9a94a7a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into bbb-remaining-menus 2021-08-11 02:44:51 +00:00
KDSBrowne
3663290397 update public chat / video list item dropdown to menu 2021-08-11 02:44:34 +00:00
KDSBrowne
6e1c000381 only show top divider with 2 or more presentations 2021-08-09 22:39:04 +00:00
Ramon Souza
f4df88bf8d fix screenshare with hidden presentation 2021-08-09 16:12:41 -03:00
Vitor Mateus De Almeida
145ca61d40 linting some files 2021-08-09 11:24:02 -03:00
KDSBrowne
773800cdc5 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into bbb-remaining-menus 2021-08-08 17:30:16 +00:00
KDSBrowne
f72e075472 restore shortcuts for menus 2021-08-08 17:22:01 +00:00
KDSBrowne
4e28cb0347 update actions / settings dropdown to menu 2021-08-08 17:13:47 +00:00
Vitor Mateus De Almeida
1b18977eac rename all NewLayout.. to Layout.. 2021-08-05 08:03:24 -03:00
Vitor Mateus De Almeida
abf089ae73 remove layout manager legacy 2021-08-05 01:22:07 -03:00
Ramon Souza
2ef6d30a01 fix actions bar size calculation - new layouts 2021-07-22 11:04:38 -03:00
Anton Georgiev
84324e0eff
Merge pull request #12781 from ramonlsouza/hide-presentation-new-lm
feat: Webcam area size change when presentation is hidden - new layouts
2021-07-19 16:25:38 -04:00
Ramon Souza
43eda61beb set presentation isOpen on toggleSwapLayout 2021-07-16 15:48:48 -03:00
Ramon Souza
c29bcad680 close breakout creation modal if user loses moderator status 2021-07-16 14:37:03 -03:00
Gustavo Trott
3052266e94 Removes duplicated code 2021-07-12 16:46:26 -03:00
Gustavo Trott
5c602fd2b0
Merge branch 'develop' into breakoutrooms-set-name 2021-07-12 16:31:38 -03:00
germanocaumo
2c262483d2 fix(poll): Respect maxCustom property in quick-polls
More than 5 answers are now of Custom type poll and answers passed directly.
Increase A-I slide options detection
2021-06-18 14:02:09 +00:00
germanocaumo
77dc1d603d fix: quick-polls error after merge 2021-06-17 13:02:04 +00:00
Anton Georgiev
5ee5ed1970 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-june16 2021-06-16 19:54:28 +00:00
Ramon Souza
dd4ca6937d create breakout form improvements 2021-06-15 13:17:03 -03:00
Anton Georgiev
078c2da44f
Merge pull request #12560 from ramonlsouza/issue-12557
fix: add minimum duration for breakout room
2021-06-14 17:34:50 -04:00
Gustavo Trott
37dea2215b Translates dynamically breakout room Names when default name is being used 2021-06-14 16:59:27 -03:00
germanocaumo
a4fc9c1a27 fix(poll): remove wrong argument in quick-polls 2021-06-14 17:44:12 +00:00
Gustavo Trott
61b99b7f7b Adds possibility to give to breakout rooms a name 2021-06-11 16:06:56 -03:00
Ramon Souza
385bdf1568 add minimum duration for breakout room 2021-06-11 13:24:36 -03:00
germanocaumo
df504cf2d5 refactor(quick-poll): Remove unneeded code for poll answers
The answers are already translated in the UI based on type.
2021-06-08 13:26:07 +00:00
germanocaumo
0be7c6c9f5 fix(poll): fix client crash with A-F as options and quick-poll type 2021-06-07 19:21:21 +00:00
Anton Georgiev
e01bdf69c5 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into june2-merge-into-develop 2021-06-02 18:45:31 +00:00
Tainan Felipe
baf7afc883 Decrease amount of imports in dropdown 2021-05-31 15:28:27 -03:00
germanocaumo
c213b88451 refactor(poll): improve poll types code
this also fixes certain poll type detection for other languages than english,
so that the correct poll type is sent in the events (they were being detected as custom)
2021-05-26 17:52:55 +00:00
Ramon Souza
69c1a7028d add padding to action bar dropdowns 2021-05-24 10:50:22 -03:00
Vitor Mateus De Almeida
41965d49ed Fix problem with slides with a quick poll 2021-05-20 12:12:08 -03:00
Vitor Mateus De Almeida
047b573d10 Fix auto resize when open/close panels 2021-05-19 19:29:03 -03:00
Vitor Mateus De Almeida
444b29a346 Merge remote-tracking branch 'upstream/develop' into layoutManagerNew 2021-05-19 11:54:22 -03:00
Vitor Mateus De Almeida
88a1edcc06 Fix userlist item button, Fix polling close button 2021-05-19 11:51:31 -03:00
Ramon Souza
098746d3c0 add setting to enable/disable raise hand action button 2021-05-18 13:39:09 -03:00
Vitor Mateus De Almeida
1326f3f791 Add New Layout Manager 2021-05-17 17:25:07 -03:00
Ramon Souza
ffb067a8a3 fix action buttons visibility 2021-05-12 11:07:18 -03:00
KDSBrowne
383d01becf improve keyboard accessibility for br managment 2021-05-03 20:00:19 +00:00
Anton Georgiev
457492d611
Merge pull request #12263 from ramonlsouza/issue-12242
Change open presentation button position
2021-05-03 15:23:09 -04:00
Ramon Souza
cc5a9502f4 change open presentation icon position 2021-05-03 16:04:54 -03:00
Ramon Souza
9d590a74d3 remove unused imports 2021-05-03 09:24:07 -03:00
Vitor Mateus De Almeida
340e0ba052 fix layout broken after opne close shared notes 2021-04-26 20:04:34 -03:00
Ramon Souza
509d9c0936 Merge remote-tracking branch 'upstream/develop' into issue-12042 2021-04-22 08:45:06 -03:00
Anton Georgiev
ad19234fc6
Merge pull request #12059 from vitormateusalmeida/issue-11610
Fix layout doesn't update when screen is shared
2021-04-20 08:44:27 -04:00
Ramon Souza
419e5af2a6 fix usedId value 2021-04-19 17:16:05 -03:00
Ramon Souza
40c9d87f63 reduce component re-render on containers that use usersContext 2021-04-19 14:57:55 -03:00
Anton Georgiev
93aa62c283
Merge pull request #12078 from KDSBrowne/bbb-br-manage-access
Make Breakout Rooms User Assignment Keyboard Accessible
2021-04-19 11:22:16 -04:00
KDSBrowne
35d07deb18 remove unused import / event listeners on unmount 2021-04-19 11:18:34 +00:00
KDSBrowne
f46f7961e3 make breakout room assignment accessible via keyboard 2021-04-19 00:46:07 +00:00
Vitor Mateus De Almeida
573066756d Merge remote-tracking branch 'upstream/v2.3.x-release' into issue-11610 2021-04-16 18:05:26 -03:00
Vitor Mateus De Almeida
3374e638bb fix layout doesn't update when screen is shared 2021-04-16 18:02:47 -03:00
Ramon Souza
56c33ed36d add meetingId to userscontext 2021-04-15 09:12:21 -03:00
Ramon Souza
e7366485aa removing unused imports 2021-04-13 08:43:08 -03:00
Anton Georgiev
74a2a6683f
Merge pull request #11915 from daminebenq/add-raise-hand-test-spec
Add missing Connection Status and Hand raising specs
2021-04-09 10:15:03 -04:00
Anton Georgiev
3f8d619ef1
Merge pull request #11927 from PhMemmel/order-presentations-alphabetically
Update order of presentation lists
2021-04-09 08:48:13 -04:00
Anton Georgiev
5189abb225
Merge pull request #11911 from Tainan404/issue-11795
Fix client crashing because users object is missing
2021-04-08 12:30:01 -04:00
Ramon Souza
5f693eb0f6 presenter menu scrollable 2021-04-08 10:53:57 -03:00
Philipp Memmel
c20b8164ef update order of presentation lists 2021-04-07 17:11:17 +02:00
Anton Georgiev
7949563d25
Merge pull request #11892 from ramonlsouza/localized-quick-poll
Localized quick poll answers
2021-04-07 08:41:59 -04:00
Mohamed Amine Ben Salah
9a151fb4c2 Add raise hand test spec to user.test.js suite 2021-04-06 21:09:43 -03:00
Tainan Felipe
e4563defde Fix client crashing because users object is missing 2021-04-06 16:58:11 -03:00
Anton Georgiev
b699790251
Merge pull request #11773 from PhMemmel/reflect-hand-raised-state-in-button-style
Hand raise button now reflects hand raised state
2021-04-06 13:45:17 -04:00
Ramon Souza
3d6314012f localized quick poll answers 2021-04-05 14:50:50 -03:00
Ramon Souza
05a0d5afbf move browser info to helper + remove unused libs 2021-04-01 08:14:24 -03:00
Ramon Souza
9218262e0a all device info moved to helper 2021-03-31 14:13:36 -03:00
Anton Georgiev
85a84f7cbf
Revert "Change browser detection library from browser-detect to bowser" 2021-03-30 13:16:10 -04:00
Anton Georgiev
027658ac5c
Merge pull request #11806 from ramonlsouza/mobile-detect
Change browser detection library from browser-detect to bowser
2021-03-30 12:28:13 -04:00
Ramon Souza
3fa193005b change browser detection lib to bowser 2021-03-30 09:53:47 -03:00
KDSBrowne
f26cee6d91 fix raise hand button overlapping others 2021-03-27 17:40:38 +00:00
Philipp Memmel
f05566d946 hand raise button now reflects hand raised state 2021-03-27 14:26:59 +01:00
Anton Georgiev
70ef985fde
Merge pull request #11703 from KDSBrowne/bbb-move-raiseHand
Move Raise Hand Functionality To Actions Bar Button
2021-03-22 14:24:32 -04:00
KDSBrowne
d89e6a8c3a move debounce to service 2021-03-22 18:02:31 +00:00
KDSBrowne
8e9718eb0b add debounce to raise hand toggle 2021-03-22 16:08:53 +00:00
KDSBrowne
6f5b9ceff5 adjust actions bar buttons position on mobile 2021-03-22 15:50:35 +00:00
Ramon Souza
34dc5ca79f increasing presentation menu width 2021-03-22 11:42:13 -03:00
KDSBrowne
4473fa084b add lower hand label 2021-03-21 23:56:00 +00:00
KDSBrowne
132dfb02d9 add raise hand shortcut and help entry 2021-03-21 23:47:15 +00:00
KDSBrowne
676abd1f85 move raise hand functionality to actions bar 2021-03-21 17:06:16 +00:00
Ramon Souza
3715266883 add selectRandomUser flag 2021-03-19 15:54:54 -03:00
prlanzarin
35f519206b Revert additional indentation to actions-bar component
I must have messed this up in the 2.2 - 2.3 merge or with vim somehow, mea culpa
2021-03-12 01:47:05 +00:00
prlanzarin
7eb91f9273 Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino 2021-03-11 18:49:14 +00:00
Ramon Souza
2923ea1641 fix 'restore presentation' button when presentation is disabled 2021-03-08 09:33:25 -03:00
Ramon Souza
47a21dfd98 quick poll fix 2021-03-04 13:34:23 -03:00
Mohamed Amine Ben Salah
2c9d8e4380 updates and adds specifications for polling 2021-03-01 18:47:08 -03:00
Ramon Souza
a3780209f3 Add property to settings.yml to enable/disable breakout invitations to moderators 2021-02-08 14:40:03 -03:00
Ramon Souza
f649f67655 current user identification on breakout room creation 2021-02-04 10:59:13 -03:00
Anton Georgiev
09e6ba8dfd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-Jan30 2021-01-29 20:58:05 +00:00
werk21
80af96ff76 9101: Survey: New profile yes/no/abstention 2021-01-24 02:22:40 +01:00
Anton Georgiev
45c1ff6e40
Merge pull request #11175 from MaximKhlobystov/select-random-user
Presenter selecting a random viewer
2021-01-22 15:31:00 -05:00
Ramon Souza
6f9d60c520 code style 2021-01-20 11:39:47 -03:00
Ramon Souza
fe12208d6c better fix for issue #11181 2021-01-20 11:28:37 -03:00
prlanzarin
0a36da1e46 screensharing: remake error locales, split them into error classes
There are new locale strings for screensharing errors with a new format (Code X. #What to do) to make it easier for the end user
2021-01-13 09:43:28 -03:00
prlanzarin
6f16154035 screenshare: logging/trailing lines cleanup 2021-01-13 09:04:46 -03:00
Anton Georgiev
4f14086f72 set default value for isPresenter in case user removed 2020-12-18 15:37:45 +00:00
prlanzarin
c247bf46e7 screenshare: cleanup actions-bar onFailure callback 2020-12-15 17:45:57 +00:00
prlanzarin
1383ab4def screenshare/html5: rewrite most of the client side code
Added new SFU broker for screen sharing

Removed kurento-extension entirely

Added inbound and outbound reconnection procedures

Improve UI responsiveness when sharing

Add reconnection UI states

Redo error handling

Refactor actions-bar screen share components. Make it smarter with less prop drilling and less re-rendering. Also more readable. Still work to do in that I think

Add a connection retry procedure for screen presenters when they are sharing; try a configurable amount of times when failure is triggered, with configurable min and max reconn timeouts and timeout increase factor

Make local preview attachment smarter

ADD PARTIAL SUPPORT FOR AUDIO SHARING VIA SCREEN SHARING WITH GET DISPLAY MEDIA, RECORDING STILL NOT SUPPORTED!!!
2020-12-09 22:00:54 +00:00
Anton Georgiev
3930e164e6
Merge branch 'develop' into debug-window 2020-12-08 16:16:24 -05:00
KDSBrowne
42cdc51710 add z-index to actionbar elements 2020-11-06 20:48:06 +00:00
KDSBrowne
2f46c1fd28 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-user-rand-select 2020-11-02 16:16:29 +00:00
Joao Siebel
be8421db3c Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-10-21 13:57:17 -03:00
Anton Georgiev
e18d94dd23 resolve media/component issues after 2.2.28 merge 2020-10-21 14:50:06 +00:00
Vitor Mateus De Almeida
69eb26f281 Merge remote-tracking branch 'upstream/develop' into debug-window 2020-09-22 09:37:42 -03:00
Joao Siebel
b2adffa4c2 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-09-18 16:30:20 -03:00
Anton Georgiev
377dc27a8d Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 09-16-merge 2020-09-17 14:37:28 +00:00
mvasylenko
7ba421cc4a Configurable max number of breakout rooms
Use this wisely: breakoutRoomLimit parameter was introduced to controll max number of breakout rooms.
2020-09-10 11:59:21 -03:00
Anton Georgiev
d8b185f2b3 Merge branch 'issue-9219' of github.com:Tainan404/bigbluebutton into locales-total 2020-09-09 19:29:18 +00:00
Joao Siebel
6e4e0a510a Merge branch 'remove-user-on-exit' into connection-manager 2020-09-08 16:36:01 -03:00
Vitor Mateus De Almeida
d26de05e9f Merge remote-tracking branch 'upstream/develop' into debug-window 2020-09-03 20:36:29 -03:00
Vitor Mateus De Almeida
849bb9a469 Add debug window 2020-09-03 20:35:57 -03:00
KDSBrowne
b33b5f3f01 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-remove-css-variable-duplicates 2020-09-01 21:17:25 +00:00
KDSBrowne
77b71a4d1f fix duplicate css variables being loaded (improve imports) 2020-09-01 18:46:13 +00:00
KDSBrowne
e9d4f8e42c adds a select random user feature for presenter 2020-08-28 17:23:27 +00:00
Joao Siebel
f33bd10640 Remove user from collection when leaves 2020-08-19 13:22:43 -03:00
Tainan Felipe
5bfeab289c Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-08-19 10:41:03 -03:00
Tainan Felipe
1fedde7d8f Remove unsafe lifecycle from all dropdown related components 2020-08-07 17:43:33 -03:00
prlanzarin
dac3259c48 Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base 2020-08-05 14:20:58 +00:00
Anton Georgiev
570f482d4c
Merge pull request #10144 from vitormateusalmeida/layout-manager-2
Add Layout Context and Layout Manager
2020-07-29 10:00:59 -04:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219 2020-07-28 13:28:32 -03:00
Vitor Mateus
ecc8f4a056 wip 2020-07-20 16:16:39 -03:00
Vitor Mateus
297154f78a The presentation gets the size from the layout manager 2020-07-20 16:02:53 -03:00
Anton Georgiev
21b6def708
Revert "Replace unsafe react lifecycle methods" 2020-07-15 15:52:34 -04:00
Anton Georgiev
7535e6fa59
Revert "Create layout context and add a layout manager" 2020-07-15 12:44:59 -04:00
Anton Georgiev
b9b4490d8c
Merge branch 'develop' into layout 2020-07-14 10:32:24 -04:00
Vitor Mateus De Almeida
880963e0e7 Merge remote-tracking branch 'upstream/develop' into layout 2020-07-06 13:36:38 -03:00
KDSBrowne
0cb1dc0a65 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-06-25 19:20:18 +00:00
Vitor Mateus
a1d4311cec wip 2020-06-04 20:01:17 -03:00
Tainan Felipe
e1573bded9 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-26 11:44:20 -03:00
Tainan Felipe
aa668e3f91 Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-05-25 17:05:58 -03:00
Tainan Felipe
db8e7fcd39 Update react-intl and add fallback to unsupported languages 2020-05-25 17:00:13 -03:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
KDSBrowne
3f79eefb18 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-05-25 13:10:50 +00:00
Anton Georgiev
b6524e66c7
Fix typo closing parenthesis 2020-05-21 15:11:11 -04:00
Anton Georgiev
8609418cda
Merge pull request #9630 from KDSBrowne/issue-9543
Change prompt message when screen share not supported
2020-05-21 14:58:07 -04:00
KDSBrowne
f327f31e71 update not supported string to be browser agnostic (screen share) 2020-05-15 13:10:52 +00:00
Paulo Lanzarin
7541395781
screenshare: fix safari availability check 2020-05-14 15:23:07 -03:00
prlanzarin
e875408f8d screenshare: add support on Safari 12.1+ and make constraints configurable
This adds support for screensharing on Safari 12.1+ or whichever has getDisplayMedia enabled

To be conservative and backwards compatible, I`ve maintained the current gUM-based code available as a fallback for those still using older versions of FF or Chrome

Made screenshare constraints configurable. The constraints config will be piped directly to gDM, so it`s just a regular gDM constraint dictionary
2020-05-14 16:54:54 +00:00
Tainan Felipe
851189f3c1 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-11 11:42:03 -03:00
Tainan Felipe
450c3bdd47 Replace legacy react lifecycle in the action dropdown 2020-05-08 08:17:34 -03:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
KDSBrowne
1de9f2bfec show ss btn on safari (when selected display warning modal) 2020-04-13 15:31:16 +00:00
KDSBrowne
0bd6687387 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-04-01 22:55:52 +00:00
KDSBrowne
20cd9f539f reduce re-renders of actionbar / show all uploads dropped separately in toast 2020-04-01 22:54:47 +00:00
Vitor Mateus
5b9aafd0d3 The presentation gets the size from the layout manager 2020-03-25 09:52:23 -03:00
Mohamed Amine Ben Salah
23182917ee adds poll notification test spec 2020-03-20 11:42:04 -03:00
KDSBrowne
ab176c3e24 replace map with filter / move intl out of container / rename session variable / fix alignment 2020-03-10 12:58:14 +00:00
Anton Georgiev
0958e422aa
Merge pull request #8485 from KDSBrowne/move-quick-poll
Move quick poll button to presentation tool bar
2020-03-09 18:05:32 -04:00
KDSBrowne
c856a241d4 remove unused button className 2020-03-09 21:33:56 +00:00
KDSBrowne
4965fcc2aa Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-03-09 21:14:13 +00:00
Chad Pilkey
e4b522e941 fix client crash race condition with presentation pods 2020-03-09 18:10:46 +00:00
KDSBrowne
3881ce2410 fix quickpoll dropdown menu not displaying corretly on mobile 2020-03-04 18:46:45 +00:00
KDSBrowne
62d50a6bad add picture dropzone / bug fixes 2020-02-25 19:29:14 +00:00
Mohamed Amine Ben Salah
d2db75e9bb adds join Breakoutrooms Test Spec 2020-02-21 15:06:05 -03:00
KDSBrowne
a2655d1027 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-02-13 16:27:32 +00:00
KDSBrowne
29c69b47a5 unblock modal on presentation upload 2020-02-13 16:24:01 +00:00
KDSBrowne
b815272708 disable quick poll when active poll / make menu item use full width 2020-01-29 18:36:17 +00:00
Anton Georgiev
201a302826
Merge pull request #8552 from KDSBrowne/actions-pres-toggle
Add ability to switch presentations via actions menu (Presenter)
2020-01-28 12:17:12 -05:00
KDSBrowne
4fd0ae54d0 only show presentation toggle options to presenter 2020-01-27 15:48:35 +00:00
KDSBrowne
41e8e882e0 allow presentation toggle from actions btn 2020-01-25 01:02:36 +00:00
Tainan Felipe
11a8fb377b Show user who joined on breakout room in the invitation modal 2020-01-22 12:31:53 -03:00
KDSBrowne
d417050555 fix button outline displaying when no poll detected 2020-01-14 02:29:31 +00:00
KDSBrowne
5c6f94b4e9 remove dropdown menu for single quick poll 2020-01-10 20:18:43 +00:00
KDSBrowne
c30e58ea27 move quick poll from actions bar to presentation toolbar 2020-01-10 19:00:06 +00:00
Pedro Beschorner Marin
8e129fb961 Included multiple cameras UI 2019-12-18 14:44:56 -03:00
Pedro Beschorner Marin
3b591a086b Unified video providers 2019-12-10 09:02:16 -03:00
Pedro Beschorner Marin
4eb67c12be Multiple webcams first commit 2019-12-10 08:21:19 -03:00
Anton Georgiev
c2d90b1d2d
Merge pull request #8323 from KDSBrowne/issue-8290
Fix restore presentation button overlap (Mobile - Presenter)
2019-12-09 15:26:32 -05:00
KDSBrowne
de48d26106 fix padding for RTL layout 2019-11-12 15:32:11 +00:00
KDSBrowne
2024918a70 fix restore presentation btn overlap on mobile for presenter 2019-11-07 17:33:03 +00:00
Anton Georgiev
43f0ec01a4 accommodate for configuration without shortcuts - do not show error 2019-11-05 16:36:03 -05:00
Anton Georgiev
42d640f3e2 Merge branch 'issue7791-add-support-to-new-parameters-name' of github.com:diegobenetti/bigbluebutton into test-7805 2019-11-05 11:59:00 -05:00
KDSBrowne
919a84d1d6 fix quick poll btn placement 2019-10-26 13:19:13 +00:00
Chad Pilkey
9b0b92b6a2
Merge pull request #8174 from KDSBrowne/issue-8160
Fix actions button misplacement in RTL mode
2019-10-21 17:05:47 -04:00
prlanzarin
3ac4acde6f Remove screensharing option from Safari by UA checks 2019-10-04 17:10:30 +00:00
KDSBrowne
6a478d1409 fix actions button misplacement in RTL 2019-10-02 16:51:53 +00:00
Chad Pilkey
1695352300 Merge remote-tracking branch 'upstream/master' into fix-breakout-start-stop-notify 2019-09-27 22:40:38 +00:00
Chad Pilkey
0a9854aa59 fix issues related to breakouts start/stop and page reload 2019-09-18 13:11:25 -07:00
Lucas Zawacki
5dd46f8f48 Fix video swap when there's no presentation and/or screenshare/external video 2019-09-17 16:55:52 -03:00
Lucas Zawacki
f548281a07 Fix random swappings happening outside of the media service 2019-09-16 19:06:02 -03:00
Anton Georgiev
620fe746da
Merge pull request #8098 from antobinary/external-video-player
Use react-player for external video playback and add arc player support
2019-09-12 08:18:17 -04:00
Anton Georgiev
43c0670ed8 Merge branch 'new-arc-player' of github.com:lfzawacki/bigbluebutton into external-video-player 2019-09-10 16:35:50 -04:00
prlanzarin
7779a5e3a9 Display error toasts for screensharing, improve logs a bit more 2019-09-10 16:20:40 +00:00
Anton Georgiev
03653df5fb obtain actions from container closer to where used 2019-09-06 18:01:12 -04:00
Anton Georgiev
4a335a1db6 reduce db probes for getAvailableActions; simplify SaveUsernames 2019-09-06 16:28:02 -04:00
Anton Georgiev
c5856d43c8 moved static code outside of tracker 2019-09-04 14:32:58 -04:00
Anton Georgiev
f9efd8db96 remove unnecessary prop isBreakoutRoom 2019-08-29 12:32:29 -04:00
Anton Georgiev
892336632f added "fields:{...}", removed most mapUser 2019-08-28 16:32:55 -04:00
Anton Georgiev
d4ac10d4b5
Merge pull request #8019 from jfsiebel/breakout-random-assign
Fix randomly assign problem in breakout rooms
2019-08-28 15:14:41 -04:00
Anton Georgiev
cdb03042ee
Merge pull request #7952 from KDSBrowne/issue-7148
Reduce chance of text Area displaying invisible border
2019-08-28 15:13:00 -04:00
Joao Siebel
b8ec29d8c7 Fix randomly assign problem in breakout rooms
The problem was caused because of PureComponent shallow
comparison, the users list in state are not changing his
reference

close #7905
2019-08-28 12:56:56 -03:00
Lucas Zawacki
546f4cdac5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-arc-player 2019-08-27 15:09:40 -03:00
Tainan Felipe
22d3708690 Remove the toggleRecording of the props 2019-08-21 15:43:10 -03:00
Tainan Felipe
932c5bf58c Fix nav bar performance issue and move recordProp to own collection 2019-08-21 14:42:37 -03:00
KDSBrowne
74ac34c407 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into issue-7148 2019-08-19 13:44:36 +00:00
Joao Siebel
9072799162 Change alert sound for screen share end
Also fix a problem with the screen share alert playing even when
no screen share was running

close #7911
2019-08-16 16:30:33 -03:00
Diego Benetti
c4462c4cb0 Fixes errors and improves parameters setting proccess 2019-08-02 15:38:38 -03:00
Anton Georgiev
311ad5706f
Merge pull request #7750 from diegobenetti/issue6956-turn-webcams-fullscreen-when-no-presentation
Turn webcams fullscreen when no presentation is selected
2019-08-01 13:34:35 -04:00
Diego Benetti
60919eb418 Fixes actionsBar component to check video sharing and video broadcasting 2019-08-01 13:30:11 -03:00
Anton Georgiev
2bf8fb5cca minor optimization using Fields in miniMongo 2019-07-24 17:59:04 +00:00
Diego Benetti
f13239674b Changes other parameters to the new pattern 2019-07-24 14:04:46 -03:00
Lucas Zawacki
a2068d06b6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-react-player 2019-07-16 17:33:27 -03:00
Diego Benetti
aa0c777cee Parameter enableExternalVideo changed to externalVideoPlayer 2019-07-15 16:31:28 -03:00
Diego Benetti
f7a58c3279 Changes the position of the parameter enableExternalVideo in the settings.yml file 2019-07-15 13:26:57 -03:00
Lucas Fialho Zawacki
e98333c45e Use react-player for external video 2019-07-12 20:08:55 +00:00
Diego Benetti
cc6d4ecd41
Merge branch 'master' into issue6956-turn-webcams-fullscreen-when-no-presentation 2019-07-08 14:01:32 -03:00
Diego Benetti
0c2aefa45a Swaps layout when meeting has no presentation 2019-07-08 11:33:32 -03:00
Fred Dixon
aedb653fd5
Merge pull request #7738 from KDSBrowne/closed-captioning-access
Fix accessibility issues in closed captions
2019-07-06 22:50:28 -04:00
KDSBrowne
55b1ca8c77 fix accessibility issues in captions reader menu 2019-07-05 19:44:12 +00:00
Anton Georgiev
f095f04fd3
Merge pull request #7702 from capilkey/fix-user-roles
Clean up user roles
2019-07-04 14:57:19 -04:00
Joao Siebel
18670fdaf2 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-07-04 15:09:06 -03:00
Anton Georgiev
ed264351d0
Merge pull request #7709 from antobinary/logging-structure
Logging structure - add extraInfo: {}
2019-07-02 17:08:48 -04:00
Anton Georgiev
25ac147924
Merge pull request #7710 from KDSBrowne/issue-7705
Add enabled poll property in settings.yml
2019-07-02 16:04:42 -04:00
KDSBrowne
c580ef3199 fix visible take presenter option for current presenter 2019-07-02 18:03:33 +00:00
Anton Georgiev
fb1c294312 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into logging-structure 2019-07-02 15:41:57 +00:00
KDSBrowne
ba9c9c431a add enabled poll prop in settings.yml 2019-07-02 14:54:37 +00:00