Commit Graph

28669 Commits

Author SHA1 Message Date
prlanzarin
93aa556aba akka-apps, screenshare: add broadcast and subscribe permission check messages
Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to broadcast a screen or subscribe to one
2021-02-10 19:02:19 -03:00
Anton Georgiev
66b671c4bd
Merge pull request #11374 from ramonlsouza/develop
Remove unsafe lifecycle from all whiteboard related components
2021-02-10 16:01:25 -05:00
Ramon Souza
672bd3f318 Merge branch 'PR-10217' into develop 2021-02-10 17:55:32 -03:00
Ramon Souza
3652562b63 resolve conflict 2021-02-10 17:35:55 -03:00
prlanzarin
c226d9544e akka-apps: add global audio permission check messages
Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to subscribe to the global audio bridge via listen only or not
2021-02-10 15:00:04 -03:00
Pedro Beschorner Marin
09b39a8d63 Add extra pad validation
Associate pads with meetings so session validation is restricted to the
meeting's valid session tokens.

Meteor will dispatch new redis events on shared notes and closed captions
pads creation. This event will go through apps and reach web to populate
a new meeting's pad collection that contains all valid pad id's for that
session. Nginx will use this collection to check if the user's session token
belongs to the pad's authorized users.

Besides these modifications, an extra change will be needed at notes.nginx.
Location /pad/p/ needs to change it's auth_request:

from /bigbluebutton/connection/checkAuthorization;
to /bigbluebutton/connection/validatePad;
2021-02-10 13:37:04 -03:00
Anton Georgiev
35e631cff4
Merge pull request #11370 from ramonlsouza/issue-8367
Add delay to join video button
2021-02-10 09:00:08 -05:00
Ramon Souza
9738f42432 add debounce to join video button 2021-02-10 10:44:45 -03:00
Tainan Felipe
e2b68a3202 Fix missing file 2021-02-10 10:33:18 -03:00
Tainan Felipe
e05d8886c6 Handle clear chat and fix clear message 2021-02-10 10:14:30 -03:00
Anton Georgiev
eddc3f0e1e
Merge pull request #11364 from ramonlsouza/issue-11338
Fix webcam video dropdown collapse after expanding
2021-02-09 19:54:04 -05:00
Anton Georgiev
adefc6a20c
Merge pull request #11341 from ramonlsouza/breakout-invitation-settings
Add property to settings.yml to enable/disable breakout invitations to moderators
2021-02-09 15:50:24 -05:00
Anton Georgiev
f11c9e69d0
Merge pull request #11365 from ramonlsouza/issue-10035
Stop screenshare on joining breakout room
2021-02-09 15:41:20 -05:00
Ramon Souza
54f983f250 stop screenshare on joining breakout room 2021-02-09 17:22:39 -03:00
Ramon Souza
cde124f237 fix webcam video dropdown collapse 2021-02-09 16:12:33 -03:00
Richard Alam
a443e50558
Merge pull request #11362 from riadvice/fix-api-redirect
Make sure checksum validation is done first in join API and display an error without redirection in failure case
2021-02-09 14:06:21 -05:00
Anton Georgiev
fa89646188
Merge pull request #11363 from lfzawacki/insecure-video-urls
Don't validate insecure http urls for external video to prevent browser errors
2021-02-09 14:04:12 -05:00
Lucas Zawacki
7216619811 Don't validate insecure http urls for external video to prevent browser errors 2021-02-09 15:24:21 -03:00
Ghazi Triki
5f683809cd Make sure checksum validation is done first in join API and display an error without redirection in failure case. 2021-02-09 19:03:54 +01:00
Anton Georgiev
8a1cf91b94
Merge pull request #11360 from jfsiebel/clear-screen-share-collection-edge-case
Cover clear screen share collection case
2021-02-09 12:52:29 -05:00
Joao Siebel
0e79203119 Clear screenshare collection when meeting has ended while screensharing 2021-02-09 14:26:43 -03:00
Anton Georgiev
6c64545e67
Merge pull request #11357 from jfsiebel/2.3-clear-collections-on-meeting-end
[2.3] Clear missing collections on meeting end
2021-02-09 12:04:52 -05:00
Joao Siebel
7f4b2789f2 Clear screenshare collection when meeting has ended while screensharing 2021-02-09 13:44:49 -03:00
Pedro Beschorner Marin
c0a7f9cd92 Replace FNV32a pad's id generator with salted SHA1
When managing Etherpad's pads, Meteor makes API calls to initiate the closed captions
and shared notes modules. The pad id was being mapped to a shorter id than the meeting
id because of a Etherpad lenght limitation.

