BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,743 Commits 13 Branches 260 Tags 1.1 GiB
4840543701
Commit Graph

780 Commits

Author SHA1 Message Date
Daniel Schreiber
c46556e1f6 Allow BBB to run behind a proxy the avoid gUM permission queries per node 
The idea is to run a loadbalancer node which maps each BBB node to a
path. That way each user gets only one gUM permission query for a
cluster. The loadbalancer node only serves the html5 client, each BBB
node will serve its own API and handle the websockets for freeswitch and
bbb-webrtc-sfu.

Configuring a cluster setup
===========================

* let bbb-lb.example.com be the loadbalancer node
* let bbb-01.eaxmple.com be a BBB node

Loadbalancer
------------

On the loadbalancer node add an nginx configuration similar to this one
for each BBB node:

```
location /bbb-01/html5client/ {
  proxy_pass https://bbb-01.example.com/bbb-01/html5client/;
  proxy_http_version 1.1;
  proxy_set_header Upgrade $http_upgrade;
  proxy_set_header Connection "Upgrade";
}

```

BBB Node
--------

On the BBB node add the following options to
`/etc/bigbluebutton/bbb-web.properties`:

```
defaultHTML5ClientUrl=https://bbb-lb.example.com/bbb-01/html5client/join
presentationBaseURL=https://bbb-01.example.com/bigbluebutton/presentation
accessControlAllowOrigin=https://bbb-lb.example.com
```

Add the following options to `/etc/bigbluebutton/bbb-html5.yml`:

```
public:
  app:
    basename: '/bbb-01/html5client'
    bbbWebBase: 'https://bbb-01.eaxmple.com/bigbluebutton'
    learningDashboardBase: 'https://bbb-01.eaxmple.com/learning-dashboard'
  media:
    stunTurnServersFetchAddress: 'https://bbb-01.eaxmple.com/bigbluebutton/api/stuns'
    sip_ws_host: 'bbb-01.eaxmple.com'
  presentation:
    uploadEndpoint: 'https://bbb-01.eaxmple.com/bigbluebutton/presentation/upload'
```

Create the following unit file overrides:

* `/etc/systemd/system/bbb-html5-frontend@.service.d/cluster.conf`
* `/etc/systemd/system/bbb-html5-backend@.service.d/cluster.conf`

with the following content:

```
[Service]
Environment=ROOT_URL=https://127.0.0.1/bbb-01/html5client
```

Change the nginx `$bbb_loadbalancer_node` variable to the name of the
load balancer node in `/etc/bigbluebutton/nginx/loadbalancer.nginx` to
allow CORS requests:

```
set $bbb_loadbalancer_node https://bbb-lb.example.com
```

Prepend the mount point of bbb-html5 in all location sections except
from the `location @html5client` section in
`/etc/bigbluebutton/nginx/bbb-html5.nginx`

```
location @html5client {
    ...
}
location /bbb-01/html5client/locales {
    ...
}
```
 2021-11-20 22:13:47 +01: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
Ramón Souza
ba004994e7 remove remaining styles 2021-11-11 11:47:39 +00:00
Ramón Souza
b71f312fee Merge remote-tracking branch 'upstream/develop' into styled-components-10 2021-11-08 18:37:34 +00:00
Ramón Souza
1240c5dd2f convert presentation component 2021-11-08 17:28:22 +00:00
Ramón Souza
a445cdafa4 convert presentation uploader component 2021-11-08 17:07:52 +00:00
Ramón Souza
6343c25973 convert presentation toolbar component 2021-11-08 13:09:56 +00:00
Ramón Souza
58d86b60e2 convert presentation placeholder component 2021-11-08 12:35:19 +00:00
Ramón Souza
9fc90683c2 convert presentation close-button component 2021-11-08 12:13:56 +00:00
Ramón Souza
9999639f3f convert presentation download-button component 2021-11-08 12:07:11 +00:00
Ramón Souza
59057744ec convert presentation default-content component 2021-11-08 11:39:17 +00:00
Ramón Souza
96997bcfb4 convert checkbox component 2021-11-05 17:21:35 +00:00
Tainan Felipe
f5eef03f3f Improve data structure to not break on reconnections 2021-11-03 14:37:54 -03:00
Anton Georgiev
c60ef3c179
Merge pull request #13253 from ramonlsouza/PR-11359 
feat: multiple choice poll
 2021-10-26 14:42:29 -04:00
