BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,968 Commits 13 Branches 260 Tags 1.1 GiB
e76b323567
Commit Graph

1014 Commits

Author SHA1 Message Date
Paul Trudel
6ba58c3c86 Move size scale calculation to Postgres 2023-08-03 20:14:38 +00:00
Paul Trudel
5f9545997c Only update slide data for a single slide 2023-08-03 15:40:10 +00:00
Paul Trudel
2874a41e32 Removed slideId column from presPage table 2023-08-03 12:50:20 +00:00
Paul Trudel
14775e32eb Store page resize in postgres 2023-07-28 18:01:53 +00:00
Paul Trudel
8373eefdc3 Store slide position data in postgres 2023-07-27 19:10:51 +00:00
Paul Trudel
ec9deb1e67 Added podId, width, and height, columns to postgres 2023-07-26 13:53:15 +00:00
Gustavo Trott
185e48d36c Merge remote-tracking branch 'upstream/v2.7.x-release' into develop 2023-07-21 17:17:52 -03:00
Gustavo Trott
762ae78814 Implements func to Clear all users reaction 2023-07-21 11:10:10 -03:00
Gustavo Trott
a7cd1c5232 Merge 2.7 into Develop 2023-06-29 16:27:10 -03:00
Gustavo Trott
c8867fadb5
Merge pull request #18197 from Scroody/I-18127 
Allow dynamic control on moderators invitation for breakouts
 2023-06-29 13:39:26 -03:00
Gustavo Trott
5681e88c60 Merge 2.7 into Develop 2023-06-26 17:21:01 -03:00
Ramón Souza
af670883c1 remove unused code 2023-06-22 15:35:40 -03:00
Ramón Souza
ae1e6079e1 rename includeMods -> sendInviteToModerators 2023-06-22 13:55:23 -03:00
Gustavo Trott
6ba4aad05a
Merge branch 'v2.7.x-release' into user-raiseHand-away-flags 2023-06-22 08:27:20 -03:00
Anton Georgiev
43b96b47c4
Merge pull request #17724 from lfzawacki/v2.7.x-release 
feat: Implement automatic closed captions using an open transcription server
 2023-06-22 05:25:14 -04:00
Ramón Souza
56d16f0330 back-end part 2023-06-21 16:47:28 -03:00
Paul Trudel
2d737aa0ef Change target to release for java 17 2023-06-12 21:15:33 +00:00
Gustavo Trott
22a2c8ce7c Merge remote-tracking branch 'upstream/v2.7.x-release' into graphql-timer 2023-06-12 10:06:22 -03:00
Anton Georgiev
c8b0437df3
Merge pull request #18133 from GuiLeme/port-timer-with-events-suggestions 
feat(timer): Port timer (Mconf) with events suggestions
 2023-06-08 15:56:10 -04:00
Gustavo Trott
8263dd17ca Introduces flags user.away and user.raiseHand 2023-06-07 22:10:07 -03:00
Ramón Souza
22b02ead28 Merge remote-tracking branch 'upstream/v2.7.x-release' into 16120 2023-06-06 08:45:29 -03:00
Anton Georgiev
70b3220f41 Merge branch 'v2.7.x-release' of github.com:bigbluebutton/bigbluebutton into june5-27 2023-06-05 17:09:35 -04:00
Anton Georgiev
748c7a4a0b Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into june227 2023-06-02 09:45:34 -04:00
Arthurk12
1431e76bfe feat(timer): add fields to the activate message 
Adds fields(stopwatch, running, time, accumulated, track) to the
activate timer message response in order to be able to log them in the
events.xml file.
 2023-06-02 09:12:43 -03:00
prlanzarin
4d1aa87a88 feat: only record media while meeting is being actively recorded 
Only record media (microphone, webcams and screens) while meeting is
being actively recorded (ie an user has enabled recording in the
conference). If the conference's recording is paused, media capture will
stop as well (with appropriate recording events).

A bigbluebutton.properties/API#create parameter called
`recordFullDurationMedia` is added to control this behavior. The default
is false (only capture while recording is active). Setting it to `true`
enables the current (legacy) behavior: always capture media if the
meeting's `recorded` prop is true.
 2023-05-31 16:36:11 -03:00
