-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feat/hot-chocolate-v14
# Conflicts: # src/Service.Dashboard/src/HttpApi/HttpApiServiceRegistration.cs # src/Service.Dashboard/src/HttpApi/Types/MachineType.cs # src/Service.Dashboard/src/HttpApi/Types/PathInfoType.cs # src/Service.Orchestrator/src/HttpApi/HttpApiServiceRegistration.cs # src/Service.Orchestrator/src/HttpApi/Resolvers/Directories/Queries/GetFileResolutionDistributionQuery.cs # src/Service.Orchestrator/src/HttpApi/Resolvers/Directories/Types/FileQualityDistribution.cs # src/Service.Orchestrator/src/HttpApi/Setup.cs # src/Service.Orchestrator/src/HttpApi/Types/Directories/Objects/FileSystemDirectoryType.cs # src/Service.Orchestrator/src/HttpApi/Types/DomainExceptionType.cs # src/Service.Orchestrator/src/HttpApi/Types/EncodeCodecType.cs # src/Service.Orchestrator/src/HttpApi/Types/EncodePresetType.cs # src/Service.Orchestrator/src/HttpApi/Types/EncodeQualityType.cs # src/Service.Orchestrator/src/HttpApi/Types/EncodeTuneType.cs # src/Service.Orchestrator/src/HttpApi/Types/Enumerations/Objects/EncodeCodecType.cs # src/Service.Orchestrator/src/HttpApi/Types/Enumerations/Objects/EncodePresetType.cs # src/Service.Orchestrator/src/HttpApi/Types/Enumerations/Objects/EncodeTuneType.cs # src/Service.Orchestrator/src/HttpApi/Types/Enumerations/Objects/VideoFileContainerType.cs # src/Service.Orchestrator/src/HttpApi/Types/Enumerations/Objects/VideoResolutionType.cs # src/Service.Orchestrator/src/HttpApi/Types/Files/Objects/AudioStreamType.cs # src/Service.Orchestrator/src/HttpApi/Types/Files/Objects/SubtitleStreamType.cs # src/Service.Orchestrator/src/HttpApi/Types/Files/Objects/VideoResolutionType.cs # src/Service.Orchestrator/src/HttpApi/Types/Files/Objects/VideoStreamType.cs # src/Service.Orchestrator/src/HttpApi/Types/Libraries/Objects/LibraryType.cs # src/Service.Orchestrator/src/HttpApi/Types/MachineType.cs # src/Service.Orchestrator/src/HttpApi/Types/PathInfoType.cs # src/Service.Orchestrator/src/HttpApi/Types/ValidationExceptionType.cs # src/Service.Orchestrator/src/HttpApi/Types/Values/Objects/MachineType.cs # src/Service.Orchestrator/src/HttpApi/Types/Values/Objects/PathInfoType.cs # src/Service.Orchestrator/src/HttpApi/Types/VideoFileContainerType.cs
- Loading branch information
Showing
188 changed files
with
717 additions
and
719 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 0 additions & 7 deletions
7
src/Service.Dashboard/src/Domain.Shared/Enums/ProcessorType.cs
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions
6
...tories/Commands/DirectoryProbeConsumer.cs → ...tories/Commands/DirectoryProbeConsumer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
.../GetFileResolutionDistributionConsumer.cs → .../GetFileResolutionDistributionConsumer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
.../Encodes/Commands/EncodeCancelConsumer.cs → .../Encodes/Commands/EncodeCancelConsumer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 6 additions & 6 deletions
12
.../Encodes/Commands/EncodeSubmitConsumer.cs → .../Encodes/Commands/EncodeSubmitConsumer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...codes/Events/RaiseEncodeOutputtedTopic.cs → ...codes/Events/RaiseEncodeOutputtedTopic.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...odes/Events/RaiseEncodeProgressedTopic.cs → ...odes/Events/RaiseEncodeProgressedTopic.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...s/Encodes/Events/RaiseEncodeSpeedTopic.cs → ...s/Encodes/Events/RaiseEncodeSpeedTopic.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...s/Events/RaiseEncodeStatusChangedTopic.cs → ...s/Events/RaiseEncodeStatusChangedTopic.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
.../Sagas/Activities/EncodeFailedActivity.cs → .../Sagas/Activities/EncodeFailedActivity.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
...ctivities/EncodeOperationBuiltActivity.cs → ...ctivities/EncodeOperationBuiltActivity.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...ities/EncodeOperationCompletedActivity.cs → ...ities/EncodeOperationCompletedActivity.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...s/EncodeOperationOutputtedDataActivity.cs → ...s/EncodeOperationOutputtedDataActivity.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...ties/EncodeOperationProgressedActivity.cs → ...ties/EncodeOperationProgressedActivity.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...ivities/EncodeOperationStartedActivity.cs → ...ivities/EncodeOperationStartedActivity.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...Sagas/Activities/EncodeRequestActivity.cs → ...Sagas/Activities/EncodeRequestActivity.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.