Commit Graph

27830 Commits

Author SHA1 Message Date
Richard Alam
aee44736a1
Merge pull request #10511 from pedrobmarin/secure-jsessionid
Add secure tag to bbb-web JSESSIONID cookie
2020-09-22 15:34:52 -04:00
Pedro Beschorner Marin
a98c4b68b5 Add secure tag to bbb-web JSESSIONID cookie
Revert this to make whatever you want when running bbb-web without https
2020-09-22 16:11:53 -03:00
Pedro Beschorner Marin
a7e1623619 Option to prevent eject users by permission violation
PermissionCheck verifies ejectOnViolation before eject an user
2020-09-22 15:13:15 -03:00
Anton Georgiev
3c6c1f5b7c
Merge pull request #10504 from jfsiebel/prevent-ejected-user-validate-auth-token-spam
Prevent validateAuthToken spamming for ejected users
2020-09-21 16:36:36 -04:00
Anton Georgiev
f60ec758da
Merge pull request #9979 from Tainan404/move-guest-wait
Move guest wait
2020-09-21 16:29:17 -04:00
Anton Georgiev
124b2d9b51
Merge branch 'develop' into move-guest-wait 2020-09-21 16:28:59 -04:00
Joao Siebel
a3cf7cd98e Prevent validateAuthToken spamming.
If an ejected user tries to enter in the meeting using the current url
html5 client keep trying to validate that user, but without success
causing a validateAuthToken message spam until the connection times out.
2020-09-21 15:50:54 -03:00
Anton Georgiev
69ee2e59c6
Merge pull request #10502 from daminebenq/adds-missing-video-mirroring-data-tests
adds missing webcam video mirroring data-test
2020-09-21 11:18:53 -04:00
Mohamed Amine Ben Salah
c87d1cacbf adds missing webcam video mirroring data-test 2020-09-21 12:07:57 -03:00
Anton Georgiev
00656ddf63 Removed unused bowser.js 2020-09-21 14:31:32 +00:00
Pedro Beschorner Marin
d6c297fb23
Merge pull request #10499 from antobinary/test-avatars-3
Moved the default avatar.png to be part of bigbluebutton-html5/
2020-09-21 10:32:59 -03:00
Anton Georgiev
918f58b343 Moved the default avatar.png to be part of bigbluebutton-html5/ 2020-09-21 12:24:12 +00:00
Anton Georgiev
d5450af5df
Merge pull request #10458 from pedrobmarin/avatar-image
Support for avatar images
2020-09-21 08:22:04 -04:00
Anton Georgiev
2cd250bfa2
Merge pull request #10493 from jfsiebel/fix-save-user-names
Fix last name sort function for save user names
2020-09-21 08:14:02 -04:00
Joao Siebel
6a139aa224 Fix last name sort function for save user name 2020-09-18 18:05:31 -03:00
Joao Siebel
b2adffa4c2 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-09-18 16:30:20 -03:00
Anton Georgiev
7df17504e6
Merge pull request #10491 from antobinary/09-18
Remove maxInactivity added in merge from 2.2.24
2020-09-18 14:19:00 -04:00
Anton Georgiev
f2c307932f Remove maxInactivity added in merge from 2.2.24 2020-09-18 18:12:42 +00:00
Anton Georgiev
c48842dc24
Merge pull request #10482 from antobinary/09-16-merge
Pulled 2.2.24 and 2.2.25 back into 'develop'
2020-09-17 10:51:22 -04:00
Anton Georgiev
c191cb0f77
Merge pull request #10480 from KDSBrowne/2.2-issue-10479
Show names in Saved users name list as they were entered
2020-09-17 10:44:37 -04:00
Anton Georgiev
377dc27a8d Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 09-16-merge 2020-09-17 14:37:28 +00:00
KDSBrowne
239a29a341 switch sortName to name prop (shows list as names were entered) 2020-09-17 13:26:38 +00:00
Fred Dixon
12d6007799
Merge pull request #10473 from ffdixon/always-gen-certificate
Always generate certificate for Kurento
2020-09-16 10:20:54 -04:00
Fred Dixon
869a4a5c59
Merge branch 'v2.2.x-release' into always-gen-certificate 2020-09-16 10:20:28 -04:00
Fred Dixon
7867bcf725 Always generate certificate for Kurento 2020-09-16 09:17:31 -05:00
Fred Dixon
4859ff6791
Merge pull request #10471 from ffdixon/bump-2.2.25
Bump to 2.2.25
2020-09-16 09:45:07 -04:00
Fred Dixon
0d5dbd87b9 Bump to 2.2.25 2020-09-16 08:41:19 -05:00
Fred Dixon
c4628a8270
Merge pull request #10469 from ffdixon/fix-dtls-path2
Ensure the path is always updated
2020-09-16 09:34:30 -04:00
Fred Dixon
8df5637c56 Ensure the path is always updated 2020-09-16 08:32:08 -05:00
Fred Dixon
038952b810
Merge pull request #10468 from ffdixon/fix-dtls-path
Fix dtls path
2020-09-16 09:28:08 -04:00
Fred Dixon
1ad1bb0529 Fix #10467 2020-09-16 08:25:06 -05:00
Fred Dixon
fcd3d23126 Fix #10467 2020-09-16 08:23:53 -05:00
Joao Siebel
087939855e fix some problems with using same user in multiple tabs 2020-09-16 09:52:44 -03:00
Pedro Beschorner Marin
e2adf24546 Support for avatar images
Use the former Flash client avatarURL join param to replace the name
initials avatar from the user list, chat, waiting guests and connection
status list.

