Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/2.x' and bump Dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
SamuelWei committed Mar 28, 2024
2 parents b6de7a0 + 474288a commit 6319ae1
Show file tree
Hide file tree
Showing 4 changed files with 2,027 additions and 2,004 deletions.
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [v3.0.2] - 2024-03-28
### Changed
- Bump Dependencies

## [v2.4.3] - 2024-03-28
### Changed
- Bump Dependencies

## [v3.0.1] - 2024-01-09
### Fixed
Expand Down Expand Up @@ -721,7 +728,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#743]: https://github.com/THM-Health/PILOS/pull/743
[#747]: https://github.com/THM-Health/PILOS/pull/747

[unreleased]: https://github.com/THM-Health/PILOS/compare/v3.0.1...develop
[unreleased]: https://github.com/THM-Health/PILOS/compare/v3.0.2...develop
[v1.0.0]: https://github.com/THM-Health/PILOS/releases/tag/v1.0.0
[v1.1.0]: https://github.com/THM-Health/PILOS/releases/tag/v1.1.0
[v1.2.0]: https://github.com/THM-Health/PILOS/releases/tag/v1.2.0
Expand Down Expand Up @@ -760,5 +767,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[v2.4.0]: https://github.com/THM-Health/PILOS/releases/tag/v2.4.0
[v2.4.1]: https://github.com/THM-Health/PILOS/releases/tag/v2.4.1
[v2.4.2]: https://github.com/THM-Health/PILOS/releases/tag/v2.4.2
[v2.4.3]: https://github.com/THM-Health/PILOS/releases/tag/v2.4.3
[v3.0.0]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.0
[v3.0.1]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.1
[v3.0.2]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.2
5 changes: 3 additions & 2 deletions app/Services/MeetingService.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use App\Models\Room;
use Auth;
use BigBlueButton\Core\MeetingLayout;
use BigBlueButton\Enum\Feature;
use BigBlueButton\Parameters\CreateMeetingParameters;
use BigBlueButton\Parameters\EndMeetingParameters;
use BigBlueButton\Parameters\GetMeetingInfoParameters;
Expand Down Expand Up @@ -77,12 +78,12 @@ public function start(): bool
->setWebcamsOnlyForModerator($this->meeting->room->webcams_only_for_moderator)
->setLockSettingsDisablePrivateChat($this->meeting->room->lock_settings_disable_private_chat)
->setLockSettingsDisablePublicChat($this->meeting->room->lock_settings_disable_public_chat)
->setLockSettingsDisableNote($this->meeting->room->lock_settings_disable_note)
->setLockSettingsDisableNotes($this->meeting->room->lock_settings_disable_note)
->setLockSettingsHideUserList($this->meeting->room->lock_settings_hide_user_list)
->setLockSettingsLockOnJoin($this->meeting->room->lock_settings_lock_on_join)
->setMuteOnStart($this->meeting->room->mute_on_start)
->setMeetingLayout(MeetingLayout::CUSTOM_LAYOUT)
->setLearningDashboardEnabled(false);
->setDisabledFeatures([Feature::LEARNING_DASHBOARD]);

// get files that should be used in this meeting and add links to the files
$files = $this->meeting->room->files()->where('use_in_meeting', true)->orderBy('default', 'desc')->get();
Expand Down

0 comments on commit 6319ae1

Please sign in to comment.