Ramón Souza
f452a5f164 fix start quick poll 2021-10-26 16:38:52 +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
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
Ramón Souza
3c0a0135c1 restore presentation fullscreen shortcut 2021-10-07 14:09:05 +00:00
Ramón Souza
e49bcac254 fix presentation toolbar unmount with small window height 2021-10-06 13:20:30 +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
Ramon Souza
0e319ccbdd change presentation fullscreen/minimize buttons color 2021-09-29 16:23:58 -03:00
Lucas Fialho Zawacki
d7f3924350 Enable swap layout for screenshare and external video 2021-09-27 21:03:20 +00:00
Lucas Zawacki
0425d8753c Minimize button for presentation, external video and screenshare 2021-09-27 20:16:20 +00:00
Ramon Souza
485943d464 fix presentation toolbar size in focus on video layout 2021-09-27 09:21:21 -03: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
zhem0004
c572e69b24
fix: Reimplement presentation.allowDownloadable (#13237) 
* Reimplemented presentation.allowDownloadable

* Reimplemented presentation.allowDownloadable

Co-authored-by: Bohdan Zhemelinskyi <bohdan.Zhemelinskyi@blindsidenetworks.com>
 2021-09-17 16:55:31 -04:00
Anton Georgiev
d175fcf95d
Merge pull request #13082 from antonbsa/test-allow-presentation-download 
test: Presentation - adds test to allow and disallow presentation download and test to remove all presentations
 2021-09-14 09:18:09 -04:00
Ramon Souza
9300b9b382 Merge remote-tracking branch 'upstream/develop' into use-context-selector 2021-09-13 15:41:52 -03: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
Anton Barboza
34369b8897 add remove all presentation test 2021-09-08 14:18:01 -03:00
Anton Barboza
c83ac33827 Merge remote-tracking branch 'upstream/v2.4.x-release' into test-allow-presentation-download 2021-09-08 10:31:18 -03:00
KDSBrowne
30735c64a6 update page title with current view 2021-09-04 22:36:48 +00:00
Ramon Souza
084d80f23e remove unused state properties 2021-09-01 08:48:46 -03:00
KDSBrowne
cf57bb5290 update value to key code constant 2021-08-30 00:53:06 +00:00
Anton Georgiev
fb6a1456d4
Merge pull request #13014 from KDSBrowne/bbb-upload-focus-trap 
Restrict Keyboard Access From Elements Behind Upload Modal
 2021-08-27 14:58:20 -04:00
Ramon Souza
e55529142f Merge remote-tracking branch 'upstream/develop' into issue-6803 2021-08-27 15:37:19 -03:00
Ramon Souza
429d1b3e9e fix button position in iPhone + RTL 2021-08-27 15:34:01 -03:00
Joao Siebel
c3751cfef3 Fix recording when there is no presentation 2021-08-26 17:13:05 -03:00
Anton
429329266e add data-test to presentation-download elements 2021-08-26 15:41:41 -03:00
Ramon Souza
1d89c893dc move presentation fullscreen button to top right 2021-08-25 17:31:52 -03:00
Joao Siebel
06b1838777 Merge remote-tracking branch 'upstream/develop' into allow-to-remove-all-presentations 2021-08-24 10:39:07 -03:00
Joao Siebel
f3f9ec19eb Allow presenter to remove all presentations 2021-08-23 18:04:16 -03:00
Ramon Souza
9d4e79f83e only change presentation isDownloadable after confirmation 2021-08-23 10:23:09 -03:00
KDSBrowne
6a65c56c20 restrict keyboard access to upload modal when open 2021-08-17 02:57:37 +00:00
Anton Georgiev
f909c317cd
Merge pull request #12972 from ramonlsouza/issue-12953 
fix: viewing shared screen in full screen mode will break the interface when screen share closes
 2021-08-12 14:16:13 -04:00
Ramon Souza
5c51b67d43 fix presentation position in focus on video layout 2021-08-12 11:08:43 -03:00
Ramon Souza
53d0b8b949 exit fullscreen when component is unmounted 2021-08-11 13:19:24 -03:00
Ramon Souza
c00ac3f18a Merge remote-tracking branch 'upstream/develop' into issue-12880 2021-08-05 13:24:37 -03:00
Vitor Mateus De Almeida
1b18977eac rename all NewLayout.. to Layout.. 2021-08-05 08:03:24 -03:00
Vitor Mateus De Almeida
09082734c9 remove old media, webcam draggable and panel components 2021-08-05 04:26:03 -03:00
Vitor Mateus De Almeida
abf089ae73 remove layout manager legacy 2021-08-05 01:22:07 -03:00
Ramon Souza
523897c2d3 limit camera size based on toolbar size 2021-08-04 11:38:20 -03:00
Ramon Souza
c6f6f02f40 fix presentation toolbar position in small window - partial 2021-08-04 08:42:38 -03:00
Ramon Souza
07a2db6265 Merge remote-tracking branch 'upstream/develop' into rtl-new-layouts 2021-07-27 16:25:15 -03:00
Ramon Souza
d3ed4d6ea6 rtl smart layout 2021-07-26 17:45:03 -03:00
Ramon Souza
ebe65ecef0 set slide size when changing presentation - new lm 2021-07-23 15:33:32 -03:00
Ramon Souza
c689c9ad04 do not display hide presentation button in presentation focus layout 2021-07-16 16:54:23 -03:00
Ramon Souza
43eda61beb set presentation isOpen on toggleSwapLayout 2021-07-16 15:48:48 -03:00
Vitor Mateus De Almeida
f0145e001e Add resizable and draggable in cameras dock 
Remove settings and change resizable context data

Add resizable draggable drop areas in cameras dock
 2021-07-13 04:25:03 -03:00
Ramon Souza
8bf637129b fullscreen camera 2021-07-06 11:05:15 -03:00
Ramon Souza
408b596ed0 remove fullscreen from presentation (context) and add generic fullscreen information 2021-07-05 13:52:25 -03:00
Vitor Mateus De Almeida
3599577463 Fix camera calcs 
Fix camera calcs 2
 2021-06-25 17:57:19 -03:00
Anton Georgiev
0e9f0b04c8
Merge pull request #12667 from ramonlsouza/fullscreen-presentation-new-lm 
feat: fullscreen presentation in new Layout Manager
 2021-06-25 07:59:58 -04:00
Ramon Souza
a466cd11de no hide presentation button in fullscreen mode 2021-06-25 08:25:16 -03:00
Ramon Souza
b7bf014e76 format code 2021-06-24 16:50:46 -03:00
Ramon Souza
fbfe371b40 fix presentation size when user is presenter 2021-06-24 16:46:26 -03:00
Ramon Souza
c0e02d7bfa presentation fullscreen in new layout manager 2021-06-24 15:42:45 -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
349af23f0a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into anonymous-polls 2021-06-16 21:54:28 +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
Anton Georgiev
6b2e070786
Merge pull request #12565 from ramonlsouza/fix-presentation-upload 
fix: check for presenter status at presentation upload modal
 2021-06-14 17:01:29 -04:00
Anton Georgiev
32eb3b9818
Merge pull request #12585 from vitormateusalmeida/layoutManagerNew 
Add container for presentation
 2021-06-14 16:09:34 -04:00
Arthur B. Grossi
1213f047d4 style(layout): download presentation button 
Add fullscreen presentation button style to download presentation
button
 2021-06-14 14:59:34 -03:00
Vitor Mateus De Almeida
192fbf986b Add condition to size of presentation component 2021-06-14 14:47:12 -03:00
Ramon Souza
8da630da03 fix presentation service isPresenter 2021-06-14 09:56:17 -03:00
Ramon Souza
4ca3d17393 check for presenter status at presentation upload modal 2021-06-11 16:33:15 -03:00
germanocaumo
7bedcb08e5 fix(poll): don't translate user/presenter typed answers 
When the answer is not default (Custom or UserResponse), don't translate the answers.
 2021-06-11 16:55:53 +00:00
Vitor Mateus De Almeida
ba400b2ebd Merge remote-tracking branch 'upstream/develop' into layoutManagerNew 2021-06-09 11:03:34 -03:00
Vitor Mateus De Almeida
f6fc8225f6 Add container for presentation 2021-06-09 10:49:59 -03: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
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
Vitor Mateus De Almeida
42efa722e6 Add presentation update when change layout typeNLM 2021-05-24 15:35:37 -03:00
Vitor Mateus De Almeida
04715230dc Add webcam container and presentation container 2021-05-24 14:05:39 -03:00
Vitor Mateus De Almeida
1326f3f791 Add New Layout Manager 2021-05-17 17:25:07 -03:00
Ramon Souza
0844f54716 fix presentation uploader error 2021-05-12 15:43:45 -03:00
Anton Georgiev
08474877b7
Merge pull request #12319 from Tainan404/issue-12267 
Fix Presentation uploader missing items
 2021-05-10 13:48:38 -04:00
Tainan Felipe
2efd949b16
Update bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx 
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
 2021-05-07 11:09:30 -03:00
Tainan Felipe
5e249ff47f Add comment 2021-05-07 11:06:03 -03:00
Anton Georgiev
25c323bfc6
Merge pull request #12317 from jfsiebel/prevent-toast-conversion-text-error-overflow 
Fit conversion error message in toast notification
 2021-05-07 10:00:15 -04:00
Tainan Felipe
2e168b8252 Fix Presentation being not shown 2021-05-07 10:52:12 -03:00
Joao Siebel
aaa3a14b30 Remove scroll on toast notification when a conversion error happens. close #12293 2021-05-07 10:12:46 -03:00
Ramon Souza
93d41f3f91 remove unused variables 2021-05-07 08:54:01 -03:00
Joao Siebel
2f89598d2d Merge remote-tracking branch 'upstream/develop' into better-upload-feedback 2021-04-27 17:46:22 -03:00
Joao Siebel
18385c1de1 Add feedback for some upload status 2021-04-27 16:45:14 -03:00
Anton Georgiev
33ad2f1a58
Merge pull request #12086 from ramonlsouza/issue-12042 
Reduce component re-render on containers that use usersContext
 2021-04-22 14:40:50 -04:00
Ramon Souza
75b9261f6f remove unused imports/variables 2021-04-22 13:17:20 -03:00
Ramon Souza
509d9c0936 Merge remote-tracking branch 'upstream/develop' into issue-12042 2021-04-22 08:45:06 -03:00
MrKeksi
9d10478320 increase download button size 
increase download button size
fixes #7684
 2021-04-21 19:36:40 +02:00
Joao Siebel
c5071093d9 Improve feedback to user after a failed file upload 2021-04-20 14:21:12 -03:00
Ramon Souza
d5d1c86c70 remove unused imports 2021-04-20 09:12:22 -03:00
Ramon Souza
40c9d87f63 reduce component re-render on containers that use usersContext 2021-04-19 14:57:55 -03:00
Ramon Souza
56c33ed36d add meetingId to userscontext 2021-04-15 09:12:21 -03: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
Philipp Memmel
c20b8164ef update order of presentation lists 2021-04-07 17:11:17 +02:00
hiroshisuga
ab66434bb0
panelChanged event 2021-04-07 23:44:37 +09:00
Tainan Felipe
e4563defde Fix client crashing because users object is missing 2021-04-06 16:58:11 -03:00
Ramon Souza
3d6314012f localized quick poll answers 2021-04-05 14:50:50 -03:00
hiroshisuga
c6cca4fe15
minimum width of button 2021-04-03 01:14:26 +09:00
hiroshisuga
9a6d76e6e3
no width for confirm button 2021-04-02 11:06:16 +09:00
Anton Georgiev
8adbbe8288
Merge pull request #11841 from ramonlsouza/device-detect 
Change browser detection library to bowser
 2021-04-01 09:52:16 -04:00
Philipp Memmel
48571734c8 fix localization of heading in presentation manager 2021-04-01 11:18:32 +02: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
Ramon Souza
3fa193005b change browser detection lib to bowser 2021-03-30 09:53:47 -03:00
KDSBrowne
ff7dc18669 remove invalid aria values and roles without proper children 2021-03-29 02:12:58 +00:00
Pedro Beschorner Marin
d90ba5e286 Merge branch '2.3-per-user-wb' into develop 2021-03-16 20:28:39 -03:00
Pedro Beschorner Marin
381c5cb15c Isolated whiteboard access 
Modified the previous implementation of the whiteboard individual access to remove
multiple Collections dependency on this feature. Multi-user whiteboard is now an
array instead of a boolean value and most of the access control can be synchronized
and handled by akka-apps.
 2021-03-16 19:55:25 -03:00
hiroshisuga
190bde3320
Fix slide size problem at fullscreen <-> window-mode transition #2 (#11540) 
Replaces the PR #10604, which has been temporarily fixed a problem in 2.3a2, that is, the slide size gets crazy when turning on and off fullscreen mode. Since #10604 was just a workaround, I tried to fix it in a way making more sense.

### Closes Issue(s)

closes #10459 (already closed by #10604) and #10589

### Motivation

#10604 is fixing the problem by calling "slide change" event, although the slide has not been changed actually. I tried to fix the same problem by adding a "full screen change" event listener in the layout manager, which I think is more elegant.
 2021-03-05 11:01:47 -05:00
Anton Georgiev
7b58f0b269
Merge pull request #11556 from ramonlsouza/quick-poll-fix 
Quick poll improvements
 2021-03-04 15:01:10 -05:00
Ramon Souza
ce5f0c04f3 changes to match issue #8197 tests 2021-03-04 15:00:21 -03:00
Ramon Souza
47a21dfd98 quick poll fix 2021-03-04 13:34:23 -03:00
Ramon Souza
0a1516c36e fix svg width error 2021-03-03 15:59:34 -03:00
Mohamed Amine Ben Salah
2c9d8e4380 updates and adds specifications for polling 2021-03-01 18:47:08 -03:00
KDSBrowne
babaf1b578 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-per-user-wb 2021-02-21 00:04:36 +00:00
Anton Georgiev
e966d6c7b6
Merge pull request #11366 from MaximKhlobystov/updating-poll-ui 
Updated poll UI: question field and typed responses
 2021-02-18 10:32:33 -05:00
Ramon Souza
c88e4e3133 show uploaded slides from other users 2021-02-15 15:23:02 -03:00
Anton Georgiev
39759c7a16
Merge pull request #11298 from ramonlsouza/issue-11270 
Set safe default values for slide position (WIP)
 2021-02-11 12:34:23 -05:00
Maxim Khlobystov
ff4260dc98 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into updating-poll-ui 2021-02-08 21:41:43 +00:00
Ramon Souza
463694aff9 moved fullscreen pollingContainer to PresentationArea + fix duplicated component in fullscreen 2021-02-08 08:50:47 -03:00
Ramon Souza
06bd75dd9e make sure slidePosition is only used if it exists 2021-02-03 16:38:09 -03:00
Ramon Souza
49ee9821f8 possible fix for #11270 2021-02-03 13:49:14 -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
Fred Dixon
27cb9e8a39
Merge pull request #11078 from hiroshisuga/patch-11 
Remove mountModal requirement in presentation uploader
 2021-01-15 22:53:53 -04:00
Fred Dixon
9e7bd44c9b
Merge pull request #10604 from hiroshisuga/patch-8 
Fix slide size problem at fullscreen <-> window-mode transition
 2020-12-30 08:08:38 -04:00
hiroshisuga
4e4d3beb10
Update component.jsx 2020-12-27 10:36:01 +09:00
Anton Georgiev
3930e164e6
Merge branch 'develop' into debug-window 2020-12-08 16:16:24 -05:00
Anton Georgiev
f34826718d include instanceId in resources url 2020-11-30 16:09:35 +00:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
Fred Dixon
97da7d6023
Merge pull request #10704 from KDSBrowne/2.2-upload-modal-error-bound 
Add error boundary to presentation upload modal
 2020-11-06 16:40:50 -05:00
KDSBrowne
76dc9034ee Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-per-user-wb 2020-11-02 16:36:59 +00:00
KDSBrowne
7c690ab22c fix presentation downloadable tooltip msg 2020-10-30 13:00:07 +00:00
KDSBrowne
e116396481 add error boundry to presentation upload modal 2020-10-22 13:00:09 +00:00
KDSBrowne
73f890c9d8 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-updated-polling 2020-10-21 16:05:03 +00:00