It is possible to define a defaultAvatarURL at bbb-web and enable/disable it
2020-09-15 16:50:10 -03:00
Anton Georgiev
b522dddb44
Merge pull request #10460 from bigbluebutton/antobinary-patch-1
Added shortcuts for enableHTML5CameraQualityThresholds and enableHTML…
2020-09-15 14:48:24 -04:00
Anton Georgiev
612f37fa2b
Added shortcuts for enableHTML5CameraQualityThresholds and enableHTML5WebcamPagination
Added shortcuts for enableHTML5CameraQualityThresholds and enableHTML5WebcamPagination
2020-09-15 14:45:25 -04:00
Fred Dixon
e7d2190f15
Merge pull request #10457 from ffdixon/fix-bbb-conf-2
properly update ESL password
2020-09-14 17:22:09 -04:00
Fred Dixon
8c21eca5dd properly update ESL password 2020-09-14 16:19:46 -05:00
Anton Georgiev
a2da973cc4
Merge pull request #10455 from antobinary/close-br-on-click-ok
In Breakouts close the tab if the user intentionally selects Leave -> OK
2020-09-14 14:13:46 -04:00
Anton Georgiev
b26e26095e In Breakouts, Leave -> OK now closes tab 2020-09-14 11:21:11 -04:00
Fred Dixon
39ed2c3872
Merge pull request #10449 from ffdixon/bbb-conf-multiple-kurento
Enable three parallel KMS servers
2020-09-13 12:44:24 -04:00
Fred Dixon
0368dd2c1a Add option for three parallel KMS servers 2020-09-13 11:38:22 -05:00
Fred Dixon
073a63827a Add option for three parallel KMS servers 2020-09-13 11:36:07 -05:00
Fred Dixon
3c37babfeb Add option for three parallel KMS servers 2020-09-13 10:47:28 -05:00
Anton Georgiev
fa45feb7f9
Merge pull request #10440 from prlanzarin/upstream-2.2-arfm2
audio-manager: shortcut on setSenderTrackEnabled when in listen only
2020-09-12 07:39:21 -04:00
prlanzarin
b0ccaf330f audio-manager: shortcut on setSenderTrackEnabled when in listen only mode 2020-09-11 23:06:56 +00:00
Anton Georgiev
df62c46c1f
Merge pull request #10438 from Tainan404/issue-10436
Fix misalign in presenter useritem
2020-09-11 14:36:19 -04:00
Tainan Felipe
9275fd3922 Fix misalign in presenter useritem 2020-09-11 15:00:14 -03:00
Anton Georgiev
1d86d0ea80
Merge pull request #10341 from vitormateusalmeida/issue-10339
Fix bug when alternate panel. Fix external video size
2020-09-11 09:18:10 -04:00
Anton Georgiev
33a71e5f67
Merge pull request #10218 from Tainan404/unsafe-media-and-presentation-components
Remove unsafe lifecycle from all media and presentation components
2020-09-10 15:23:48 -04:00