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
Aron Engineer
cae124aed7
feat: pubsub send and receive statuses added to health endpoint
2021-03-04 21:16:48 +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
204b3c6fec
add value to setState
2021-03-04 19:23:19 +00:00
gersti07
ae25bb4895
add locales
2021-03-04 19:22:13 +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
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
