Commit Graph

521 Commits

Author SHA1 Message Date
Michael Zinsmeister
214b236701 Merge with upstream 2021-03-07 15:12:49 +01:00
Anton Georgiev
91b09418f7
Merge pull request #11471 from ramonlsouza/pr-11408
Show polling button over the full-screened shared-screen
2021-02-23 12:41:10 -05:00
Ramon Souza
08067e905f polling component also checks if screenshare is fullscreen 2021-02-23 14:04:00 -03:00
Mario Jr
6508674d38 Prevent ejecting user from them main room when leaving breakout room
When user observing changes, we must guarantee these changes are from main room, and not from breakout one.
Fixes #11029
2021-02-21 01:07:25 -03:00
Michael Zinsmeister
6ad4828955 Merge remote-tracking branch 'upstream/develop' into multiple-choice-poll 2021-02-11 10:12:34 +01:00
Anton Georgiev
74d34e1a10
Merge pull request #11319 from ramonlsouza/fullscreen-polling-buttons
Display polling buttons on fullscreen presentation
2021-02-09 09:50:35 -05:00
Ramon Souza
319a620d7e polling fullscreen now only checks if presentation is fullscreen 2021-02-09 10:15:29 -03:00
Ramon Souza
463694aff9 moved fullscreen pollingContainer to PresentationArea + fix duplicated component in fullscreen 2021-02-08 08:50:47 -03:00
Pedro Beschorner Marin
7e26e78c4f Cleanup from authenticated guests removal
While cherry-picking some of this work I noticed those extras.
2021-01-23 22:22:52 -03:00
Pedro Beschorner Marin
85ee3b283f Identify mobile users at user list 2021-01-23 21:57:55 -03: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
0c7ead1916 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge 2020-10-21 14:48:02 +00:00
Joao Siebel
14388ec922 Improve logs for a better debug/understanding of problems related to authentication and log in process 2020-10-07 16:50:17 -03:00
KDSBrowne
3e8eebdd1b move random viewer selection to akka-apps 2020-09-25 19:41:30 +00:00
Joao Siebel
b2adffa4c2 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-09-18 16:30:20 -03:00
Joao Siebel
087939855e fix some problems with using same user in multiple tabs 2020-09-16 09:52:44 -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
KDSBrowne
77b71a4d1f fix duplicate css variables being loaded (improve imports) 2020-09-01 18:46:13 +00:00
Joao Siebel
b8f42ac712 Create ClientConnections structure and auth-token-validation collection 2020-09-01 09:07:56 -03:00
KDSBrowne
e9d4f8e42c adds a select random user feature for presenter 2020-08-28 17:23:27 +00:00
Tainan Felipe
5bfeab289c Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-08-19 10:41:03 -03: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
Anton Georgiev
6a738a43d5
Merge pull request #8464 from KDSBrowne/add-upload-toast
Non-blocking presentation upload
2020-07-28 10:40:41 -04:00
Vitor Mateus De Almeida
34108014f9 Fix exceptions and layout size when panels change 2020-07-20 16:22:41 -03:00
Vitor Mateus
297154f78a The presentation gets the size from the layout manager 2020-07-20 16:02:53 -03:00
KDSBrowne
df1486fabf Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-07-16 12:12:42 +00:00
KDSBrowne
600c41142a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into dev2.3-raise-hand-toast 2020-07-16 11:59:38 +00: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
Vitor Mateus De Almeida
fdcfd39f04 Merge remote-tracking branch 'upstream/master' into layout 2020-07-06 12:44:47 -03:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
KDSBrowne
c70a58c1ff add status notification component 2020-06-30 02:43:20 +00:00
Vitor Mateus De Almeida
2454440a8d Fix exceptions and layout size when panels change 2020-06-20 02:46:10 -03:00
KDSBrowne
a4642569d8 prevent drag and drop of files closing session 2020-06-03 15:39:02 +00:00
Tainan Felipe
db8e7fcd39 Update react-intl and add fallback to unsupported languages 2020-05-25 17:00:13 -03:00
Vitor Mateus
5b9aafd0d3 The presentation gets the size from the layout manager 2020-03-25 09:52:23 -03:00
KDSBrowne
6d742267b1 remove left over passing of intl 2020-03-10 15:07:59 +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
Richard Alam
7d0b350b7d
Merge pull request #8739 from antobinary/merging
Merging 2.2.2 into 'develop'
2020-03-09 11:04:36 -04:00
Chad Pilkey
f41654729a force a stacking context to be created for the media container 2020-03-06 10:31:54 -08:00
Anton Georgiev
d36c545706 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:41:18 +00:00
KDSBrowne
62d50a6bad add picture dropzone / bug fixes 2020-02-25 19:29:14 +00:00
KDSBrowne
f39025b419 fix whiteboard toolbar overlapping userlist and its dropdowns 2020-02-24 15:20:05 +00: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
Vitor Mateus
1ae6324392 Detect aspect ratio to autochange webcams placement #8504 2020-01-17 10:20:03 -03:00
KDSBrowne
a0374d61f6 fix indicator being overlapped (mobile portrait) 2019-11-29 15:19:48 +00:00