Commit Graph

28817 Commits

Author SHA1 Message Date
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
Anton Georgiev
5307f0807e
Merge pull request #11531 from Tainan404/issue-11438
Add reconnection and sync handler
2021-03-04 12:16:53 -05:00
Tainan Felipe
51c45e1595 Fix crashing after second clean 2021-03-04 14:16:26 -03:00
Tainan Felipe
51f073197b put enable to top 2021-03-04 14:10:08 -03:00
Ramon Souza
47a21dfd98 quick poll fix 2021-03-04 13:34:23 -03:00
Daniel Schreiber
b69754ec43 Merge branch 'grails-config' of github.com:schrd/bigbluebutton into grails-config 2021-03-04 16:30:38 +01: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
Fred Dixon
b5d1d2f159
Merge pull request #11549 from bigbluebutton/ffdixon-patch-5
Bump to 2.2.35
2021-03-03 20:53:27 -04:00
Fred Dixon
e60f6ca82e
Bump to 2.2.35 2021-03-03 20:52:22 -04:00
Fred Dixon
08ae7a0c97
Merge pull request #11547 from pedrobmarin/fix-401-pad-export
Fix padId getter
2021-03-03 19:49:26 -04:00
Pedro Beschorner Marin
f02384bb1f Fix padId getter
Pad exporter uses this same location to serve pad's downloaded content
but the the match was failing because padId is not the last element
of the URL on that scenario.

Pattern follows /pad/p/<padID>[/export/(format)]?<query>.
2021-03-03 20:36:19 -03: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
Anton Georgiev
27f3cd631c
Merge pull request #11543 from ramonlsouza/issue-11270-svg
Fix svg width error
2021-03-03 14:39:40 -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
65ceb37872 Change default guestWaitingAudioAlerts to false
Co-authored-by: Pedro Beschorner Marin <pedrobmarin@gmail.com>
2021-03-03 15:26:26 -03:00
Vitor Vanacor
f2e40d3286 guestWaitingAudioAlert moved to settings 2021-03-03 15:24:54 -03:00
Anton Georgiev
c3cf52f91d
Merge pull request #11542 from bigbluebutton/antobinary-patch-2-1
Revert custom changes to settings.yml
2021-03-03 13:09:52 -05:00
Anton Georgiev
de3cbec87a
Revert custom changes to settings.yml
Inadvertently introduced by #11514
2021-03-03 13:09:00 -05: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
Fred Dixon
08e9ef77ad
Merge pull request #11539 from kepstin/doc-analytics-callback
Add some extra docs/setup instructions to the analytics callback script
2021-03-02 17:33:15 -04:00
Calvin Walton
48956ce63f Add some extra docs/setup instructions to the analytics callback script 2021-03-02 16:19:26 -05:00
Aron Engineer
391ce4d83d feat: BasicStatusCheck added for redis db, computation added to HeathActor 2021-03-02 20:49:02 +00:00
Anton Georgiev
abf9ed4063
Merge pull request #11538 from prlanzarin/u22-track1006022021
Improve permission checks for video, screen sharing and listen only
2021-03-02 15:46:33 -05: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
9848672775
Bumped up copyright year to 2021. Closes #11519 2021-03-02 14:20:27 -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
Anton Georgiev
24e41946b8
Bump to 2.2.34 2021-03-02 11:25:51 -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
b69f526982
Bumped up version to 2.3.0-alpha8 2021-03-02 09:07:26 -05: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
Ramon Souza
2dedf197e0 fix textarea resizing bug 2021-03-01 15:36:09 -03:00