Changed to something less guessable.
2021-02-09 12:59:59 -03:00
Anton Georgiev
3d78045363 Clear meeting-time-remaining collection 2021-02-09 12:44:33 -03:00
Joao Siebel
811d6d3f98 Clear guestUsers, voiceCallStates and whiteboard-multi-user collections on meeting end 2021-02-09 12:44:10 -03: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
Anton Georgiev
4874e3f65d
Merge pull request #11356 from jfsiebel/clear-collections-on-meeting-end
Clear meeting-time-remaining collection
2021-02-09 09:39:19 -05:00
Anton Georgiev
6b3c97037f Clear meeting-time-remaining collection 2021-02-09 11:23:51 -03:00
Anton Georgiev
7ba24220b2
Merge pull request #11350 from ramonlsouza/issue-11161
Disable user typing notifications when feature is disabled
2021-02-09 08:41:27 -05:00
Tainan Felipe
e99825f60a Merge remote-tracking branch 'upstream/develop' into develop+pr10919+pr10838 2021-02-09 10:40:39 -03:00
Anton Georgiev
cbcf8da698
Merge pull request #11355 from jfsiebel/clear-collections-on-meeting-end
Clear missing collections on meeting end
2021-02-09 08:39:16 -05:00
Ramon Souza
319a620d7e polling fullscreen now only checks if presentation is fullscreen 2021-02-09 10:15:29 -03:00
Tainan Felipe
99ebbf0b17 Remove unused props from proptype 2021-02-09 09:44:01 -03:00
Joao Siebel
2eb8abcba9 Clear guestUsers, voiceCallStates and whiteboard-multi-user collections on meeting end 2021-02-09 09:30:09 -03:00
Ramon Souza
5607ed4007 disable user typing notifications when feature is disabled 2021-02-09 09:06:48 -03:00
Maxim Khlobystov
480602a1a6 Using ArrayBuffer instead of Array when creating a new Question 2021-02-09 06:24:23 +00:00
Maxim Khlobystov
7a703464de Small misprint introduced in the merge 2021-02-09 06:22:41 +00:00
Fred Dixon
075c0421cf
Merge pull request #11345 from bigbluebutton/dependabot/bundler/record-and-playback/core/nokogiri-1.11.0
Bump nokogiri from 1.10.8 to 1.11.0 in /record-and-playback/core
2021-02-08 20:30:20 -04:00
Fred Dixon
d67c597a45
Merge pull request #11344 from bigbluebutton/dependabot/npm_and_yarn/bigbluebutton-html5/tests/puppeteer/axios-0.21.1
Bump axios from 0.18.1 to 0.21.1 in /bigbluebutton-html5/tests/puppeteer
2021-02-08 20:28:59 -04:00
dependabot[bot]
db55b0c4eb
Bump nokogiri from 1.10.8 to 1.11.0 in /record-and-playback/core
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.8 to 1.11.0.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.8...v1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-09 00:28:29 +00:00
dependabot[bot]
530d1429a1
Bump axios from 0.18.1 to 0.21.1 in /bigbluebutton-html5/tests/puppeteer
Bumps [axios](https://github.com/axios/axios) from 0.18.1 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.18.1...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-09 00:27:36 +00:00
Anton Georgiev
e2e0b78d40 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into split-meteor-roles-on-top-of-2.3-alpha6 2021-02-08 23:39:42 +00: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
Felipe Cecagno
23c34e8c01
Merge pull request #11308 from AlexJezior/webhook-docs
Updated the bbb-webhooks documentation. Ensuring the configuration file gets ignored.
2021-02-08 18:04:56 -03:00
Anton Georgiev
86d056d53c
Merge pull request #11343 from antobinary/alpha6-locales
Pulled HTML5 locales, Feb 8, 2021
2021-02-08 15:42:00 -05:00
Tainan Felipe
3e921ee93b Remove filter for messages before login time 2021-02-08 17:35:16 -03:00
Anton Georgiev
146d42ecae Pulled HTML5 locales, Feb 8, 2021 2021-02-08 20:35:08 +00:00
Anton Georgiev
7b1077a7e8
Bumped up release to 2.3-alpha7 2021-02-08 15:32:07 -05:00
Tainan Felipe
44bdfa6e5d Improve adapter to batch messages 2021-02-08 17:00:18 -03:00