BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,446 Commits 13 Branches 260 Tags 1.1 GiB
dc0fc459e2
Commit Graph

8129 Commits

Author SHA1 Message Date
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
c5e6de2296 Enable multiple webcams and network stats by default 2020-07-07 18:43:46 +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
Anton Georgiev
0a399af81f add clientURL to logs from client 2020-06-30 15:18:01 -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
Mohamed Amine Ben Salah
85f6ef3dda fixes breakout automated test and makes it stable 2020-06-29 22:25:04 -03: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
Mohamed Amine Ben Salah
9cf4b71605 fixes webcam and audio automated tests 2020-06-24 16:51:20 -03:00
Mohamed Amine Ben Salah
e59dcd336a force english use in puppeteer 2020-06-24 12:18:35 -03:00
KDSBrowne
0877604d00 improve notification position / prevent state update on unmounted component 2020-06-23 13:38:59 +00:00
Anton Georgiev
ff1357cbbd
Revert "Improve audio reconnection for muted users for 2.2" 2020-06-22 16:28:22 -04:00
KDSBrowne
b3b9a45b35 add config options for muted alert 2020-06-22 16:02:24 +00:00
Fred Dixon
86c6451bcc
Make end meeting more clear 2020-06-22 10:54:23 -04: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
aed4d648a9
Merge pull request #9780 from Tainan404/fix-audio-reconnect-2.2 
Improve audio reconnection for muted users for 2.2
 2020-06-19 16:58:55 -04:00
Anton Georgiev
16189780c8
Update bigbluebutton-html5/imports/ui/services/audio-manager/index.js 2020-06-19 16:58:41 -04:00
Anton Georgiev
8a5f201c98
Update bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js 2020-06-19 16:58:33 -04:00
Anton Georgiev
7a04ac0355
Update bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js 2020-06-19 16:58:24 -04:00
Anton Georgiev
0ac1773e3a
Merge pull request #9888 from Tainan404/listener-for-voice-user-22 
Add a listener to voice user ejecting user from audio on socket disconnection
 2020-06-19 16:54:22 -04:00
Anton Georgiev
a3f01721fc
Update bigbluebutton-html5/imports/api/voice-users/server/publishers.js 2020-06-19 16:53:59 -04: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
af21f695ee
Update bigbluebutton-html5/private/locales/en.json 2020-06-19 16:25:24 -04:00
Anton Georgiev
c23611ac01
Update bigbluebutton-html5/private/locales/en.json 2020-06-19 16:25:16 -04:00
Tainan Felipe
7ddaac38c1 Add implici true for wasMuted 2020-06-19 17:20:36 -03:00
Tainan Felipe
9fa1986611 Add implicit toggle for toggle voice call 2020-06-19 17:07:11 -03:00
Tainan Felipe
b504101827 Add a listener to voice user ejecting user from audion on socket disconnection 2020-06-19 16:40:50 -03:00
Anton Georgiev
511d9ad753
Merge pull request #9863 from daminebenq/notifications-test 
bbb notifications automated test
 2020-06-19 15:09:52 -04:00
Anton Georgiev
b32691152d
Merge pull request #9846 from daminebenq/custom-parameters-autotest 
Custom parameters autotest
 2020-06-19 13:59:40 -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
Anton Georgiev
0a0af871fc Pulled HTML5 locales on June 18, 2020 2020-06-18 20:39:25 +00: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
Anton Georgiev
0cb7759cb2
Merge pull request #9824 from jfsiebel/fix-banned-users-join-try 
Prevent banned user from trying to validateAuthToken multiple times
 2020-06-17 17:09:40 -04:00
Mohamed Amine Ben Salah
5668cf1668 updates and fixes notifications test 2020-06-17 12:29:43 -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
Anton Georgiev
778695b4d9
Merge pull request #9758 from jfsiebel/clear-video-streams 
Clear video streams collection
 2020-06-16 16:20:56 -04: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
Anton Georgiev
8d27ec90bb
Merge pull request #9845 from lkiesow/external-video-sharing-note 
Update Note About Sharing External Video
 2020-06-16 08:46:12 -04: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
Lars Kiesow
91e629b453
Update Note About Sharing External Video 
This patch updates the note about which external videos can be shared
by looking at what react-player supports. Most notably, external video
URLs are added.

This also fixes the misspelled name of Dailymotion.
 2020-06-16 00:59:16 +02: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