Gustavo Trott
51bdcededc Merge 2.7 into develop 2023-05-26 10:50:39 -03:00
Paulo Lanzarin
5447666c15
Merge branch 'v2.7.x-release' into port-timer 2023-05-26 10:33:38 -03:00
Paulo Lanzarin
171c7a6587
Merge branch 'v2.7.x-release' into v2.7.x-release 2023-05-26 09:27:14 -03:00
Anton Georgiev
4948731fe7
Merge pull request #17764 from lfzawacki/reactions-port 
feat: Port Mconf Reactions into BBB 2.7
 2023-05-26 08:05:02 -04:00
Anton Georgiev
1a1f442d5a
Merge pull request #17746 from Carloshsc/port-present-webcam-27 
feat(camera as content): present webcam
 2023-05-26 08:01:40 -04:00
prlanzarin
7c77fc7433 Merge remote-tracking branch 'origin/v2.7.x-release' into reactions-port 2023-05-25 19:54:01 -03:00
Arthurk12
196d2c1e0a feat(reactions): sync expiration with akka 
Currently, the reactions are cleared on mongo based on the expire time.
So to sync its state with akka, an observer is atattched to the user
reactions collection and whenever a reaction is removed because of the
expiration time, akka is notified with message 'UserReactionTimeExpiredCmdMsg'.
 2023-05-25 17:32:27 -03:00
Arthurk12
3efdbd9012 feat(reactions): add akka messages to clear all emojis status 
Adds two new messages which clear the users emoji statuses. This messages
enables this task to be done in a single call, instead of triggering one
method call for each user.
'ClearAllUsersEmojiCmdMsg' is sent from meteor to akka and updates all the
emoji states in the users model.
'ClearedAllUsersEmojiEvtMsg' is sent from akka to meteor. This triggers the
 mongo collection update.
 2023-05-24 10:49:42 -03:00
Arthurk12
f13217607e feat(timer): add model and messages to akka apps 
This commit makes the messages of the timer feature to be proxied by
akka-apps and also adds a timer model that is updated based on these
messages.
Moving the timer panel opening logic to the timer button component in
the navigation panel was a consequence of these changes.
 2023-05-18 15:29:42 -03:00
GuiLeme
1b26302745 [issue-17531] - merge upstream/v2.7.x-release 2023-05-16 15:30:15 -03:00
Gustavo Trott
e5f31e2f0b Add user customParameters to graphql 2023-05-15 17:21:36 -03:00
GuiLeme
89eafc6315 [issue-17531] - changes in review 2023-05-12 12:40:07 -03:00
GuiLeme
4c2806a018 [issue-17531] - changes in review and ES-lint fixes 2023-05-11 18:06:48 -03:00
Arthurk12
e902f2ee27 feat(screenshare): add contentType field 
This commit adds a contentType field in the back-end components of the
screenshare feature in order to accomodate the new 'camera as content'
feature.
 2023-05-09 17:21:47 -03:00
