Commit Graph

6601 Commits

Author SHA1 Message Date
Pedro Beschorner Marin
7ab3d9a386 Check video data savings to set presentation max-height 2020-08-18 16:41:18 -03:00
prlanzarin
28e826118a video-provider: first version of video pagination 2020-08-18 17:00:47 +00:00
KDSBrowne
3042d90bc4 fix user item dropdown menus not closing 2020-08-18 16:17:58 +00:00
KDSBrowne
bf4dece99f add sortByWhiteboardAccess to users in userlist 2020-08-18 15:18:20 +00:00
KDSBrowne
423a5fd1c2 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-per-user-wb 2020-08-17 17:13:36 +00:00
KDSBrowne
e596bfaefd add per user functionality to multi user whiteboard 2020-08-17 17:03:23 +00:00
KDSBrowne
fbeaf87dbd localize the dropdown values for webcam quality 2020-08-17 16:19:45 +00:00
KDSBrowne
9f8661bc15 remove mute / unmute / clear chat options for breakoutrooms 2020-08-14 17:13:51 +00:00
Pedro Beschorner Marin
26fcb97dd9 Fix shared notes and closed captions header button style
Also adds a little more visibility and well-deserved credit to Etherpad's project
2020-08-14 11:32:52 -03:00
Tainan Felipe
c9d75a15f8
Update bigbluebutton-html5/imports/startup/server/index.js
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2020-08-12 17:15:16 -03:00
Anton Georgiev
b03f29497f
Merge pull request #8926 from Tainan404/virtualized-userlist
Virtualized user list
2020-08-12 14:12:48 -04:00
Anton Georgiev
e9e5feac76
Merge pull request #10194 from KDSBrowne/issue-9861
Allow polling when presentation does not exist but chat is available
2020-08-12 13:45:05 -04:00
Anton Georgiev
5be5aed1d9 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12 2020-08-12 17:12:58 +00:00
Tainan Felipe
939fdd9b52 Merge remote-tracking branch 'upstream/develop' into virtualized-userlist 2020-08-12 11:24:36 -03:00
Tainan Felipe
0453533256 Remove unecessary function reference 2020-08-12 11:20:02 -03:00
KDSBrowne
c6bb65b24b prevent user creating textarea too small for text 2020-08-11 14:54:29 +00:00
KDSBrowne
76a98459c8 backport #8484 from 2.3 to 2.2 2020-08-11 14:51:59 +00:00
prlanzarin
c524abf05b video-provider: normalize hidden cameraProfiles constraints
Also add some inlined docs to settings.yml
2020-08-11 14:51:50 +00:00
KDSBrowne
cace862c01 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into issue-9861 2020-08-11 14:06:02 +00:00
Anton Georgiev
9bdaf3960b
Merge pull request #10195 from KDSBrowne/dev2.3-fix-poll-chat-grouping
Improve poll results in public chat
2020-08-11 09:53:53 -04:00
Anton Georgiev
0745ea00dd
Merge pull request #10231 from KDSBrowne/issue-10041
Notify users when presentation is available for download
2020-08-11 09:52:55 -04:00
Anton Georgiev
9aefa76ded allow more tags in welcome message/ mod only message 2020-08-10 16:59:09 -04:00
Anton Georgiev
396233fe0d Improve log for parsed passed parameter error 2020-08-10 15:54:58 -04:00
Anton Georgiev
c7b4c570af remove muteAll and muteAllExceptPresenter from breakouts 2020-08-10 12:50:32 -04:00
KDSBrowne
c9078db2b4 update value used in padding 2020-08-10 13:10:13 +00:00
KDSBrowne
bb22ab84fc add download link to current presentation toast 2020-08-10 12:51:06 +00:00
Tainan Felipe
35cfd510c3 Remove unsafe lifecycle from intl component 2020-08-07 17:46:04 -03:00
Tainan Felipe
1fedde7d8f Remove unsafe lifecycle from all dropdown related components 2020-08-07 17:43:33 -03:00
Tainan Felipe
cf1d0cedef Remove unsafe lifecycle from all madia and presentation related components 2020-08-07 17:32:46 -03:00
Anton Georgiev
6676f455c1
Merge pull request #10196 from KDSBrowne/issue-10170
Update filenames for saved public chat / users list
2020-08-07 13:28:44 -04:00
Anton Georgiev
247861f549
Merge pull request #10213 from prlanzarin/upstream-2.2-vpeg-dynprof
video-provider: dynamic video profiles (aka automatic bitrate/frame rate throttling)
2020-08-07 13:20:56 -04:00
Anton Georgiev
08a83755e4
Merge pull request #10212 from prlanzarin/upstream-2.2-vpeg-ui
video-provider: UI improvements
2020-08-07 13:20:07 -04:00
Anton Georgiev
9c9b8c9772
Merge pull request #10208 from prlanzarin/upstream-2.2-vpeg-base-extra
Backport PRs #8374 and its follow-ups #8888 and #8758 into 2.2
2020-08-06 16:57:41 -04:00
Anton Georgiev
3a0693505a
Merge pull request #10189 from jfsiebel/restore-inactivity-check-modal
Restore activity check modal.
2020-08-05 14:40:01 -04:00
Joao Siebel
32b25ce70e simplify code 2020-08-05 14:16:41 -03:00
KDSBrowne
84af0bc0cc improve panoptoMATCH_URL regex (more generic) 2020-08-05 17:08:57 +00:00
CristianSilvaGrosseli
378a355316 fix displaced audio icon. 2020-08-05 17:05:47 +00:00
CristianSilvaGrosseli
da2e947cf4 added ellipsis property to video user name. 2020-08-05 17:05:23 +00:00
prlanzarin
d18fa5d758 video-provider: fix safari overflow issue and properly fill height with placeholder
kudos @pedrobmarin
2020-08-05 17:02:59 +00:00
prlanzarin
67194618b8 video-provider: revert videoListItem max-height change
I did it to force the placeholder to fill the grid, but it turns out it botches Safari and I dont know how to fix it yet
2020-08-05 17:02:54 +00:00
prlanzarin
147e7b2105 video-provider: further cleanup to stylesheet 2020-08-05 17:02:23 +00:00
prlanzarin
dc194eafdf screenshare: move loading spinner css to media and restore it 2020-08-05 17:02:08 +00:00
prlanzarin
39e9c2f6e0 fullscreen-button: remove border-radius 2020-08-05 17:01:56 +00:00
prlanzarin
dd32a669dc video-provider: revert formatting changes from commit 0ca68b4 2020-08-05 17:01:45 +00:00
prlanzarin
03a51611a2 video-provider: UI/style updates
- No more border radius in video containers, fullscreen buttons or user info span

