Commit Graph

4739 Commits

Author SHA1 Message Date
Anton Georgiev
1ea72ccb95 sanitize modOnlyMessage in html5 client 2020-07-29 11:31:00 -04: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
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
f45af628d6 fix screen share cropping on chrome 2020-07-19 21:53:59 +00:00
Vitor Mateus De Almeida
da570ca002 Sanitize data in message 2020-07-17 15:36:30 -03: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
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
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
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
e22856d29e prevent triggers of unmute others caused by incorrect state 2020-06-26 18:51:01 +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
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
KDSBrowne
4386248c9b remove chat option for dial in users 2020-06-17 12:37:09 +00: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
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