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
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
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
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
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
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
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
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
Vitor Mateus De Almeida
8cf7dee86c
Fix visual bug when change webcams placement
2020-07-02 10:28:36 -03:00
Vitor Mateus De Almeida
b1fd56ebfa
Fix wrong width for camera/screenshare
2020-07-02 08:19:30 -03:00
Pedro Beschorner Marin
526f79e8f2
Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop
2020-06-30 18:15:18 -03:00
KDSBrowne
296092739c
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into dev2.3-minimize-presentation
2020-06-30 20:54:59 +00:00
Lucas Zawacki
65892677ee
Make file video player work on every browser
2020-06-30 17:41:44 -03:00
Lucas Zawacki
4158372ac7
Use panoto mp4 url to implement a version of external-video
2020-06-30 17:41:42 -03:00
Anton Georgiev
ec94b0f781
Merge pull request #8888 from pedrobmarin/fix-mod-webcams
...
Fix webcamsOnlyForModerator
2020-06-30 16:19:15 -04:00
KDSBrowne
d62ca65ded
add formatted message / custom style for raised hand toast
2020-06-30 18:53:30 +00:00
KDSBrowne
c70a58c1ff
add status notification component
2020-06-30 02:43:20 +00:00
Anton Georgiev
e22856d29e
prevent triggers of unmute others caused by incorrect state
2020-06-26 18:51:01 +00:00
KDSBrowne
0cb1dc0a65
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast
2020-06-25 19:20:18 +00:00
KDSBrowne
0877604d00
improve notification position / prevent state update on unmounted component
2020-06-23 13:38:59 +00:00
KDSBrowne
b3b9a45b35
add config options for muted alert
2020-06-22 16:02:24 +00:00
Anton Georgiev
d40f56c657
Merge pull request #9896 from KDSBrowne/unread-note-placement
...
Fix shared note unread indicator placement
2020-06-22 10:18:38 -04:00
KDSBrowne
c47ff6026d
fix position of shared note unread indicator
2020-06-22 13:48:52 +00:00
Joao Siebel
9981b021ef
Merge remote-tracking branch 'upstream/develop' into merge-2.2
2020-06-22 09:00:43 -03:00
Vitor Mateus De Almeida
b71b7f6b3d
Fix resizing bar bug
2020-06-20 23:53:55 -03:00
Vitor Mateus De Almeida
c85c04a3e4
Fix webcams overlap isTalking indicator
2020-06-20 23:39:33 -03:00
Vitor Mateus De Almeida
ad6ee4fdb0
Fix exception when screenshare is running
2020-06-20 23:24:36 -03:00
Vitor Mateus De Almeida
2454440a8d
Fix exceptions and layout size when panels change
2020-06-20 02:46:10 -03:00
Anton Georgiev
e7d3487b5d
Merge pull request #9878 from lfzawacki/ending-time-alerts
...
Make meeting/breakout ending time alerts configurable
2020-06-19 16:25:50 -04:00
Anton Georgiev
6eb7d55163
Merge pull request #9828 from SRCF/patch1
...
Enable mirroring for video streams
2020-06-19 13:56:45 -04:00
Anton Georgiev
75cd8c2ea3
Merge pull request #9741 from jfsiebel/prevent-680-error-screen
...
Show correct screen when user leaves meeting
2020-06-19 13:30:17 -04:00
Anton Georgiev
789a7cb581
Merge pull request #9754 from KDSBrowne/issue-9451
...
Fix poll annotation error with large presentations
2020-06-19 13:25:36 -04:00
Anton Georgiev
4d23da4a57
Merge pull request #9755 from KDSBrowne/issue-9730
...
Close whiteboard toolbar sub menu on mousedown
2020-06-19 13:22:12 -04:00
Joao Siebel
e227ecca83
Merge remote-tracking branch 'upstream/v2.2.x-release' into prevent-680-error-screen
2020-06-19 14:06:49 -03:00
KDSBrowne
6cf519bfb4
add touch start event handler / update handleMouseDown
2020-06-19 16:37:48 +00:00
Anton Georgiev
3e774a75c7
Merge pull request #9771 from KDSBrowne/issue-9766
...
Fix poll vote not incrementing when - is used as a custom option
2020-06-19 11:09:47 -04:00
Anton Georgiev
566d95d17c
Merge pull request #9756 from KDSBrowne/issue-9731
...
Add debounce to talking indicator mute function
2020-06-19 10:59:07 -04:00
Anton Georgiev
cd96a2f484
Merge pull request #9753 from KDSBrowne/issue-9410
...
Handle userData autoSwap and hidePresentation params
2020-06-19 10:58:28 -04:00
Anton Georgiev
b68c79b8ea
Merge pull request #9885 from jfsiebel/ban-user-error-screen
...
Remove Log In back button in error screen
2020-06-19 09:29:28 -04:00
Joao Siebel
c8820da6fe
Change text order
2020-06-19 10:01:30 -03:00
Joao Siebel
a6f3ea80be
Clean code
2020-06-19 09:51:14 -03:00
Joao Siebel
38bad0a9d8
Remove button in ErrorScreen component
2020-06-19 09:49:07 -03:00
Anton Georgiev
9edf4b6a0c
Merge pull request #9757 from KDSBrowne/issue-9661
...
Prevent drag and drop of files closing session
2020-06-18 16:49:05 -04:00
Lucas Zawacki
3f16d894c3
Configurable ending time and alert values
2020-06-18 15:11:33 -03:00
Lucas Zawacki
a586c7db55
Configuration for remaining time
2020-06-18 15:11:26 -03:00
amassaro
888fe0b040
centralize base prop cleaning / deletion
2020-06-18 08:47:52 -07:00
Joao Siebel
6ac739732c
Remove button in error screen when user was banned
2020-06-18 12:12:22 -03:00
Vitor Mateus De Almeida
c721e00bc3
Fix webcams area auto adjust when minimize presentation
2020-06-17 11:53:13 -03:00
KDSBrowne
4386248c9b
remove chat option for dial in users
2020-06-17 12:37:09 +00:00
Vitor Mateus De Almeida
e09e1be1cf
Fix NaN exception
2020-06-16 20:00:44 -03:00
Vitor Mateus De Almeida
e599219c4d
When disable autoarrange keep layout as is
2020-06-16 18:25:00 -03:00
Joao Siebel
3e95ed0e4b
Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2
2020-06-16 16:40:56 -03:00
Vitor Mateus De Almeida
9ed57fd22d
Fix Inconsistent resize behaviour
2020-06-16 12:20:24 -03:00
KDSBrowne
d3284bb748
remove extra gUM call / pass stream from audio manager
2020-06-16 15:03:45 +00:00
KDSBrowne
061e522493
add notification when speaking while muted
2020-06-16 13:41:51 +00:00
Vitor Mateus De Almeida
006f77caf9
Layout doesn't change when pass a slide
2020-06-16 10:16:38 -03:00
Vitor Mateus De Almeida
f4b63d1146
fix enable autoarrange doesn't work correctely
2020-06-16 08:54:52 -03:00
Vitor Mateus De Almeida
4b1e890a0e
fixing automatically placement
2020-06-15 22:22:28 -03:00
mw781
2da9028c0b
Extract constant for convenience
2020-06-15 21:51:46 +01:00
mw781
f4dc8d9d69
Fix critical issue with video-preview arguments
...
After the code to mirror the video-preview component was added
I noticed that I improperly used the userId property of an undefined
argument as the video-preview does not have a user as a prop. This
commit decouples the logic to verify if the webcam should be mirrored
and whether the webcam belongs to that user. In the latter, we verify
if the user parameter exists and use it in a conditional, otherwise
we simply return true (applies with the video preview component),
where there is only one video stream.
2020-06-15 21:49:00 +01:00
Mohamed Amine Ben Salah
a226fff764
removes duplicated polling data-test
2020-06-15 16:29:38 -03:00
Mohamed Amine Ben Salah
ed185de471
adds hideAndSwapPresentation(), hideAndSwapPresentation() and forceRestorePresentationOnNewEvents()
2020-06-15 16:29:31 -03:00
Mohamed Amine Ben Salah
87513d04e6
adds joinMicrophoneWithoutEchoTest() and logoutFromMeeting() to page.js
2020-06-15 16:08:22 -03:00
mw781
bf68d2c76f
Refactor code and implement mirroring for video-preview
2020-06-14 20:13:47 +01:00
mw781
fceac6dbc5
Import user settings
2020-06-12 23:49:07 +01:00
mw781
17350a57fe
Implement own video mirroring
2020-06-12 23:39:41 +01:00
Anton Georgiev
d5bcedd618
Merge pull request #9744 from jfsiebel/custom-parameters-guest-user
...
Fix custom parameters for guest users
2020-06-12 16:44:43 -04:00
Anton Georgiev
5aa1b2d1c5
Merge pull request #9825 from lfzawacki/v2.2.x-release
...
Fix twitch external video sharing
2020-06-12 16:39:48 -04:00
Joao Siebel
e9666e4f21
Merge remote-tracking branch 'upstream/v2.2.x-release' into prevent-680-error-screen
2020-06-12 17:28:38 -03:00
Lucas Zawacki
0e9baf8ac7
fix twitch option name
2020-06-12 15:06:58 -03:00
Lucas Zawacki
abf4f45602
Update react-player and fix twitch sharing
2020-06-12 15:01:15 -03:00
KDSBrowne
ace61eaf3d
restore presentation when screen share ends
2020-06-11 13:16:22 +00:00
Anton Georgiev
6da65c3c84
Merge pull request #9802 from KDSBrowne/2.2-typeError-fix
...
fix TypeError: event.path is undefined
2020-06-10 09:28:57 -04:00
Lucas Zawacki
a5bd5d8086
Prevent playbackrate update if value hasn't changed
2020-06-09 16:55:25 -03:00
Lucas Zawacki
9b7c734f86
Prevent problems playing some vimeo videos by adding default options
2020-06-09 16:55:23 -03:00
Vitor Mateus De Almeida
3b3a6a32f5
Fixes
2020-06-09 00:09:46 -03:00
Joao Siebel
6c6825d101
Subscribe to collections when user role change. close #9733
2020-06-05 10:32:05 -03:00
Vitor Mateus
a1d4311cec
wip
2020-06-04 20:01:17 -03:00
KDSBrowne
d19c941bf3
remove - as default response placeholder in poll results
2020-06-04 12:18:49 +00:00
KDSBrowne
e23b5c847d
close whiteboard toolbar submenu on mousedown
2020-06-03 18:32:39 +00:00
KDSBrowne
a4642569d8
prevent drag and drop of files closing session
2020-06-03 15:39:02 +00:00
Joao Siebel
9690597803
Fix custom parameters for guest users. close #9737
2020-06-02 17:44:17 -03:00
Joao Siebel
faa0b35032
Show correct screen when user leave meeting. close #9710
2020-06-02 16:47:26 -03:00
