Michael Zinsmeister
06707de4f3
Merged upstream develop branch
2021-03-14 22:19:25 +01:00
Michael Zinsmeister
b99bd3be0c
Merged upstream develop branch
2021-03-14 22:17:19 +01:00
Anton Georgiev
50036fb39c
Merge pull request #11639 from antobinary/march-12
...
bbb-html5: Update npm versions
2021-03-12 16:35:56 -05:00
Anton Georgiev
e475403e9a
bbb-html5: Update npm versions
2021-03-12 21:28:12 +00:00
Anton Georgiev
b3d3fe02c3
Merge pull request #11638 from antobinary/march-12
...
Pulled HTML5 locales on March 12, 2021
2021-03-12 16:19:26 -05:00
Anton Georgiev
59cb2f107f
Pulled HTML5 locales on March 12, 2021
2021-03-12 21:17:53 +00:00
Fred Dixon
c2748e2cac
Enable pagination by default
2021-03-12 14:50:01 -06:00
Anton Georgiev
e673fb2cf4
Merge pull request #11630 from prlanzarin/u23-sculptor
...
listenonly,video-provider,screenshare: remove ICE gathering pre-flight check
2021-03-12 12:58:43 -05:00
Anton Georgiev
7ffc35191f
Merge pull request #11634 from pedrobmarin/dynamic-guest-policy
...
Dynamic guest policy
2021-03-12 08:45:12 -05:00
Pedro Beschorner Marin
dbb19b79a4
Avoid guest policy change inside breakout rooms
2021-03-12 09:56:04 -03:00
Pedro Beschorner Marin
defc33a043
Removed callback from setGuestPolicy
2021-03-12 09:22:08 -03:00
Lucas Zawacki
07b51a6bf0
Correctly set guestPolicy to not overwrite userProps
2021-03-12 09:19:53 -03:00
Pedro Beschorner Marin
af64232e45
Change guest policy
2021-03-12 09:19:22 -03:00
Anton Georgiev
6d6e1885dd
Merge pull request #11632 from prlanzarin/u23-car-song
...
listen only: remove the old silent audio autoplay workaround (#11115 )
2021-03-12 05:35:12 -05:00
Anton Georgiev
3fbb40875f
Merge pull request #11631 from prlanzarin/u23-planZETA
...
audio: make sdpSemantics configurable
2021-03-12 05:34:10 -05:00
Anton Georgiev
9f841bd64b
Merge pull request #11622 from prlanzarin/u23-ilgiardino
...
[screenshare] Rewrite SFU/Kurento screensharing bridge (+reconnections|audio sharing|QoL, was #11025 )
2021-03-12 05:13:11 -05:00
prlanzarin
da0a3c36af
listen only: remove the old silent audio autoplay workaround
...
The underlying webkit autoplay issues were properly tackled a long time ago now; this thing isnt needed anymore
Also took the liberty to remove the whole create listen only stream thing because it`s useless
2021-03-12 03:39:12 +00:00
prlanzarin
f20fb3eef2
audio: make sdpSemantics configurable
...
Plan B is going to be phased out of Chrome soon and we should be testing it with unified plan
2021-03-12 03:04:55 +00:00
prlanzarin
ab17b10c38
listenonly,video-provider,screenshare: remove ICE gathering pre-flight check
2021-03-12 02:51:45 +00:00
Fred Dixon
13de1dc7dc
Merge pull request #11628 from ffdixon/update-apply-lib2
...
Added detectio for /etc/bigbluebutton/bbb-web.properties
2021-03-11 22:33:18 -04:00
Fred Dixon
fd2d11ca64
Added detectio for /etc/bigbluebutton/bbb-web.properties
2021-03-11 20:32:00 -06:00
prlanzarin
35f519206b
Revert additional indentation to actions-bar component
...
I must have messed this up in the 2.2 - 2.3 merge or with vim somehow, mea culpa
2021-03-12 01:47:05 +00:00
prlanzarin
ef4ad8820d
screenshare: adapt shutdown on breakout room joins, only stop sharers
...
Adapted the breakout room screen sharing shutdown to use the new refactor calls
Also changed the behaviour a bit to only trigger the stop code for presenters/sharers, mimicking the camera behaviour and not leaving viewer with stuck screens
2021-03-12 01:31:46 +00:00
prlanzarin
775cbf4124
screenshare: move end alert sound to a reliable place
2021-03-12 00:44:38 +00:00
Anton Georgiev
a165d3a7e3
Merge pull request #11606 from prlanzarin/u22-sadl1
...
video-provider: add video pagination UI toggle (was #10970 )
2021-03-11 16:05:33 -05:00
Anton Georgiev
5c9314d582
Merge pull request #11623 from ramonlsouza/fix-open-panel
...
Fix captions and guest list openPanel error
2021-03-11 15:35:08 -05:00
Anton Georgiev
8726994fdd
Merge pull request #11624 from ramonlsouza/locale-typo
...
Fix poll response text typo
2021-03-11 15:29:27 -05:00
Ramon Souza
edb6ff9455
fix typo
2021-03-11 17:22:46 -03:00
Ramon Souza
17cfd8c9bd
fix guest openPanel
2021-03-11 17:00:54 -03:00
Ramon Souza
55a2bc2d02
fix captions openPanel
2021-03-11 16:12:35 -03:00
prlanzarin
7eb91f9273
Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino
2021-03-11 18:49:14 +00:00
Anton Georgiev
73979f1cba
Merge pull request #11621 from ramonlsouza/fix-captions
...
Fix locales url settings + captions locales order
2021-03-11 13:44:56 -05:00
Ramon Souza
150bedf16d
fix locales url settings + captions locales order
2021-03-11 15:33:48 -03:00
Anton Georgiev
8a640877b2
Merge pull request #11611 from BrentBaccala/audio-prompt
...
don't prompt for "Microphone" if that's the only option presented to the user
2021-03-11 13:27:31 -05:00
Anton Georgiev
dff0f8b0e6
Merge pull request #11589 from abautu/2483-speedup-record-processing
...
Recording processing using MP4/OGG temporary files, stream copy, and …
2021-03-11 13:27:00 -05:00
Anton Georgiev
9cc78ca4a5
Merge pull request #11620 from ramonlsouza/issue-11578
...
Submit typed polling response by pressing enter
2021-03-11 13:01:22 -05:00
Anton Georgiev
6a96bbfb93
Merge pull request #11612 from prlanzarin/u23-planF
...
video-provider: add inbound/recvonly video reconnection (was #11233 )
2021-03-11 13:00:14 -05:00
Ramon Souza
15fccf0ba1
submit typed polling response by pressing enter
2021-03-11 14:45:48 -03:00
Anton Georgiev
4f2f0d123d
Merge pull request #11596 from Tainan404/fix-chat-issues
...
re-implement chat sync and fix stucked loading indicator
2021-03-11 12:29:01 -05:00
Anton Georgiev
dd790e8c87
Merge pull request #11607 from aron-2809/user-logged-out
...
User logged out ValidateAuthToken retracted
2021-03-11 11:59:14 -05:00
Aron Engineer
b8e886e050
Merge branch 'user-logged-out' of github.com:aron-2809/bigbluebutton into user-logged-out
2021-03-11 14:32:30 +00:00
Aron Engineer
625c4962a0
feat: ValidateAuthToken revoked when user is logged out, reason added to response message
2021-03-11 14:32:01 +00:00
Aron Engineer
56a2ff5df8
feat: User modified to add logged out attribute
2021-03-11 14:32:01 +00:00
Joao Siebel
c9650ba8f1
Inform akka that user intentionality logged out from meeting
2021-03-11 14:32:01 +00:00
Tainan Felipe
87ebdbd02a
Merge remote-tracking branch 'upstream/develop' into fix-chat-issues
2021-03-11 10:07:16 -03:00
Tainan Felipe
1c21fcc4ff
Fix loading on clear
2021-03-11 10:02:16 -03:00
prlanzarin
d00e8e0436
Merge remote-tracking branch 'origin/develop' into u22-sadl1
2021-03-11 12:31:10 +00:00
Ramón Souza
0105373cee
Applies changes needed to serve locale files as static content ( #11234 )
...
* moving locales folder to /public and applying changes needed to serve locales as static files
* better dev/prod check
* transifex pull script changes to match new locales directory + ignore locales with less than 100 lines
* fix local/prod locales path
* merge fallback messages
* applies new locale changes to legacy client
`bbb-html5.nginx` file content should also be changed to the following:
```
location /html5client/locales {
alias /usr/share/meteor/bundle/programs/web.browser/app/locales;
}
location /html5client/compatibility {
alias /usr/share/meteor/bundle/programs/web.browser/app/compatibility;
}
location /html5client/resources {
alias /usr/share/meteor/bundle/programs/web.browser/app/resources;
}
location /html5client/svgs {
alias /usr/share/meteor/bundle/programs/web.browser/app/svgs;
}
location /html5client/fonts {
alias /usr/share/meteor/bundle/programs/web.browser/app/fonts;
}
location /html5client {
# proxy_pass http://127.0.0.1:4100 ; # use for development
proxy_pass http://poolhtml5servers ; # use for production
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
}
```
2021-03-11 06:42:41 -05:00
Brent Baccala
e5e3b5532b
don't prompt for "Microphone" if that's the only option presented to the user
2021-03-10 16:44:41 -05:00
Anton Georgiev
c280769ebf
Merge pull request #11559 from MaximKhlobystov/dragndrop-poll-23
...
Editing poll options via drag and drop
2021-03-10 16:40:00 -05:00