GuiLeme
d2c5b33eec [issue-17839] - back-end part for hide_presentation_on_join issue 2023-05-09 12:01:55 -03:00
GuiLeme
90078aedc7 [issue-17531] - resolve conflicts with 2.7 2023-05-04 08:56:27 -03:00
GuiLeme
f03c01399f [issue-17531] - added ConvertedPresentationName to be referenced when getting the link to downloading the original file 2023-05-02 11:14:40 -03:00
Lucas Fialho Zawacki
fee6ff026a feat(captions): Use setUserSpeechLocale as an akka event and catch it in the transcription manager 2023-04-25 09:54:34 -03:00
Lucas Fialho Zawacki
6979432c36 feat(transcription): Server side open source transcriptions 2023-04-24 18:23:34 -03:00
Gustavo Trott
768c4224a1 Resolve conflicts with 2.7 upstream 2023-04-24 18:02:06 -03:00
Gustavo Trott
d19d286811 Adds prop color for voiceUsers create msgs 2023-04-19 12:16:35 -03:00
GuiLeme
90bbb10de6 [issue-17531] - insert tag besides the presentation's name 2023-04-17 09:04:58 -03:00
Gustavo Trott
e3a2e4b01a Store sessionToken in akka-apps (in order to invalidate connections in graphql-middleware) 2023-04-14 15:48:10 -03:00
Gustavo Trott
b9c0909b2a Introduces redis msg InvalidateUserGraphqlConnectionSysMsg that will be listened by graphql-middleware 2023-04-14 13:38:15 -03:00
GuiLeme
536285fc37 [issue-17531] - restored old feature of downloading original presentation 2023-04-14 11:04:24 -03:00
Gustavo Trott
0b2bf8f68b Akka-apps will set mobile flag instead of Meteor 2023-04-06 17:43:57 -03:00
Gustavo Trott
0630fb05ea Moves user color picker to akka-apps instead of meteor-backend 2023-04-06 16:39:05 -03:00
Gustavo Trott
42711ac5ae Initial implementation of Postgres data and Hasura 2023-03-08 12:23:45 -03:00
GuiLeme
661ab05bfa [issue-16734] - changes in review 2023-02-24 12:52:01 -03:00
GuiLeme
d47d586f0e [issue-16734] - refactor disabledFeatures presentationArea to just presentation 2023-02-22 17:16:43 -03:00
GuiLeme
421717a817 [issue-16734] - patch for error handling 2023-02-21 08:41:05 -03:00
GuiLeme
5db178e6d1 [issue-13867] - related to #15118 2023-01-31 11:10:58 -03:00
GuiLeme
ce50e00cef [issue-13867] - remove and related settings 2023-01-31 10:30:55 -03:00
Anton Georgiev
f024171671 fix(sec): bump jackson to 2.13.5 2023-01-25 22:44:28 +00:00
Daniel Petri Rocha
2ecd3d6a80 Use prop as filename 2023-01-17 00:10:13 +01:00
Daniel Petri Rocha
a6b589a069 Add captured filename as breakout property 2023-01-16 23:00:27 +01:00
Daniel Petri Rocha
a8657ff0ed
Merge branch 'v2.6.x-release' into capture-slides-upload-toast 2022-12-22 21:18:14 +01:00
Anton Georgiev
c0626900fe
Merge pull request #15679 from ramonlsouza/rename-external-pres-params 
refactor: rename external upload parameters
 2022-12-22 13:00:52 -05:00
Anton Georgiev
a8d64e94d6 chore: upgrade scala 2.13.4 -> 2.13.9 2022-12-20 16:07:08 +00:00
KDSBrowne
09eb68f23b add lock setting for viewer annotations 2022-12-12 23:26:03 +00:00
Daniel Petri Rocha
d06a642ae9 Include timestamp in exported content 2022-12-09 23:48:04 +01:00
GuiLeme
5391bd1a83 [fix-check-mime-insert-document] - changes in review 2022-11-23 09:22:35 -03:00
Daniel Petri Rocha
587c11c56a Remove potential race condition 2022-11-23 01:25:03 +01:00
GuiLeme
058bbb039b [fix-check-mime-insert-document] - add validation to front-end 2022-11-22 17:41:57 -03:00
Gustavo Trott
8b7b501ea2
Merge pull request #15589 from danielpetri1/breakout-shared-notes-upload 2022-11-21 08:08:36 -03:00
Gustavo Trott
17a16eced5
Merge pull request #16022 from gustavotrott/presentation-refactor 2022-11-18 16:31:00 -03:00
Gustavo Trott
7781909d50 Removes all references to swf files (used by old flash client) 2022-11-17 10:55:19 -03:00
Daniel Petri Rocha
f6ccf74f9b Merge branch 'v2.6.x-release' into breakout-shared-notes-upload 2022-11-11 15:38:38 +01:00
Daniel Petri Rocha
334b97779b Merge branch 'v2.6.x-release' into capture-notes-toast 2022-11-10 23:01:28 +01:00
Gustavo Trott
50010ea528
Merge pull request #15894 from JoVictorNunes/shared-notes-on-media 2022-11-10 11:44:28 -03:00
Gustavo Trott
c9ddd971f5
Merge pull request #15857 from gustavotrott/max-users-improvements 
Closes https://github.com/bigbluebutton/bigbluebutton/issues/9354
 2022-11-07 21:24:07 -03:00
