Commit Graph

31258 Commits

Author SHA1 Message Date
paultrudel
6f40fa115d Merge branch 'v2.4.x-release' of https://github.com/bigbluebutton/bigbluebutton into change-message-key-value 2021-10-06 16:02:48 -04:00
Anton Georgiev
5c98d96486
Merge pull request #13416 from antobinary/merge-23-24
chore: Merge 2.3 into 2.4
2021-10-06 16:01:43 -04:00
Anton Georgiev
e2fe8ea486
Merge pull request #13426 from paultrudel/allow-parameters-in-request-body
Parameters allowed in request body again
2021-10-06 14:06:14 -04:00
Anton Georgiev
d2d8287fb6 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-23-24 2021-10-06 17:27:37 +00:00
Anton Georgiev
a1e0999f33
Merge pull request #13427 from zhem0004/optimizeDeploy
refactor: Reuse bbb-html5 build files from build dir
2021-10-06 12:38:49 -04:00
Bohdan Zhemelinskyi
5cb93a6857 Optimize deploy 2021-10-06 15:53:33 +00:00
paultrudel
a6d2dfd8ba removed some unused code 2021-10-06 10:40:40 -04:00
paultrudel
fa3fce9678 allow all parameters to be sent in th request body and have a null query string 2021-10-06 10:36:21 -04:00
Anton Georgiev
585c263129
Merge pull request #13425 from pedrobmarin/f-cc-cr
fix(closed captions): captions recording
2021-10-06 10:00:21 -04:00
Pedro Beschorner Marin
3bf1eeeeaf fix(closed captions): captions recording
Missing updates on Meteor's data validation for the closed captions
backend recording events.
2021-10-06 10:50:07 -03:00
Anton Georgiev
c9f70f68d9
Merge pull request #13424 from ramonlsouza/fix-presentation-toolbar-unmount
fix: presentation toolbar unmount with small window height
2021-10-06 09:40:34 -04:00
Ramón Souza
e49bcac254 fix presentation toolbar unmount with small window height 2021-10-06 13:20:30 +00:00
Anton Georgiev
2b0e5ed1a8
Merge pull request #13420 from JoVictorNunes/issue-13160
fix: dropdown menu padding
2021-10-06 09:09:59 -04:00
Joao Victor
a3bd05c448 fix the cut of the letters in the menu component 2021-10-05 17:57:21 -03:00
Anton Georgiev
0f56a05a93
Merge pull request #13418 from gustavotrott/fix-bbb-conf-handle-sipjsHackViaWs-value
refactor: Bbb-conf warn about sip.js if sipjsHackViaWs is null or undefined
2021-10-05 16:19:31 -04:00
Anton Georgiev
32ea86f151
Merge pull request #13412 from gustavotrott/bbb-conf-fix-html5-conf-etc
Backport 2.3: Fix Bbb-conf ignoring bbb-html5 config overrides
2021-10-05 16:02:10 -04:00
Gustavo Trott
7e271c2580 Change condition of sipjsHackViaWs to consider null and undefined values 2021-10-05 16:57:16 -03:00
Gustavo Trott
38e46782c3 Change condition of sipjsHackViaWs to consider null and undefined values 2021-10-05 16:52:31 -03:00
Anton Georgiev
59fc722529 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-23-24 2021-10-05 17:14:46 +00:00
Anton Georgiev
74852dae1f
Merge pull request #13406 from Arthurk12/guest-page-loading-dots
style(guest page): loading dots
2021-10-05 12:32:02 -04:00
Anton Georgiev
563bf2caca
Merge pull request #13392 from pedrobmarin/f-sn-aps
fix(shared notes): avoid padId subscription
2021-10-05 12:26:37 -04:00
Anton Georgiev
c2a48a5e9d
Merge pull request #13396 from pedrobmarin/f-cc-aps
fix(closed captions): avoid padId subscription
2021-10-05 12:26:26 -04:00
Anton Georgiev
e1e629c507
Merge pull request #13398 from pedrobmarin/f-cc-coota
fix(closed captions): check owner on text append
2021-10-05 12:26:13 -04:00
Anton Georgiev
9bc10c1a88
Merge pull request #13402 from ramonlsouza/pr-13396-24
fix(closed captions): avoid padId subscription (2.4)
2021-10-05 12:25:17 -04:00
Anton Georgiev
2c02272f65
Merge pull request #13399 from ramonlsouza/pr-13392
fix(shared notes): avoid padId subscription (2.4)
2021-10-05 12:25:01 -04:00
Anton Georgiev
3cfdc053ce
Merge pull request #13413 from bigbluebutton/revert-13411-buildError
revert: Revert "fix: Fixed the error with implementation of devDependancy (wdyr)"
2021-10-05 11:12:37 -04:00
Anton Georgiev
0ac4dca135
Revert "fix: Fixed the error with implementation of devDependancy (wdyr)" 2021-10-05 11:00:07 -04:00
Anton Georgiev
1921b303e5
Merge pull request #13411 from zhem0004/buildError
fix: Fixed the error with implementation of devDependancy (wdyr)
2021-10-05 10:12:26 -04:00
Gustavo Trott
f6a955fd47 Makes html5 config from etc override default config 2021-10-05 11:06:03 -03:00
Bohdan Zhemelinskyi
4a329ce1a0 Fixed the error with impementation of devDependancy 2021-10-05 13:38:44 +00:00
Anton Barboza
4f2764ce65 fix webcam tests and provides shareWebcam function in page.js 2021-10-04 17:42:58 -03:00
Anton Georgiev
e13b501b88
Merge pull request #13372 from ramonlsouza/issue-13336
Polling UI Enhancements
2021-10-04 15:57:34 -04:00
Paulo Lanzarin
2833433ceb
Merge pull request #13397 from prlanzarin/u24-sta-ful
chore(recording): track mediasoup raw media files locations
2021-10-04 16:55:28 -03:00
Ramón Souza
1183b6c4ff apply requested changes 2021-10-04 19:52:26 +00:00
Ramón Souza
3840d4ff63 fix(closed captions): avoid padId subscription
Remove padIds from the closed captions MongoDB collection subscription.

