Michael Zinsmeister
def6ed7604
Merge with upstream
2021-03-07 15:29:10 +01:00
Michael Zinsmeister
81d5129084
Merge with upstream
2021-03-07 15:28:39 +01:00
Michael Zinsmeister
214b236701
Merge with upstream
2021-03-07 15:12:49 +01:00
Anton Georgiev
f814d5f8cd
Merge pull request #11470 from schrd/grails-config
...
add overlay config for bbb-web
2021-03-05 16:53:57 -05:00
Daniel Schreiber
44b1b9052c
fix grep if configfile does not exist
...
there was a call of grep which failed when the config file does not
exist yet. check existance of file first.
2021-03-05 21:56:50 +01:00
Anton Georgiev
bca8b7baac
Merge pull request #11569 from mariogasparoni/develop
...
Move some validations to the User's collection query
2021-03-05 14:30:55 -05:00
Richard Alam
28245a1b58
Merge pull request #11557 from aron-2809/bbb-core-http-endpoint-wip
...
Bbb core http endpoint wip
2021-03-05 14:27:48 -05: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
Anton Georgiev
13493b4a4d
Merge pull request #11568 from mariogasparoni/develop
...
Improve performance when doing user join notifications
2021-03-05 13:55:08 -05:00
Aron Engineer
2c8220a897
fix: HealthActor messages optimized for the timestamp value update
2021-03-05 18:31:31 +00: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
Aron Engineer
284ba1af97
fix: Timeout exception response modified with typesafety.
2021-03-05 17:23:51 +00: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
e50e5ee59d
Merge pull request #11566 from mariogasparoni/merge-22
...
Merge 2.2 into develop
2021-03-05 10:35:40 -05:00
Mario Jr
9bc656d173
Merge remote-tracking branch 'origin/v2.2.x-release' into develop
2021-03-05 12:26:53 -03: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
859520fe2c
Merge pull request #11560 from mariogasparoni/backport-audio-improvements-from-2.3
...
Backport audio improvements from 2.3
2021-03-05 08:39:23 -05:00
Anton Georgiev
dc5357253e
Merge pull request #11563 from bigbluebutton/revert-11531-issue-11438
...
Revert "Add reconnection and sync handler"
2021-03-05 03:55:36 -05:00
Anton Georgiev
c9bbcebe59
Revert "Add reconnection and sync handler"
2021-03-05 03:53:36 -05:00
Anton Georgiev
26124deb49
Merge pull request #11562 from bigbluebutton/revert-11553-issue-11530
...
Revert "Fix clear chat for single message"
2021-03-05 03:53:15 -05:00
Anton Georgiev
e89faec1cd
Revert "Fix clear chat for single message"
2021-03-05 03:51:07 -05:00
Mario Jr
209b06db2e
Avoid setting an unknown input deviceId
...
Without 'exact' match, the browser fallbacks to the default inputDeviceId
This prevents the error (input device error) when breakout is ended and we try
to skipCheck the microphone when user returns to main room (assuming the
user had the microphone active before joining breakout room).
2021-03-05 00:33:54 -03:00
Mario Jr
39780c6a50
Do not try to recover mute state when joining listenonly
...
Prevent toggleMute api call to be called for listenonly
This has no effect to the end user, but avoids unnecessary server calls
2021-03-05 00:23:20 -03:00
Mario Jr
c0625e2ee1
Cleanup joinedAudioOnly state when user disconnects or reconnect microphone
...
Fixes #11490
2021-03-05 00:06:19 -03:00
Mario Jr
e16566de9d
Recover mute state for moderator when returning from breakout's audio transfer
...
Fixes #11489
2021-03-05 00:02:31 -03: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
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
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