Daniel Petri Rocha
f7952fa256 Allow 16 simultaneous exports; remove timeout behavior 2022-11-03 18:09:48 +01:00
Joao Victor
08fac039c8 Merge branch 'v2.6.x-release' into shared-notes-on-media 2022-10-31 11:13:31 -03:00
Gustavo Trott
ba647cdd08 Handle Pin Shared Notes in akka-apps 2022-10-28 08:10:23 -03:00
Gustavo Trott
e2f9b19afc Merge remote-tracking branch 'upstream/v2.6.x-release' into max-users-improvements 2022-10-24 22:48:38 -03:00
Daniel Petri Rocha
0a2b4186a2 Merge branch 'v2.6.x-release' into breakout-upload-ui 2022-10-19 19:51:05 +02:00
Daniel Petri Rocha
dd06ce2660 Show UploadingPresentations toast upon breakout notes capture 
Displays a "To be uploaded..." toast in the main meeting while the shared notes of breakout rooms are being captured.
 2022-10-19 13:36:25 +02:00
Gustavo Trott
80ffb26fff Implements maxUserConcurrentAccesses and change participants count logic 2022-10-17 17:30:53 -03:00
Daniel Petri Rocha
f170bdc19b Merge branch 'v2.6.x-release' into capture-shared-notes 2022-10-06 22:38:21 +02:00
GuiLeme
5ca4a92940 [issue-pdf-100-processing] - resolved conflicts 2022-10-06 09:58:42 -03:00
Gustavo Trott
bbe3ca34a8
Merge pull request #15474 from GuiLeme/apply-toast-shared-notes 2022-10-05 12:02:04 -03:00
Daniel Petri Rocha
289f4125ec Perform captured pad upload 2022-09-28 19:56:29 +02:00
germanocaumo
d770a7df8c fix(whiteboard): only call annotation upsert in one frontend instance 
We were calling upsert in the Annotations collection for the same annotation in all frontend instances, this could lead to the same annotation being inserted
multiple times with different ids due to concurrency.

Added the html5InstanceId of the original request to the redis message so we can use it to only call upsert in one instance.
 2022-09-28 12:03:59 +00:00
Daniel Petri Rocha
76b24e1ec3 Route padId to bbb-export-annotations 2022-09-24 22:59:29 +02:00
GuiLeme
633a032fd0 [issue-pdf-100-processing] - implemented retry flow and fixed error message 2022-09-22 16:58:37 -03:00
Daniel Petri Rocha
e23d00004f 'Capture Shared Notes' button in front-end 2022-09-20 17:43:13 +02:00
Daniel Petri Rocha
c84c2e2892 Merge branch 'v2.6.x-release' into breakout-upload-ui 2022-09-19 19:30:18 +02:00
Daniel Petri Rocha
e5ed5a4546 Capture slides from breakout rooms upon their end 
Sends out the request to export the presentations from the main meeting to each breakout room.
The breakout rooms then generate the PDF file and upload it back to the main meeting.
 2022-09-18 15:55:20 +02:00
GuiLeme
39b6359441 [issue-pdf-100-processing] - fix timeout error when PDF is too complex. 2022-09-14 10:33:41 -03:00
Ramón Souza
ce539ec44a rename external upload parameters 2022-09-12 11:04:13 -03:00
Daniel Petri Rocha
41f71981f4 Working checkbox in backend 2022-09-11 20:12:37 +02:00
Daniel Petri Rocha
f1690247fd Include capture checkbox in bbb-html5 2022-09-05 19:27:38 +02:00
Daniel Petri Rocha
16b3d43f19 Initial back-end wiring for breakout slides capture 2022-09-04 22:34:04 +02:00
GuiLeme
2dec0f051b [apply-toast-shared-notes] - resolving conflicts 2022-09-02 16:08:24 -03:00
GuiLeme
80a381c87c [apply-toast-shared-notes] - resolved conflicts and refactored temporaryPresentationId's name 2022-09-02 15:24:29 -03:00
Gustavo Trott
f7f20f3e2e
Merge pull request #15251 from ramonlsouza/issue-15001 2022-09-02 09:44:10 -03:00
Ramón Souza
470f491352
Merge pull request #15583 from germanocaumo/tldraw-viewbox-sync 
fix(tldraw): sync viewed area between presenter/viewers +
 2022-08-30 17:00:14 -03:00