Reduced the spacing between cameras to 1px

Replaced the loading spinners with a black background and the user name at the center

- Changed the color of the talking indicator to be the primary color with 0.7 opacity

Make the user name in the video container have opacity 1

Fix: make the webcam containers be 4:3 even while loading
2020-08-05 17:01:15 +00:00
prlanzarin
1d52b158f8 video-provider: fix safari resolution change on applyConstraints, only reapply bitrate when needed 2020-08-05 16:56:18 +00:00
prlanzarin
642de5076a video-provider: first, simplified version of dynamic camera profile control 2020-08-05 16:55:41 +00:00
prlanzarin
44b1734b4e video-preview: add the option to hide camera profiles from UI 2020-08-05 16:37:30 +00:00
Pedro Beschorner Marin
7b3505acff Enumerating devices after video preview gUM 2020-08-05 15:06:44 +00:00
Pedro Beschorner Marin
40908a51a8 Postponing get from user settings 2020-08-05 14:56:20 +00:00
prlanzarin
fab6d96769 video-provider: reimplement PR #9407
Some weird merged regressed #9407 when merging 2.2 in 2.3, and backporting the VP from 2.3 to 2.2 reintroduced the issue, so I reimplemented it
2020-08-05 14:35:08 +00:00
Pedro Beschorner Marin
b74bd0283e Fix webcamsOnlyForModerator 2020-08-05 14:32:51 +00:00
Pedro Beschorner Marin
4d5d0ad8b4 Multiple webcams stop all button 2020-08-05 14:23:34 +00:00
prlanzarin
dac3259c48 Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base 2020-08-05 14:20:58 +00:00
KDSBrowne
e399fe92ba update filenames for saved public chat / users list 2020-08-04 13:27:32 +00:00
KDSBrowne
4ef489795c Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into issue-9861 2020-08-04 12:59:30 +00:00
Stefan Weil
1d3d31107e Fix regular expression in Arc Player (LGTM)
LGTM report:

    The escape sequence '\.' is equivalent to just '.', so the sequence may
    still represent a meta-character when it is used in a regular expression.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-08-04 08:28:36 +02:00
