Commit Graph

598 Commits

Author SHA1 Message Date
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
Anton Georgiev
4f14086f72 set default value for isPresenter in case user removed 2020-12-18 15:37:45 +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