Lucas Zawacki
378d0f18a0
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into develop-bbb
2022-04-14 18:48:02 +00:00
Anton Georgiev
3ce6dbf997
Merge pull request #14665 from JoVictorNunes/breakout-update
...
feat: move users among breakouts
2022-04-14 08:22:49 -04:00
Lucas Zawacki
83847a21aa
Merge branch 'v2.5.x-release-Layouts' of github.com:lfzawacki/bigbluebutton into develop-bbb
2022-04-13 21:08:32 +00:00
Anton Georgiev
aaef76cd2e
Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev
2022-04-13 20:58:02 +00:00
Gustavo Trott
725bed6797
Small fixes
2022-04-13 14:22:02 -03:00
Gustavo Trott
ecbfee26db
Missing parts
2022-04-12 13:56:54 -03:00
Anton Georgiev
96c2fc9d86
Merge pull request #14734 from JoVictorNunes/issue-14721
...
fix: link sanitizing in welcome message
2022-04-12 10:36:59 -04:00
Gustavo Trott
77a8aba1f5
Merge remote-tracking branch 'upstream/develop' into breakout-updated
2022-04-12 09:54:25 -03:00
Gustavo Trott
102eee3ba5
Backend portion of breakout Manage Users
2022-04-12 09:50:19 -03:00
Anton Georgiev
1500fb6a29
Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev
2022-04-09 00:55:25 +00:00
Anton Georgiev
33575e60e6
Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into v2.5.x-release
2022-04-09 00:48:14 +00:00
Anton Georgiev
3afb57fa66
Merge pull request #14788 from ramonlsouza/merge-2425-apr08
...
chore: Merge 2.4 into 2.5
2022-04-08 20:37:32 -04:00
Ramon Souza
1c873bd8d6
Merge remote-tracking branch 'upstream/v2.4.x-release' into merge-2425-apr08
2022-04-08 17:30:21 -03:00
germanocaumo
cacba3c7e7
feat(html5): add meteor rtt as prometheus metric
2022-04-08 14:27:35 +00:00
Joao Victor
9a674c0df8
Merge remote-tracking branch 'upstream/develop' into breakout-update
2022-04-06 11:25:39 -03:00
Joao Victor
0e29c1fdc3
Fix link sanitizing in welcome message.
2022-04-04 17:34:16 -03:00
Ramon Souza
06da4e5e0d
fix errors caused by develop merge
2022-04-04 16:52:43 -03:00
Ramon Souza
4c328bc4ea
Merge remote-tracking branch 'upstream/develop' into issue-14382
2022-04-04 16:25:50 -03:00
Anton Georgiev
324388aa8e
Merge pull request #14016 from Tainan404/wip-new-msg-userLeftFlag
...
refactor: add msg userLeftFlag
2022-04-04 14:08:40 -04:00
Tainan Felipe
159a09be49
Small adjustments
2022-04-04 14:26:00 -03:00
Gustavo Trott
73977036cc
Remove garbage
2022-04-01 17:30:39 -03:00
Gustavo Trott
839aeb2685
Remove UserEjectedFromMeetingEvtMsg occurrences
2022-04-01 17:11:28 -03:00
Anton Georgiev
72d37d799b
Merge pull request #14703 from ramonlsouza/pr-issue-14493
...
refactor: Add server side notification
2022-04-01 09:23:22 -04:00
Anton Georgiev
2a131086a7
Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25
2022-03-31 15:32:14 +00:00
Anton Georgiev
74db3a630b
Merge pull request #14658 from ramonlsouza/issue-14655
...
fix: Clear chat button is not working
2022-03-31 11:17:22 -04:00
Ramon Souza
b9a76feb18
use Meteor Random.id() for id generation
2022-03-31 11:43:58 -03:00
Anton Georgiev
bb92689904
Merge pull request #14601 from ramonlsouza/lgtm-mar15
...
refactor: remove unused imports/variables
2022-03-31 10:14:48 -04:00
Ramon Souza
0794f5188b
Merge remote-tracking branch 'upstream/develop' into lgtm-mar15
2022-03-31 09:21:59 -03:00
Anton Georgiev
478605b6b0
Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-develop
2022-03-30 18:19:28 +00:00
Ramon Souza
6874156190
add messageDescription in notifications
2022-03-30 11:01:12 -03:00
Ramon Souza
41778cb959
filter all messages by meetingId
2022-03-30 10:15:47 -03:00
Anton Georgiev
fc688f2038
Merge branch 'meteor-261' of github.com:ramonlsouza/bigbluebutton into meteor-261
2022-03-29 20:27:26 +00:00
Ramon Souza
4da4b8d7a9
Merge remote-tracking branch 'upstream/develop' into pr-issue-14493
2022-03-29 17:27:20 -03:00
Gustavo Trott
35ecbdbf80
Wait for user removal before kill connections
2022-03-29 16:08:34 -03:00
Guilherme Leme
c6653cd4b2
[Issue-14321]- Changes in Review
2022-03-25 14:12:10 -03:00
Ramon Souza
68f55b8c7b
Merge remote-tracking branch 'upstream/develop' into issue-14382
2022-03-25 09:21:15 -03:00
Joao Victor
923e52a03a
fix conflicts
2022-03-24 11:16:12 -03:00
Joao Victor
0ea405b67f
feat: allow for moving users among breakouts + modal design updates
2022-03-24 10:56:07 -03:00
Ramon Souza
3c2c5a8080
fix clear chat
2022-03-23 17:11:01 -03:00
Anton Georgiev
351b7126c7
Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into develop
2022-03-23 15:11:47 +00:00
Lucas Zawacki
21703d9662
fix(layout): Fix propagation of layout type, simplify code
2022-03-22 19:13:52 +00:00
Gustavo Trott
a6c3af7b0f
Add disabledFeatures=virtualBackgrounds
2022-03-22 16:01:27 -03:00
Arthurk12
eacce4ee46
fix(layout): camera resize when pushing
...
Adds isResizing property to LayoutMeetings collection.
Moves the point where the last camera dock size is stored from webcam
component to custom layout component, since it is the only one with
this feature.
2022-03-22 15:29:49 -03:00
Mario Junior
5778306626
Merge pull request #9283 from znerol-forks/feature/develop/sip-user-agent
...
Send browser UA string in SIP UA, also add BBB server and client version
2022-03-22 11:18:06 -03:00
Gustavo Trott
4cb563085f
Implements param lockSettingsHideViewersCursor
2022-03-21 15:25:41 -03:00
Anton Georgiev
adfbaa4409
Merge pull request #14599 from gustavotrott/disabledFeatures-breakoutRooms
...
feat: Support to disable breakout rooms via disabledFeatures
2022-03-18 14:41:02 -04:00
Paulo Lanzarin
5fa7c18b43
Merge pull request #14621 from prlanzarin/u25-victorio-fuzz
...
fix(audio): clean up sfu broker, guarantee peer exists in getLocalStream
2022-03-17 14:39:41 -03:00
prlanzarin
13c6b12f89
fix(audio): clean up sfu broker, guarantee peer exists in getLocalStream
2022-03-17 11:20:19 -03:00
Ramon Souza
a89e9da4ea
Merge remote-tracking branch 'upstream/develop' into issue-14382
2022-03-16 16:53:17 -03:00
Ramon Souza
2a7d8eb043
Merge remote-tracking branch 'upstream/develop' into lgtm-mar15
2022-03-16 16:30:24 -03:00