b0b2602547 fixes audio test args 2020-06-15 17:00:35 -03:00
Mohamed Amine Ben Salah
88a3685a62 fixes required puppeteer args 2020-06-15 16:33:39 -03:00
Mohamed Amine Ben Salah
55a7e2fe0a adds DEBUGGING Logger to custom parameters test 2020-06-15 16:29:47 -03: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
eb47227caf adds customStyleUrl(), autoSwapLayout(), hidePresentation(), bannerText() and bannerColor() to customparameters.js 2020-06-15 16:29:23 -03:00
Mohamed Amine Ben Salah
9a69e50ec3 adds multiUserPenOnly(), presenterTools(), multiUserTools() and customStyle() 2020-06-15 16:29:15 -03:00
Mohamed Amine Ben Salah
c3f148cda0 replaces getArgsWithAudio() with getArgs() in customparameters.test.js 2020-06-15 16:29:06 -03:00
Mohamed Amine Ben Salah
998948e4c8 fixes getArgsWithVideo() in page.js 2020-06-15 16:29:00 -03:00
Mohamed Amine Ben Salah
7c6d2145d3 adds enableVideo() and autoShareWebcam() test specs 2020-06-15 16:28:45 -03:00
Mohamed Amine Ben Salah
4d468e65c2 enableScreenSharing() test spec 2020-06-15 16:23:45 -03:00
Mohamed Amine Ben Salah
c23752926f update screenshot() and getMetrics() in page.js 2020-06-15 16:17:38 -03:00
Mohamed Amine Ben Salah
71dea013bd reformulate getMetrics() and screenshot() to save in same directory 2020-06-15 16:17:31 -03:00
Mohamed Amine Ben Salah
745bd69af6 adds description comments to test specs 2020-06-15 16:17:22 -03:00
Mohamed Amine Ben Salah
3c41df3790 adds skipCheck() and askForFeedbackOnLogout() test specs 2020-06-15 16:08:34 -03:00
Mohamed Amine Ben Salah
87513d04e6 adds joinMicrophoneWithoutEchoTest() and logoutFromMeeting() to page.js 2020-06-15 16:08:22 -03:00
Mohamed Amine Ben Salah
48812f9d7a added force listen only parameter test spec 2020-06-15 16:08:07 -03:00
Mohamed Amine Ben Salah
16c8fe2270 added listenOnlyMode test spec 2020-06-15 16:07:52 -03:00
Mohamed Amine Ben Salah
de8d6315db added autoJoin custom parameter test spec 2020-06-15 16:07:10 -03:00
mw781
bf68d2c76f Refactor code and implement mirroring for video-preview 2020-06-14 20:13:47 +01:00
Fred Dixon
ccf42b0a67
Merge pull request #9836 from lkiesow/html5-camera-profile-docs 
[HTML5 Client] Camera Profile Documentation
 2020-06-13 19:00:57 -04:00
Lars Kiesow
f1763cede6
[HTML5 Client] Camera Profile Documentation 
This patch adds a short comment block to the HTML5 client's
configuration file explaining the options available for the camera
profiles. Having this in the configuration file helps as a quick
reference and means that administrators do not need to find external
sources of information.
 2020-06-14 00:37:59 +02: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
87ea96b386
Merge pull request #9827 from antobinary/audio-logs 
Added callerIdName in audio logs where possible
 2020-06-12 17:15:20 -04:00
Anton Georgiev
ddb54273c1 Added callerIdName in audio logs where possible 2020-06-12 21:13:49 +00: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
Joao Siebel
492acd6b5c Add a warn when a banned user tries to join the meeting 2020-06-12 16:51:22 -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
Joao Siebel
45f99fed8b Prevent banned user from trying to validate auth token multiple times. close #9798 2020-06-12 13:24:11 -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
2a13cb5673 Update react-player to 2.2.0 2020-06-09 17:34:22 -03: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
Anton Georgiev
123f016610 Pulled HTML5 locales on June 5, 2020 2020-06-05 17:02:36 +00:00
Anton Georgiev
8c077aaf63
Merge pull request #9782 from jfsiebel/resubscribe-when-role-changed 
Subscribe to collections when user role change
 2020-06-05 12:49:41 -04:00
