Commit Graph

27248 Commits

Author SHA1 Message Date
Anton Georgiev
fa7027ecf7
Merge pull request #9900 from bigbluebutton/revert-9780-fix-audio-reconnect-2.2
Revert "Improve audio reconnection for muted users for 2.2"
2020-06-22 16:29:36 -04:00
Anton Georgiev
ff1357cbbd
Revert "Improve audio reconnection for muted users for 2.2" 2020-06-22 16:28:22 -04:00
Fred Dixon
6fc4dbae64
Merge pull request #9897 from bigbluebutton/improve-end-meeting-text
Make end meeting more clear
2020-06-22 10:55:14 -04: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
Anton Georgiev
dfbc1ef9b4
Merge pull request #9895 from jfsiebel/merge-2.2-06-2020
Merge 2.2 into develop
2020-06-22 08:59:26 -04: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
9c1d39b99e
Merge pull request #9873 from SRCF/patch-3
Fix regex issue in bbb-conf
2020-06-19 09:53:40 -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
b786eb8f18
Merge pull request #9882 from antobinary/locales-2020-06-18
Pulled HTML5 locales on June 18, 2020
2020-06-18 16:41:12 -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
Anton Georgiev
118990885c
Merge pull request #9876 from amassaro/centralize-clean-base-button-props
centralize base prop cleaning / deletion
2020-06-18 13:55:35 -04: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
mw781
eb29e5b973 Remove trailing whitespace 2020-06-18 13:32:49 +01:00
mw781
fb031c1690 Fix regex issue with firewall troubleshooting 2020-06-18 13:31:10 +01:00