Commit Graph

7251 Commits

Author SHA1 Message Date
prlanzarin
775cbf4124 screenshare: move end alert sound to a reliable place 2021-03-12 00:44:38 +00:00
Anton Georgiev
a165d3a7e3
Merge pull request #11606 from prlanzarin/u22-sadl1
video-provider: add video pagination UI toggle (was #10970)
2021-03-11 16:05:33 -05:00
Mohamed Amine Ben Salah
5fe7a18db4 Merge remote-tracking branch 'upstream/develop' into update-and-add-polling-specs 2021-03-11 17:38:49 -03:00
Ramon Souza
17cfd8c9bd fix guest openPanel 2021-03-11 17:00:54 -03:00
Ramon Souza
55a2bc2d02 fix captions openPanel 2021-03-11 16:12:35 -03:00
prlanzarin
7eb91f9273 Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino 2021-03-11 18:49:14 +00:00
Anton Georgiev
73979f1cba
Merge pull request #11621 from ramonlsouza/fix-captions
Fix locales url settings + captions locales order
2021-03-11 13:44:56 -05:00
Ramon Souza
150bedf16d fix locales url settings + captions locales order 2021-03-11 15:33:48 -03:00
Anton Georgiev
8a640877b2
Merge pull request #11611 from BrentBaccala/audio-prompt
don't prompt for "Microphone" if that's the only option presented to the user
2021-03-11 13:27:31 -05:00
Anton Georgiev
9cc78ca4a5
Merge pull request #11620 from ramonlsouza/issue-11578
Submit typed polling response by pressing enter
2021-03-11 13:01:22 -05:00
Anton Georgiev
6a96bbfb93
Merge pull request #11612 from prlanzarin/u23-planF
video-provider: add inbound/recvonly video reconnection (was #11233)
2021-03-11 13:00:14 -05:00
Ramon Souza
15fccf0ba1 submit typed polling response by pressing enter 2021-03-11 14:45:48 -03:00
Anton Georgiev
4f2f0d123d
Merge pull request #11596 from Tainan404/fix-chat-issues
re-implement chat sync and fix stucked loading indicator
2021-03-11 12:29:01 -05:00
Joao Siebel
c9650ba8f1 Inform akka that user intentionality logged out from meeting 2021-03-11 14:32:01 +00:00
Tainan Felipe
87ebdbd02a Merge remote-tracking branch 'upstream/develop' into fix-chat-issues 2021-03-11 10:07:16 -03:00
Tainan Felipe
1c21fcc4ff Fix loading on clear 2021-03-11 10:02:16 -03:00
prlanzarin
d00e8e0436 Merge remote-tracking branch 'origin/develop' into u22-sadl1 2021-03-11 12:31:10 +00:00
Mohamed Amine Ben Salah
36ba0c5bb6 Merge remote-tracking branch 'upstream/develop' into update-and-add-polling-specs 2021-03-11 09:16:55 -03:00
Ramón Souza
0105373cee
Applies changes needed to serve locale files as static content (#11234)
* moving locales folder to /public and applying changes needed to serve locales as static files

* better dev/prod check

* transifex pull script changes to match new locales directory + ignore locales with less than 100 lines

* fix local/prod locales path

* merge fallback messages

* applies new locale changes to legacy client

`bbb-html5.nginx` file content should also be changed to the following:

```
location /html5client/locales {
  alias /usr/share/meteor/bundle/programs/web.browser/app/locales;
}

location /html5client/compatibility {
  alias /usr/share/meteor/bundle/programs/web.browser/app/compatibility;
}

location /html5client/resources {
  alias /usr/share/meteor/bundle/programs/web.browser/app/resources;
}

location /html5client/svgs {
  alias /usr/share/meteor/bundle/programs/web.browser/app/svgs;
}

location /html5client/fonts {
  alias /usr/share/meteor/bundle/programs/web.browser/app/fonts;
}

location /html5client {
  # proxy_pass http://127.0.0.1:4100; # use for development
  proxy_pass http://poolhtml5servers; # use for production
  proxy_http_version 1.1;
  proxy_set_header Upgrade $http_upgrade;
  proxy_set_header Connection "Upgrade";
}
```
2021-03-11 06:42:41 -05:00
Brent Baccala
e5e3b5532b don't prompt for "Microphone" if that's the only option presented to the user 2021-03-10 16:44:41 -05:00
Anton Georgiev
c280769ebf
Merge pull request #11559 from MaximKhlobystov/dragndrop-poll-23
Editing poll options via drag and drop
2021-03-10 16:40:00 -05:00
Anton Georgiev
a630099cc6
Merge pull request #11595 from ramonlsouza/presentation-container-fix
Fixes presentation invisible box appearing if presentation is hidden
2021-03-10 16:37:53 -05:00
prlanzarin
f9f58cb91d video-provider: make sure the provider is unmounted if meteor disconnects
This is a workaround that shaves off some edge cases around wrongfully done camera reconnections and outbound cameras getting stuck in the UI even though they arent being shared anymore
2021-03-10 20:21:08 +00:00
prlanzarin
db15d1b280 video-provider: fix setReconnectionTimeout race condition that caused webcams to drop
Problem: setReconnectionTimeout was being called in the first candidate generation to set the negotiation/reconnection timeout up. That caused some browsers or specific scenarios (mainly envs without STUN) to establish the negotiation (playStart) before generating any useful out-of-band candidates (relay). That would cause the timeout to be set AFTER it is supposed to be cleared due to success (playStart), making the webcam drop after a while

So I moved the setReconnectionTimeout call to a safer spot: right after the first negotiation requisition goes out to bbb-webrtc-sfu
2021-03-10 20:09:55 +00:00
prlanzarin
6418d0f556 video-provider: more logging improvements, clean up playStart restart timers reset 2021-03-10 20:09:00 +00:00
prlanzarin
f85b5dfa5b video-provider: quick logging cleanup
Reduce logging volume and payload size, perf
2021-03-10 20:08:40 +00:00
prlanzarin
ee142501ab video-provider: fix inbound/recvonly video reconnection 2021-03-10 20:08:29 +00:00
Pedro Beschorner Marin
c120dc2859 Avoid dispatching fallback error toast message
There's some scenarios that video errors triggers multiple toast notifications
that don't have any mapped defined message feedback so they all drop to the default
permission error. This leaves the impression that something is broken at the toast
container.

Since those messages don't bring up much information about the problem we can avoid sending
them until we don't have a more informative one to notify the user.
2021-03-10 19:47:25 +00:00
prlanzarin
cf8b5e422f video-provider: add pagination settings toggle 2021-03-10 18:44:23 +00:00
Anton Georgiev
435ecd7450
Merge pull request #11605 from ramonlsouza/fix-legacy-client
Fix legacy client with customHeartbeat:false
2021-03-10 13:35:18 -05:00
Maxim Khlobystov
619c5ed176 Make the poll drag and drop feature optional 2021-03-10 18:23:25 +00:00
Ramon Souza
fb22eca58d fix legacy client with customHeartbeat:false 2021-03-10 15:14:25 -03:00
Anton Georgiev
bbec7efb57
Merge pull request #11593 from pedrobmarin/2.3-lobby-message
Add guest lobby messages
2021-03-10 11:35:35 -05:00
Ramon Souza
45421b1276 fix an error that might happen if PR 11529 is applied to an ongoing meeting 2021-03-10 09:16:31 -03:00
Pedro Beschorner Marin
17f47fa4ea
Removed callback from setGuestLobbyMessage 2021-03-10 09:09:15 -03:00
Anton Georgiev
65fd2d434a
Merge pull request #11584 from ramonlsouza/issue-9856
When a moderator ends a meeting, indicate to viewers who ended the meeting
2021-03-10 05:59:43 -05:00
Tainan Felipe
927e2167bc Re-implements chat sync and clear 2021-03-09 17:52:20 -03:00
Ramon Souza
4445d4e309 fix invisible box appearing if presentation is hidden 2021-03-09 16:43:51 -03:00
Pedro Beschorner Marin
0365018e92 Add guest lobby messages
Moderators are able to send a message to the meeting's guest lobby. This new
event reaches bbb-web and is sent to the guest user with her/his status response
while polling. All guest users that are waiting for acceptance will be able to
read this message.

enableGuestLobbyMessage is disabled by default.
2021-03-09 11:02:25 -03:00
Mohamed Amine Ben Salah
982ddc56a1 adds YNA and UR polling cases 2021-03-08 18:11:36 -03:00
Mario Jr
c7df108f5a Improve the way we observe changes on Users's collection
It is safer to look at subscriptions's state to users instead of depending
on the initial state of the collection at mounting time. Although
i couldn't force any race conditions on this, there's a chance it could
happen. The fix avoid this problem.
This complements #11533
2021-03-08 18:08:56 -03:00
Ramon Souza
826c420788 update meetingEndedBy with information coming from bbb core 2021-03-08 16:45:09 -03:00
Ramon Souza
0a09112f80 split end meeting message in two parts 2021-03-08 16:14:09 -03:00
Ramon Souza
78095f830d 'active users' message change on ending meeting 2021-03-08 15:11:31 -03:00
Ramon Souza
c9ac737207 display name of the user who ended the meeting 2021-03-08 13:05:33 -03:00
Ramon Souza
2923ea1641 fix 'restore presentation' button when presentation is disabled 2021-03-08 09:33:25 -03:00
Mohamed Amine Ben Salah
620183d5d3 added True/False, A/B/C/D polling cases WIP 2021-03-07 20:53:58 -03:00
Mario Jr
9b1630186c Move some validations to the User's collection query
Also removed unnecessary fields
2021-03-05 15:56:42 -03:00
Mario Junior
d4620b024d
Update bigbluebutton-html5/imports/startup/client/base.jsx
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2021-03-05 15:14:19 -03:00
Mario Jr
837b1cfb52 Improve performance when doing user join notifications
Complements #11533
2021-03-05 15:10:31 -03:00
hiroshisuga
190bde3320
Fix slide size problem at fullscreen <-> window-mode transition #2 (#11540)
Replaces the PR #10604, which has been temporarily fixed a problem in 2.3a2, that is, the slide size gets crazy when turning on and off fullscreen mode. Since #10604 was just a workaround, I tried to fix it in a way making more sense.

### Closes Issue(s)

closes #10459 (already closed by #10604) and #10589

### Motivation

#10604 is fixing the problem by calling "slide change" event, although the slide has not been changed actually. I tried to fix the same problem by adding a "full screen change" event listener in the layout manager, which I think is more elegant.
2021-03-05 11:01:47 -05:00
Anton Georgiev
68cfcd0215
Merge pull request #11544 from pedrobmarin/guest-doorbell
Waiting users audio and push alerts
2021-03-05 09:13:29 -05:00
Anton Georgiev
01ca99208f
Merge pull request #11529 from ramonlsouza/issue-11071
Fix openPanel errors related to polling and shared notes
2021-03-05 09:01:45 -05:00
Ramon Souza
4d59f9d23e fix new found errors 2021-03-05 10:49:28 -03:00
Anton Georgiev
c9bbcebe59
Revert "Add reconnection and sync handler" 2021-03-05 03:53:36 -05:00
Anton Georgiev
e89faec1cd
Revert "Fix clear chat for single message" 2021-03-05 03:51:07 -05:00
Anton Georgiev
5953f21196
Merge pull request #11558 from antobinary/march4-merge
Merge 2.2.[32..35] into 'develop'
2021-03-04 17:09:22 -05:00
Maxim Khlobystov
e3ec0da0a9 Deleted unused code left from the 2.2 implementation of the drag and drop for poll options 2021-03-04 22:04:38 +00:00
Anton Georgiev
228bad03d5 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into march4-merge 2021-03-04 21:25:47 +00:00
Anton Georgiev
088c3cde44
Merge pull request #11533 from mariogasparoni/fix-11399
Fix audio and push alerts for user join
2021-03-04 15:47:17 -05:00
Anton Georgiev
d5a7846020
Merge pull request #11550 from KDSBrowne/bbb-11291x2
Add avatar back to chat poll result message
2021-03-04 15:05:58 -05:00
Anton Georgiev
7b58f0b269
Merge pull request #11556 from ramonlsouza/quick-poll-fix
Quick poll improvements
2021-03-04 15:01:10 -05:00
Maxim Khlobystov
e8229726f2 Make the drag-and-drop properly work with 2.3 polling 2021-03-04 19:43:43 +00:00
gersti07
3fae071001 Update styles.scss 2021-03-04 19:26:18 +00:00
gersti07
885a8f2598 improved button style 2021-03-04 19:25:53 +00:00
gersti07
09e8e7353d removed unused code 2021-03-04 19:25:22 +00:00
gersti07
dd68990c7b removed unused code from styles.scss 2021-03-04 19:24:47 +00:00
gersti07
6011eb524a refactor drag handling 2021-03-04 19:24:07 +00:00
gersti07
b36042babd implemented add polloptions via drag and drop
(merging with 2.3)
2021-03-04 19:20:17 +00:00
Ramon Souza
ce5f0c04f3 changes to match issue #8197 tests 2021-03-04 15:00:21 -03:00
Anton Georgiev
c7f6b819a5
Merge pull request #11553 from Tainan404/issue-11530
Fix clear chat for single message
2021-03-04 12:22:00 -05:00
Tainan Felipe
51c45e1595 Fix crashing after second clean 2021-03-04 14:16:26 -03:00
Ramon Souza
47a21dfd98 quick poll fix 2021-03-04 13:34:23 -03:00
Tainan Felipe
21045abf16 Merge remote-tracking branch 'upstream/develop' into issue-11438 2021-03-04 11:29:01 -03:00
Tainan Felipe
b983c8e1b4 Fix clear chat for single message 2021-03-04 10:20:18 -03:00
Tainan Felipe
53a7abe4c6 Fix clear chat timeout 2021-03-04 10:09:18 -03:00
KDSBrowne
2880613138 add avatar to chat poll result message 2021-03-04 04:22:19 +00:00
Anton Georgiev
fba6c3c505
Merge pull request #11532 from hiroshisuga/patch-25
numUsersVideo being undefined breaks layout
2021-03-03 16:23:49 -05:00
Pedro Beschorner Marin
e08af4b43e Include waiting users push alert in settings
Since we added audio alert notifications in settings controls there was an ampty
grid gap reserved for the push alerts.
2021-03-03 16:26:15 -03:00
Ramon Souza
0a1516c36e fix svg width error 2021-03-03 15:59:34 -03:00
Pedro Beschorner Marin
e0bbe6e189 Using the correct constant value 2021-03-03 15:48:17 -03:00
Vitor Vanacor
1b218d4730 Change guest waiting bell debounce to throttle
Debounce could make the behaviour of "not always ringing when a guest
enters" feel "buggy". Throttle makes it clearer that it happens to
prevent it from ringing too frequently.

Also move Throttle time from magic number to constant for
a meaningful variable name.
2021-03-03 15:26:50 -03:00
Vitor Vanacor
f2e40d3286 guestWaitingAudioAlert moved to settings 2021-03-03 15:24:54 -03:00
Vitor Vanacor
55092a9de6 Use doorbell sound as waiting guest notification 2021-03-03 15:03:24 -03:00
Vitor Vanacor
d9007d2ce6 Add sound notification for waiting guest
Both debounce or throttle could be used to prevent a spammer from
annoying the moderators.
With debounce, a spammer won't even be noticed by the mods, but
there won't be new notifications for legit guests during the spam.
With throttle, a spammer could still annoy the mods, we would only make
the interval between notifications bigger.
It is a tradeoff. An ideal solution would be preventing spamming from
the same user, but probably unnecessarily complex.
2021-03-03 15:03:00 -03:00
Anton Georgiev
6c238dd240
Merge pull request #11537 from antobinary/backport-11477
Update handleClick condition (fix text-area for FireFox)
2021-03-02 15:02:02 -05:00
KDSBrowne
ccf12c268e update handleClick condition (fix text-area for FireFox) 2021-03-02 14:55:51 -05:00
Anton Georgiev
eba2d0ab58
Merge pull request #11535 from pedrobmarin/etherpad-patch
Rework padIds and turn bbb-web pad aware
2021-03-02 14:48:34 -05:00
Anton Georgiev
17fa7ffea3
Merge pull request #11514 from daminebenq/add-tests-recording-to-video
Adds tests recording + updates some outdated tests + linting
2021-03-02 12:00:05 -05:00
hiroshisuga
b228d4cbb8
Probably a bug in usersVideo 2021-03-02 23:56:10 +09:00
Tainan Felipe
71e0ca9d92 Add sync and reconnection handler 2021-03-02 11:35:26 -03:00
Anton Georgiev
879c54981e
Merge pull request #11447 from antobinary/external-video-sync-lucas-amguirado73
External video events propagated through akka-apps
2021-03-02 08:53:09 -05:00
Ramon Souza
c1efb6e6b4 fix openPanel errors related to polling and shared notes 2021-03-02 09:36:44 -03:00
Mario Jr
8036ce71b1 Fix audio and push alerts for user join
When validating tokens, the dummyUser created at the beginning is set
with validated=true. This means there won't be the state change that used
to occur from validated:false to validated:true (which detects the moment
joined the meeting) , therefore the alert code that expects for this change
won't run.
To fix this for audio alerts, we now detect when user join by observing
additions in Users's collection. This is actually good because we start
observing this only once (in componentDidMount), differently we used to do,
by calling this every time the tracker was activated.

To distinguish between the user addition that initially populates user's
collection from those that happens after user join (which are the ones we
want), we store the initial state (at componentDidMount) and compare it
with new additions. If the user added is present at the initial state,
then it is an addition to populates the collection, otherwise this is a real
user addition (happened after user joined the meeting)

Partially fixes #11399
2021-03-02 08:43:56 -03:00
Anton Georgiev
1268663030 wrap collection modifiers in try-catch blocks 2021-03-02 00:44:49 +00:00
Mohamed Amine Ben Salah
8daa4443cb Merge remote-tracking branch 'upstream/develop' into add-tests-recording-to-video 2021-03-01 18:47:35 -03:00
Mohamed Amine Ben Salah
2c9d8e4380 updates and adds specifications for polling 2021-03-01 18:47:08 -03:00
Anton Georgiev
550bf6d282
Merge pull request #11525 from gustavotrott/develop
Adds lastAuthTokenValidatedOn to users
2021-03-01 13:56:16 -05:00
Anton Georgiev
f6147d4425
Merge pull request #11526 from ramonlsouza/issue-11354
Fix chat textarea resizing bug
2021-03-01 13:43:23 -05:00
Anton Georgiev
b6ead0baa4
Merge pull request #11524 from ramonlsouza/issue-11461
Fix chat messages timestamp
2021-03-01 13:37:59 -05:00