Joao Siebel
6c6825d101 Subscribe to collections when user role change. close #9733 2020-06-05 10:32:05 -03:00
Anton Georgiev
1ba6d10c0a
Update copyright year in html5 client 2020-06-05 09:20:18 -04:00
Tainan Felipe
e540d6e46d set user as muted in audio reconnection 2020-06-05 09:41:48 -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
Joao Siebel
e3692e5321 Clear video streams collection on meeting end. close #9154 2020-06-03 13:29:44 -03: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
Joao Siebel
189f9c8e61 Fix user-settings publisher log 2020-06-02 09:46:03 -03:00
KDSBrowne
89df783ee0 add debounce to talking indicator mute 2020-06-01 21:37:14 +00:00
Lucas Zawacki
71819feaab Call onmount for custom arc-player 2020-06-01 15:36:16 -03:00
KDSBrowne
dabc2e8213 fix poll annotation error with large presentations 2020-06-01 16:57:46 +00:00
KDSBrowne
23e306b9e6 handle userData autoSwap and hidePresentation params 2020-06-01 13:29:43 +00:00
Joao Siebel
74c34d0c4a Use main room custom parameters in breakouts room. close #9612 2020-06-01 09:13:03 -03:00
Anton Georgiev
7b883fbe49 Pulled HTML5 locales on May 29, 2020 2020-05-29 13:49:32 -04:00
Anton Georgiev
f510fdc484
Merge pull request #9517 from KDSBrowne/2.2-restore-presentation-on-update 
Restore minimized presentation for viewer on (slide or zoom change / pub…
 2020-05-29 13:20:31 -04:00
Anton Georgiev
a5171da678
Merge pull request #9516 from KDSBrowne/issue-9410 
Hide default content when hidePresentation and autoSwapLayout enabled
 2020-05-29 12:56:14 -04:00
Anton Georgiev
29afdafd3e
Merge pull request #9658 from konkret-devils/v2.2.x-release 
Add bbb_show_public_chat_on_login as a join (co-) parameter
 2020-05-29 12:42:59 -04:00
Anton Georgiev
fcc43f8bd6
Merge pull request #9715 from KDSBrowne/2.2-fix-captions-with-sr 
Make screen reader announce captions as they are appear
 2020-05-29 10:33:37 -04:00
Anton Georgiev
1a7c07e380
Merge pull request #9113 from sualko/feat/html5/settings 
add env to specify settings location
 2020-05-28 16:21:25 -04:00
Anton Georgiev
247ba9af40
Merge pull request #8964 from KDSBrowne/issue-7898 
Fix chat dropdown not filling screen (mobile)
 2020-05-28 15:55:01 -04:00
KDSBrowne
4020a6da9f make screen reader announce captions as they are typed 2020-05-27 17:01:21 +00:00
Anton Georgiev
1c6841dd1f
Merge pull request #9691 from jfsiebel/fix-breakout-room-logout 
Close tab when user logout from a breakout room
 2020-05-26 15:12:21 -04:00
Joao Siebel
1f8cae08d6 Close tab when user logout from a breakout room 2020-05-26 13:41:22 -03:00
Anton Georgiev
ac6fd2824c
Merge branch 'develop' into 2.3-audio-stats 2020-05-26 12:36:15 -04:00
Tainan Felipe
687791ffde
Merge branch 'develop' into virtualized-userlist 2020-05-26 11:46:51 -03:00
Tainan Felipe
e1573bded9 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-26 11:44:20 -03:00
Martin Beckmann
630f3393aa Integration of PR #9292 (by weeman1337) and PR #9658 (by mantridereso) 
..oops, forgot to update settings.yml
 2020-05-26 15:17:11 +02:00
Martin Beckmann
c3f0447105 Integration of PR #9292 (by weeman1337) and PR #9658 (by mantridereso) 2020-05-26 15:07:37 +02:00
Anton Georgiev
f4742e8a9f
Merge pull request #9683 from KDSBrowne/issue-9679 
Fix non userData defined shortcuts not functioning
 2020-05-26 08:57:48 -04:00
KDSBrowne
4e68ea07fd fix non userData shortcuts not functioning 2020-05-26 12:12:57 +00:00
KDSBrowne
aff51f603f prevent chat input shifting with error & typing messages 2020-05-25 20:56:26 +00:00
KDSBrowne
be10e25eef make presentation area not visible when minimized 2020-05-25 20:18:58 +00:00
Anton Georgiev
9f60e925b5 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 19:55:36 +00:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
KDSBrowne
3f79eefb18 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-05-25 13:10:50 +00:00
Anton Georgiev
4a38524778 Logging with JSON stringify was leading to crashes. Reverting, need to investigate further 2020-05-24 08:22:10 -04:00
Martin Beckmann
ea3926e8ef attempt to introduce an additional UserSettings parameter 'bbb_show_public_chat_on_login' as a co-parameter of 'bbb_show_participants_on_login' (the former intended to only have an effect if the latter is 'true') 2020-05-23 22:28:56 +02:00
Martin Beckmann
d6956a5516 test... 2020-05-23 21:43:26 +02:00
Martin Beckmann
f9c7c20d5a test... 2020-05-23 21:40:39 +02:00
Martin Beckmann
51d3b3a94d test... 2020-05-23 20:44:11 +02:00
Anton Georgiev
54fe878a05
Merge pull request #9643 from jfsiebel/save-settings-on-start 
Prevent userChangedLocalSettings call failing at start
 2020-05-22 14:52:50 -04:00
Joao Siebel
7d9f4c70ad Prevent userChangedLocalSettings call failing at start 2020-05-22 13:54:00 -03:00
KDSBrowne
03d0931c1c add style / message updates 2020-05-22 16:39:54 +00:00
Anton Georgiev
ede8d82384
Merge pull request #9641 from antobinary/locales-may-22 
Pulled HTML5 locales May 22, 2020
 2020-05-22 11:55:19 -04:00
Anton Georgiev
c9faef96c9 Pulled HTML5 locales May 22, 2020 2020-05-22 11:48:11 -04:00
Anton Georgiev
fdcccbbc29
Merge pull request #9640 from antobinary/ban-eject-user 
Distinguish between eject and ban for Remove user
 2020-05-22 11:37:11 -04:00
Anton Georgiev
ca9ae8d861 cleanup 2020-05-22 10:55:11 -04:00
KDSBrowne
afe995393e remove className 2020-05-22 10:47:22 -04:00
KDSBrowne
274335cc9d add checkbox toremove user modal 2020-05-22 10:47:03 -04:00
Anton Georgiev
e7917994d5 add banUser field in EjectUserFromMeetingCmdMsgBody 2020-05-22 10:45:28 -04:00
Anton Georgiev
aeeac803c7
Merge pull request #9620 from antobinary/simplify-publish 
Simplify the code used for promote-demote subscriptions
 2020-05-21 17:14:16 -04:00
Anton Georgiev
c290c9ee60 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into ban-eject-user 2020-05-21 16:54:31 -04:00
Anton Georgiev
1874cf8392 Add visuals for banning vs ejecting user 2020-05-21 16:40:08 -04:00
Anton Georgiev
b6524e66c7
Fix typo closing parenthesis 2020-05-21 15:11:11 -04:00
Anton Georgiev
e08ee31338
Merge pull request #9629 from KDSBrowne/issue-9569 
Update shared note item style
 2020-05-21 15:06:45 -04:00
Anton Georgiev
66f11468ac
Merge pull request #9631 from KDSBrowne/issue-9592 
Fix userData-shortcuts causing client crash
 2020-05-21 15:01:49 -04:00
Anton Georgiev
8609418cda
Merge pull request #9630 from KDSBrowne/issue-9543 
Change prompt message when screen share not supported
 2020-05-21 14:58:07 -04:00
Anton Georgiev
be81b20ff1
Merge pull request #9632 from antobinary/lock-breakouts 
Do not display "Lock viewers" option in breakouts
 2020-05-21 14:57:21 -04:00
Anton Georgiev
33156f8bc5 Do not display "Lock viewers" option in breakouts 2020-05-21 14:55:32 -04:00
KDSBrowne
51c3543826 fix shortcuts not working when helper is passed an array 2020-05-21 18:43:34 +00:00
Anton Georgiev
ead986e3e2
Merge pull request #9542 from prlanzarin/upstream-2.2-safari-ss 
Screenshare: add support on Safari 13+ and make constraints configurable
 2020-05-21 14:38:32 -04:00
Anton Georgiev
2d16e020d8
Merge pull request #9593 from lfzawacki/2.2-external-video 
Attempt to fix external video syncing
 2020-05-21 14:34:52 -04:00
KDSBrowne
8fc32bc7dc update message in media container 2020-05-21 18:26:47 +00:00