KDSBrowne
9dcd3b3f61 remove const function and move into export 2020-08-03 21:35:12 +00:00
Joao Siebel
6987ab988c Restore activity check modal.
If activity check was enabled in server, the activity check modal wasn't showed
to users and after a given time the user was disconnect, also fix the meeting-end
and error-screen messages, informing the user the reason why he was kicked.
2020-08-03 09:44:21 -03:00
Anton Georgiev
6fe9990c1e
Merge pull request #10172 from KDSBrowne/2.2-fix-sr-poll-access
Add aria-label to whiteboard poll result
2020-07-31 15:20:19 -04:00
KDSBrowne
7f7e24bfb4 prevent negative values being supplied to svg height / width 2020-07-31 14:19:28 +00:00
KDSBrowne
f409e912b1 add aria-label to whiteboard poll result 2020-07-31 13:20:48 +00:00
Anton Georgiev
0d6faa0b57 only allow for https uri in welcome and modOnly messages 2020-07-29 16:08:47 -04:00
Anton Georgiev
2c32608cd5 allow for img tag in welcome and modOnly messages 2020-07-29 15:09:15 -04:00
Pedro Beschorner Marin
ab31861544 Add a minimum socket validation to full-audio connection 2020-07-29 15:51:19 -03:00
Anton Georgiev
b9902eceac
Merge pull request #10148 from pedrobmarin/full-audio-socket-check
Add a minimum socket validation to full-audio connection
2020-07-29 13:13:30 -04:00
Pedro Beschorner Marin
19e301e28e Add a minimum socket validation to full-audio connection 2020-07-29 13:10:17 -03:00
Anton Georgiev
49cec4ca16
Merge pull request #10146 from antobinary/sanitize
Sanitized modOnlyMessage prior to using it
2020-07-29 11:58:13 -04:00
Anton Georgiev
45c2368a3c Pulled HTML5 locales on July 29, 2020 2020-07-29 11:54:21 -04:00
Anton Georgiev
1ea72ccb95 sanitize modOnlyMessage in html5 client 2020-07-29 11:31:00 -04:00
Anton Georgiev
570f482d4c
Merge pull request #10144 from vitormateusalmeida/layout-manager-2
Add Layout Context and Layout Manager
2020-07-29 10:00:59 -04:00
KDSBrowne
6872a07d04 fix chat poll result calculation to match whiteboard 2020-07-28 19:22:05 +00:00
Anton Georgiev
c6669d1d7a
Merge branch 'develop' into move-guest-wait 2020-07-28 13:50:04 -04:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219 2020-07-28 13:28:32 -03:00
Anton Georgiev
55d8d4b199
Merge pull request #9529 from Tainan404/issue-9128
Rework locales list generation
2020-07-28 11:10:38 -04:00
Anton Georgiev
7744817130
Merge branch 'develop' into issue-9647 2020-07-28 10:48:13 -04:00
Anton Georgiev
6a738a43d5
Merge pull request #8464 from KDSBrowne/add-upload-toast
Non-blocking presentation upload
2020-07-28 10:40:41 -04:00
Anton Georgiev
b87b619fdd
Merge pull request #9964 from KDSBrowne/dev2.3-raise-hand-toast
Improve toast notification for raised hands
2020-07-28 10:29:21 -04:00
KDSBrowne
1ad09b7046 fix poll chat message grouping / unread counter not updating for polls 2020-07-28 12:55:21 +00:00
Anton Georgiev
4456a4db1f move sanitazing of welcome message to backend 2020-07-27 16:33:10 -04:00
Vitor Mateus De Almeida
be3bfd620a Merge remote-tracking branch 'upstream/v2.2.x-release' into sanitize-data-v2.2 2020-07-27 16:13:20 -03:00
Vitor Mateus De Almeida
3ef0771d58 Add tag br in whitelist 2020-07-27 16:12:31 -03:00
Vitor Mateus De Almeida
fa9e5ca819 Fix error when join a new meeting 2020-07-23 18:14:31 -03:00
Vitor Mateus De Almeida
ed8b3adb0b Merge remote-tracking branch 'upstream/develop' into layout-manager-2 2020-07-23 16:54:50 -03:00
Anton Georgiev
321942e2ed
Merge pull request #10089 from vitormateusalmeida/sanitize-data-v2.2
Sanitize data in addUser
2020-07-23 10:23:35 -04:00
KDSBrowne
c9215ca14d Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into issue-10072 2020-07-22 22:09:03 +00:00
KDSBrowne
0877045696 fix tooltips not displaying when presentation is fullscreen 2020-07-22 22:08:55 +00:00
Anton Georgiev
254b0c2cb7
Merge pull request #10108 from KDSBrowne/issue-10058
Fix TypeError: Cannot read property 'map' of undefined
2020-07-22 09:58:10 -04:00
Anton Georgiev
394ccce435
Merge pull request #8758 from pedrobmarin/multiple-cam-stop-all-button
Multiple webcams stop all button
2020-07-22 09:57:23 -04:00
KDSBrowne
4373d613ec Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-07-22 13:55:28 +00:00
KDSBrowne
b861664fa8 fix map of undefined error 2020-07-21 16:59:43 +00:00
Mohamed Amine Ben Salah
a51105fab3 fix shared notes automated test 2020-07-20 18:19:24 -03:00
Vitor Mateus De Almeida
8f73055e6d Fix lodash import 2020-07-20 16:24:55 -03:00
Vitor Mateus De Almeida
43bb1f9254 Fix webcams bug in screenshare 2020-07-20 16:24:32 -03:00
Vitor Mateus De Almeida
cc5df5b748 Fix visual bug 2020-07-20 16:24:17 -03:00
Vitor Mateus De Almeida
c373c86c62 Fix negative value error when chnge placement 2020-07-20 16:24:02 -03:00
Vitor Mateus De Almeida
f7c89458ca Fix visual bug when change webcams placement 2020-07-20 16:23:49 -03:00
Vitor Mateus De Almeida
038c7d8929 Fix wrong width for camera/screenshare 2020-07-20 16:23:39 -03:00
Vitor Mateus De Almeida
90987f8878 Fix resizing bar bug 2020-07-20 16:23:28 -03:00
Vitor Mateus De Almeida
c69d89452f Fix webcams overlap isTalking indicator 2020-07-20 16:23:15 -03:00
Vitor Mateus De Almeida
4d61aefa78 Fix exception when screenshare is running 2020-07-20 16:23:02 -03:00
Vitor Mateus De Almeida
34108014f9 Fix exceptions and layout size when panels change 2020-07-20 16:22:41 -03:00
Vitor Mateus De Almeida
506aae4a50 Fix webcams area auto adjust when minimize presentation 2020-07-20 16:21:15 -03:00
Vitor Mateus De Almeida
902be96ad9 Fix NaN exception 2020-07-20 16:20:56 -03:00
Vitor Mateus De Almeida
f57bacd8b7 When disable autoarrange keep layout as is 2020-07-20 16:19:11 -03:00
Vitor Mateus De Almeida
b82587bac0 Fix Inconsistent resize behaviour 2020-07-20 16:18:56 -03:00
Vitor Mateus De Almeida
1a112114f1 Layout doesn't change when pass a slide 2020-07-20 16:18:42 -03:00
Vitor Mateus De Almeida
a4393c0191 fix enable autoarrange doesn't work correctely 2020-07-20 16:18:26 -03:00
Vitor Mateus De Almeida
d6938f1d69 fixing automatically placement 2020-07-20 16:18:06 -03:00
Vitor Mateus De Almeida
ae29ba58c1 Fixes 2020-07-20 16:17:40 -03:00
Vitor Mateus
ecc8f4a056 wip 2020-07-20 16:16:39 -03:00
Vitor Mateus
b93e99b1c3 Fix presentation size 2020-07-20 16:14:54 -03:00
Vitor Mateus
a9037224c7 calculates layout optimization 2020-07-20 16:14:25 -03:00
Vitor Mateus
e2db60e662 WIP Resizable works fine 2020-07-20 16:11:09 -03:00
Vitor Mateus
297154f78a The presentation gets the size from the layout manager 2020-07-20 16:02:53 -03:00
Vitor Mateus
7f095c1cad Create layout context and add a layout manager 2020-07-20 15:48:54 -03:00
KDSBrowne
0fdd1dc978 allow start / stop of polls with no presentation 2020-07-20 14:34:46 +00:00
KDSBrowne
f45af628d6 fix screen share cropping on chrome 2020-07-19 21:53:59 +00:00
Mohamed Amine Ben Salah
f1e3d28127 fixes notifications automated test 2020-07-17 16:13:47 -03:00
Vitor Mateus De Almeida
da570ca002 Sanitize data in message 2020-07-17 15:36:30 -03:00
Vitor Mateus De Almeida
6cb28a6574 Sanitize data in addUser 2020-07-17 12:08:02 -03:00
KDSBrowne
df1486fabf Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-07-16 12:12:42 +00:00
KDSBrowne
8a9430bf26 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into issue-9647 2020-07-16 12:05:44 +00:00
KDSBrowne
600c41142a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into dev2.3-raise-hand-toast 2020-07-16 11:59:38 +00:00
Anton Georgiev
21b6def708
Revert "Replace unsafe react lifecycle methods" 2020-07-15 15:52:34 -04:00
Anton Georgiev
7535e6fa59
Revert "Create layout context and add a layout manager" 2020-07-15 12:44:59 -04:00
Joao Siebel
ee3d6a0a1d Clear private messages on meeting end 2020-07-14 16:51:06 -03:00
Anton Georgiev
7d75843140
Fix a forgotten line left while resolving conflict 2020-07-14 11:19:11 -04:00
Anton Georgiev
6fba72f282
Merge pull request #10061 from KDSBrowne/issue-9986
Auto select default.pdf after deleting the current presentation
2020-07-14 10:36:44 -04:00
Anton Georgiev
b9b4490d8c
Merge branch 'develop' into layout 2020-07-14 10:32:24 -04:00
Anton Georgiev
e48306431a
Merge pull request #9498 from Tainan404/issue-8744
Replace unsafe react lifecycle methods
2020-07-14 10:30:37 -04:00
KDSBrowne
f063fedb9c auto select default.pdf if no actual current / new current active on delete 2020-07-14 13:49:00 +00:00
Anton Georgiev
1ea076a940
Merge pull request #10024 from antobinary/breakouts-url
Ensure getURL value for breakout before redirecting
2020-07-10 13:59:23 -04:00
Anton Georgiev
c763041285 Adjust check for User.loggedOut to prevent errors 2020-07-10 13:45:37 -04:00
Anton Georgiev
9f5158a525 Merge branch 'custom-parameters-breakout-rooms' of github.com:jfsiebel/bigbluebutton into locales-2020-07-10 2020-07-10 11:21:53 -04:00
wolbernd
57eeb43a3b
Make List of waiting users scrollable 2020-07-10 10:08:09 +02:00
Anton Georgiev
bc55bc0d41 ensure getURL value for breakout before redirecting 2020-07-09 16:53:42 -04:00
Anton Georgiev
fad56de143
Merge pull request #9966 from lfzawacki/v2.2.x-release
Implement a simple Panopto external video player
2020-07-09 16:26:25 -04:00
Vitor Mateus De Almeida
7f7e96ee79 Drop webcam when join a breakout room by clicking 'Join room' 2020-07-09 16:49:42 -03:00
prlanzarin
1dbafffa26 audio: make listen only call timeout configurable 2020-07-09 18:02:18 +00:00
prlanzarin
0f8b27d2d8 video-provider: make camera timeouts configurable
Also add missing settings.yml val for wsConnectionTimeout
2020-07-09 17:53:24 +00:00
prlanzarin
72a67bdd63 video-provider: make reconn websocket connectionTimeout configurable
Keep the default value (current) in settings.yml
2020-07-09 17:50:04 +00:00
Anton Georgiev
420f8bf0a4 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-2.3-july-6 2020-07-07 14:13:58 +00:00
Vitor Mateus De Almeida
06329e9442 Fix lodash import 2020-07-06 16:11:37 -03:00
Vitor Mateus De Almeida
880963e0e7 Merge remote-tracking branch 'upstream/develop' into layout 2020-07-06 13:36:38 -03:00
Vitor Mateus De Almeida
fdcfd39f04 Merge remote-tracking branch 'upstream/master' into layout 2020-07-06 12:44:47 -03:00
Vitor Mateus De Almeida
9a08349b36 Fix webcams bug in screenshare 2020-07-06 11:35:11 -03:00
Vitor Mateus De Almeida
cd289a47c3 Fix visual bug 2020-07-06 09:58:50 -03:00
KDSBrowne
bd0bec8c0b only show raise hand setting / toast for moderators 2020-07-06 12:56:19 +00:00
Vitor Mateus De Almeida
1f0aaa71bb Fix negative value error when chnge placement 2020-07-03 15:49:28 -03:00