Users now have to fetch the padId from Meteor when needed. Meteor is
responsible for checking the user's access level and return the
proper id.
2021-10-04 19:22:18 +00:00
Arthur B. Grossi
978841aa71 style(guest wait): loading dots
Adjusts guest waiting page loading dots to be the same as the one displayed
at the client.
2021-10-04 19:21:36 +00:00
Anton Georgiev
f6a2f646a9
Merge pull request #13401 from lfzawacki/v2.4.x-icons
fix(icons): Fix icon file positions
2021-10-04 14:39:37 -04:00
Lucas Fialho Zawacki
3b22a4509f fix(icons): Fix icon file 2021-10-04 18:33:15 +00:00
Anton Georgiev
9f0feff0d5
Merge pull request #13400 from ramonlsouza/pr-13381-24
Fix: toolbar item vanish (2.4)
2021-10-04 14:30:58 -04:00
hiroshisuga
7ce8e6859a Fix toolbar item vanish 2021-10-04 18:10:19 +00:00
Pedro Beschorner Marin
c42d66a68f fix(shared notes): avoid padId subscription
Remove padIds from the shared notes MongoDB collection subscription.

Users now have to fetch the padId from Meteor when needed. Meteor is
responsible for checking the user's access level and return the
proper id.
2021-10-04 18:01:19 +00:00
Anton Barboza
1fa3955c28 add test - User: Show network data in Connection Status 2021-10-04 14:57:12 -03:00
paultrudel
5b4ea24ea8 All constraints now have both a key and a message parameter 2021-10-04 13:50:17 -04:00
Pedro Beschorner Marin
b65d253143 fix(closed captions): check owner on text append
Avoid appendText call if the requester is not the closed captions' pad
owner.
2021-10-04 14:40:43 -03:00
Pedro Beschorner Marin
f7793bdc4b fix(closed captions): avoid padId subscription
Remove padIds from the closed captions MongoDB collection subscription.

Users now have to fetch the padId from Meteor when needed. Meteor is
responsible for checking the user's access level and return the
proper id.
2021-10-04 14:35:53 -03:00
Anton Georgiev
cfb422a720
Merge pull request #13395 from lfzawacki/v2.4.x-external-icon
feature(external-video): New external video icon
2021-10-04 13:34:40 -04:00
prlanzarin
fbe1610e1c chore(recording): track mediasoup raw media files locations
I was going to resort to some trickery to make mediasoup raw files end up in the
same directory as KMS to reduce changes, but it ended up being too dirty.
I am adding a third directory (/var/mediasoup) to be tracked by the rap scripts
which is where the new raw files end up in.
2021-10-04 17:33:18 +00:00
Lucas Fialho Zawacki
47a20ffa01 feature(external-video): New external video icon 2021-10-04 17:22:13 +00:00
Anton Georgiev
c0beede63b
Merge pull request #13335 from prlanzarin/u24-white-rabbit
chore(webrtc): let the server generate subscriber offers by default (backports #13254)
2021-10-04 12:58:50 -04: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