Ramón Souza
609d43157a Merge tag 'v2.5.5' into merge-2526-aug25 2022-08-25 14:33:44 -03:00
GuiLeme
d9de398d90 [fix-page-count-exeed] - Forwarded temporaryPresentationId to front-end and refactor it's name 2022-08-22 15:00:27 -03:00
Daniel Petri Rocha
d56acd4022 Initial backend+bbb-export-annotations wiring for toast messages 2022-08-16 20:27:40 +02:00
germanocaumo
d4b8bdce7e fix(tldraw): sync viewed area between presenter/viewers + 
- Return to the ResizeAndMoveSlide event to do pan&zoom, respecting the viewed width and height ratio
- Defaults zoom in toolbar to 100% like before to be more consistent
- Fit to width and Reset Zoom is back (fit tho width still has some sync problems)
- Fix to not change to first page when presenter reloads page
 2022-08-16 12:12:43 +00:00
GuiLeme
1e0700b455 [apply-toast-shared-notes] - merge 26 and resolved conflicts 2022-08-03 11:12:55 -03:00
GuiLeme
74caa9cb5f [apply-toast-shared-notes] - Savepoint - Made some changes 2022-08-02 17:25:15 -03:00
Ramón Souza
ccce085aed Merge remote-tracking branch 'upstream/v2.6.x-release' into issue-15001 2022-07-27 09:49:19 -03:00
Gustavo Trott
acb0465266
Merge pull request #15412 from JoVictorNunes/export-presentation 2022-07-26 17:49:09 -03:00
Daniel Petri Rocha
6ac3040d4a Fix multiple pres. export; include PresId in NewPresAnnFileAvailable msg. 2022-07-26 15:19:23 +02:00
Gustavo Trott
59ddf3e8e3 broadcast NewPresAnnFileAvailableMsg to html5 2022-07-20 20:20:32 -03:00
Pedro Beschorner Marin
b52c67d7a7 feat(captions): first pass on recording 
Add the main server-side adapter for using the legacy closed captions
recording process with the audio captions data.
 2022-07-20 17:20:52 +00:00
Pedro Beschorner Marin
307ab6ea40 feat(captions): add author avatar 
Include captions' author avatar at the live feedback to improve identification.
 2022-07-20 17:20:50 +00:00
Pedro Beschorner Marin
75969ec93c feat(captions): audio captions app 
Add a server-side app for the audio captions feature and record proto-events
for this data.

As it is, only behaves as a pass-through module. The idea is to include all
the business intelligence in this app.
 2022-07-20 17:20:48 +00:00
Mario Jr
ca6b020f82 fix(audio): prevent dial-in waiting / guest users to speak/listen to the room 
Based on the strategy proposed by @schrd in #15163
Also thanks to @jacotec and @maximilianhoecker for the help on investigating

Closes #15163
 2022-07-14 13:56:17 -03:00
Mario Jr
3f99413cbb fix(audio): prevent dial-in waiting / guest users to speak/listen to the room 
Based on the strategy proposed by @schrd in #15163
Also thanks to @jacotec and @maximilianhoecker for the help on investigating

Closes #15163
 2022-07-14 09:04:48 -03:00
Gustavo Trott
502523a048
Merge pull request #14562 from danielpetri1/container-approach 2022-06-30 11:33:47 -03:00
Paulo Lanzarin
885e0ca72c
Merge pull request #15281 from prlanzarin/u26/fix/sxs-callerId 
feat: add user name to checkAuthorization response, [...]
 2022-06-29 15:40:42 -03:00
Daniel Petri Rocha
27edc515a4 Merge remote-tracking branch 'upstream/v2.6.x-release' into container-approach 2022-06-29 19:41:34 +02:00
prlanzarin
a8c689c8c3 refactor: remove akka-bbb-transcode leftovers 
Follow up to the cleanup done in 143d9bbe87
 2022-06-29 17:24:56 +00:00
