Commit Graph

68 Commits

Author SHA1 Message Date
KDSBrowne
eb4c85c861 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into bbb-regex-poll-ops 2023-02-06 14:14:38 +00:00
KDSBrowne
9b51ac6095 improve poll regex - reduces invalid options detected 2023-02-06 13:04:28 +00:00
Ramón Souza
0abba75b84 improve quick poll regex 2023-02-02 09:10:56 -03:00
KDSBrowne
2d169bcce1 use formatted label for custom poll options when available 2023-01-31 18:31:59 +00:00
KDSBrowne
3a1b0f4382 fix blank options and question for smartslide yes/no poll 2023-01-31 16:34:23 +00:00
Gustavo Trott
7781909d50 Removes all references to swf files (used by old flash client) 2022-11-17 10:55:19 -03:00
KDSBrowne
63b9aea247 update regex 2022-10-30 18:53:33 +00:00
KDSBrowne
637a85ca39 restrict typed response when (yes/no) detected 2022-10-30 16:12:37 +00:00
Ramón Souza
d3cfe305b0 Merge remote-tracking branch 'upstream/v2.5.x-release' into oct18 2022-10-18 17:13:33 -03:00
KDSBrowne
8ee7d85090 fix lint issue 2022-10-18 14:13:30 -03:00
KDSBrowne
32896d025b restrict poll item length to 30 chars 2022-10-18 14:13:23 -03:00
Ramón Souza
7553a7dbe2 add custom polling functionality to smart polls 2022-10-18 14:13:09 -03:00
Ramón Souza
44feee8dda add safeMatch method 2022-10-18 10:27:10 -03:00
KDSBrowne
815338db0d handle double ?? for multi response smart poll 2022-10-14 15:44:06 -03:00
KDSBrowne
9f0351d0d6 update smart slides to detect user response poll 2022-10-14 15:44:06 -03:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
Daniel Schreiber
e052b1f773 fix presentation download
this fixes the presentation download. This slipped through in commit
c46556e1f6

Sorry for that.
2021-12-08 22:32:22 +01:00
Ramón Souza
51b5cc4f3a remove isPresenter methods from services 2021-11-23 16:40:14 +00:00
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
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
Ramon Souza
8da630da03 fix presentation service isPresenter 2021-06-14 09:56:17 -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
40c9d87f63 reduce component re-render on containers that use usersContext 2021-04-19 14:57:55 -03: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
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
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
werk21
80af96ff76 9101: Survey: New profile yes/no/abstention 2021-01-24 02:22:40 +01:00
KDSBrowne
e596bfaefd add per user functionality to multi user whiteboard 2020-08-17 17:03:23 +00:00
Ghazi Triki
535f2d665a Fix presentation download by using the presentation id not its name. 2020-04-12 18:09:33 +03:00
KDSBrowne
655af26b32 replace negative lookahead (not supported by firefox) 2019-10-27 14:18:16 +00:00
KDSBrowne
84d109fe2e improve yes / no and true / false detection 2019-10-26 13:38:04 +00:00
KDSBrowne
7339686b69 fix quickpoll showing invalid option 2019-10-26 13:37:24 +00:00
Chad Pilkey
3781a94a23 move slide position data into its own collection 2019-07-31 12:22:32 -07:00
Chad Pilkey
c344a17adb pan/zoom and cursor refactor for better performance 2019-07-25 15:55:25 -07:00
KDSBrowne
2b9d0cccee add notification when presentation changes 2019-05-09 17:44:54 +00:00
Vitor Mateus
7c76ec4e3a Fix tooltips and fullscreen 2019-03-11 13:21:12 -03:00
Vitor Mateus
7323183a84 Merge remote-tracking branch 'upstream/master' into issue-5191 2019-03-06 11:30:23 -03:00
Gustavo Trott
c6b725a36b Resolve conflicts 2019-02-25 09:24:00 -03:00
Anton Georgiev
3003ccf7ab
Merge pull request #6779 from gustavotrott/slide-text-for-accessibility
Add texts extracted from slides for accessibility
2019-02-22 11:00:34 -05:00
Anton Georgiev
4743b6cf4e added uriEncode for GET param for download presentation 2019-02-21 23:43:11 +00:00
Gustavo Trott
3f21c82330 implement quick poll feature 2019-02-21 18:01:39 -03:00
Anton Georgiev
9438b45a46 use real link to presentation to download 2019-02-20 17:17:17 +00:00
Gustavo Trott
ff05c4f971 Update slides content 2019-02-20 13:38:52 -03:00
Gustavo Trott
1695e5e967 Add texts extracted from slides for accessibility 2019-02-14 16:42:13 -02:00
Vitor Mateus
7998f46391 Modified presentation toolbar styles 2019-02-12 11:35:52 -02:00
Oleksandr Zhurbenko
6c1e791adb Added a layer for the presentation pods component 2018-04-09 22:24:04 -07:00
Oleksandr Zhurbenko
0c8f1a3bfd Adjusted multi-user for 2.1 2018-04-09 16:18:49 -07:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00