Anton Georgiev
61b269eca8
Merge pull request #15171 from GuiLeme/issue-15051 
refactor: Removed all traces of Red5
 2022-06-29 12:09:02 -04:00
prlanzarin
eeed5ce208 fix: add ban status to SFU audio permission check 
The UserJoinedVoice* event handler checks whether the caller is banned
and ejects them. That's valid for both SIP.js and SFU-based audio
flows, but for the latter there's a specific pre-flight permission check
as well.

This adds that same ban check to the pre-flight permission probe so that
calls are rejected earlier.
 2022-06-28 20:33:37 +00:00
Ramon Souza
17c0bced1d add uploadExternalDescription and uploadExternalUrl create params 2022-06-23 14:42:23 -03:00
prlanzarin
6e19eb55c7 fix(audio): decouple mic auth RPCs from global audio (SFU) 
The SFU microphone module was using global audio authentication RPCs in
akka-apps to determine whether a mic connection is valid.

Fixes an issue where SFU microphone connections wouldn't take lock
settings in account in the permission checks.

In detail: decouple them by adding GetMicrophonePermissionReqMsg and
RespMsg. Allows flexibility on which conditionals to use in both. IMO it
is also better than renaming+adding a boolean to GetGlobalAudioPermission*
due to the fact that it gets easier to guarantee backwards compatibility
between SFU and BBB (ie SFU 2.9 keeps working on 2.4, 2.5).
 2022-06-22 23:12:56 +00:00
GuiLeme
ac2e68842c Merge remote-tracking branch 'upstream/v2.6.x-release' into issue-15051 2022-06-20 16:12:25 -03:00
Ramon Souza
edeb70de0d Merge tag 'v2.5.1' into merge25-26-jun16 2022-06-16 13:58:54 -03:00
Daniel Petri Rocha
5f325ad134 Refactor Scala: immutability, no returns, recursion instead of loops 2022-06-15 15:11:39 +02:00
GuiLeme
beb0b507e0 [issue-15051] - Refactored all traces from Red5 2022-06-13 08:19:08 -03:00
Daniel Petri Rocha
1d0d4db2a7 Merge branch 'v2.6.x-release' into tldraw-with-annotation-export 2022-06-07 12:55:29 +02:00
Ramón Souza
f6b190aaa8
Merge pull request #15078 from lfzawacki/develop-layout 
fix(layout): Fix propagation bugs and allow moderators to set the pushLayout flag
 2022-06-02 19:48:07 +01:00
Lucas Zawacki
cd13446c5a fix(layout): Moderators could not change layout if pushLayout was true 2022-05-24 17:31:35 -03:00
Daniel Petri Rocha
7aa4de0096 Modify PresentationPageForExport parameters due to tldraw panzoom handling 2022-05-15 22:24:06 +02:00
Daniel Petri Rocha
c9b9ab65ef Merge branch 'export-annotations' into tldraw-with-annotation-export 2022-05-15 21:47:06 +02:00
Ramon Souza
3800065380 remove chat name 2022-05-13 17:44:41 -03:00
germanocaumo
45febec644 panAndZoom through akka + some cleanup 2022-05-13 02:47:41 +00:00
germanocaumo
234b2869e5 WIP: tldraw in akka-model & starting cleanup 2022-05-13 02:47:39 +00:00
Daniel Petri Rocha
19bbb4115d Refactor handlers, role validation 2022-04-30 23:28:11 +02:00
Daniel Petri Rocha
7851d54484 PDF file: include meeting and room name 2022-04-29 13:50:42 +02:00
Lucas
2db9a1b343
Merge branch 'develop' into develop-bbb 2022-04-26 15:08:43 -03:00
Arthurk12
cff605e996 feat(webcam): pin multiple cameras simultaneously 
Adds support for multiple cameras pins.
The pinned cameras are stored in a FIFO-type queue
When a camera is pinned the oldest one is removed.
The queue size can be set via create parameter 'maxPinnedCameras',
if not defaults to 3.
 2022-04-18 20:17:58 +00:00
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
Anton Georgiev
13bed65baf chore: drop obsolete Dockerfile from BBB 2022-04-12 20:34:28 +00: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