-
-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #729 from Crypter-File-Transfer/stable
Merge 'stable' to 'main'
- Loading branch information
Showing
181 changed files
with
7,089 additions
and
1,648 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
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
80 changes: 40 additions & 40 deletions
80
...PI/Contracts/UploadFileTransferReceipt.cs → ...API/Contracts/UploadFileTransferBundle.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,40 @@ | ||
| /* | ||
| * Copyright (C) 2023 Crypter File Transfer | ||
| * | ||
| * This file is part of the Crypter file transfer project. | ||
| * | ||
| * Crypter is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * The Crypter source code is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * You can be released from the requirements of the aforementioned license | ||
| * by purchasing a commercial license. Buying such a license is mandatory | ||
| * as soon as you develop commercial activities involving the Crypter source | ||
| * code without disclosing the source code of your own applications. | ||
| * | ||
| * Contact the current copyright holder to discuss commercial license options. | ||
| */ | ||
|
|
||
| using Crypter.API.Contracts.ModelBinders; | ||
| using Crypter.Common.Contracts.Features.Transfer; | ||
| using Microsoft.AspNetCore.Http; | ||
| using Microsoft.AspNetCore.Mvc; | ||
|
|
||
| namespace Crypter.API.Contracts; | ||
|
|
||
| public class UploadFileTransferReceipt | ||
| { | ||
| [ModelBinder(BinderType = typeof(FormDataJsonBinder))] | ||
| public UploadFileTransferRequest? Data { get; init; } | ||
|
|
||
| public IFormFile? Ciphertext { get; init; } | ||
| } | ||
| /* | ||
| * Copyright (C) 2023 Crypter File Transfer | ||
| * | ||
| * This file is part of the Crypter file transfer project. | ||
| * | ||
| * Crypter is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * The Crypter source code is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * You can be released from the requirements of the aforementioned license | ||
| * by purchasing a commercial license. Buying such a license is mandatory | ||
| * as soon as you develop commercial activities involving the Crypter source | ||
| * code without disclosing the source code of your own applications. | ||
| * | ||
| * Contact the current copyright holder to discuss commercial license options. | ||
| */ | ||
|
|
||
| using Crypter.API.Contracts.ModelBinders; | ||
| using Crypter.Common.Contracts.Features.Transfer; | ||
| using Microsoft.AspNetCore.Http; | ||
| using Microsoft.AspNetCore.Mvc; | ||
|
|
||
| namespace Crypter.API.Contracts; | ||
|
|
||
| public class UploadFileTransferBundle | ||
| { | ||
| [ModelBinder(BinderType = typeof(FormDataJsonBinder))] | ||
| public UploadFileTransferRequest? Data { get; init; } | ||
|
|
||
| public IFormFile? Ciphertext { get; init; } | ||
| } |
80 changes: 40 additions & 40 deletions
80
...Contracts/UploadMessageTransferReceipt.cs → .../Contracts/UploadMessageTransferBundle.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,40 @@ | ||
| /* | ||
| * Copyright (C) 2023 Crypter File Transfer | ||
| * | ||
| * This file is part of the Crypter file transfer project. | ||
| * | ||
| * Crypter is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * The Crypter source code is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * You can be released from the requirements of the aforementioned license | ||
| * by purchasing a commercial license. Buying such a license is mandatory | ||
| * as soon as you develop commercial activities involving the Crypter source | ||
| * code without disclosing the source code of your own applications. | ||
| * | ||
| * Contact the current copyright holder to discuss commercial license options. | ||
| */ | ||
|
|
||
| using Crypter.API.Contracts.ModelBinders; | ||
| using Crypter.Common.Contracts.Features.Transfer; | ||
| using Microsoft.AspNetCore.Http; | ||
| using Microsoft.AspNetCore.Mvc; | ||
|
|
||
| namespace Crypter.API.Contracts; | ||
|
|
||
| public class UploadMessageTransferReceipt | ||
| { | ||
| [ModelBinder(BinderType = typeof(FormDataJsonBinder))] | ||
| public UploadMessageTransferRequest? Data { get; init; } | ||
|
|
||
| public IFormFile? Ciphertext { get; init; } | ||
| } | ||
| /* | ||
| * Copyright (C) 2023 Crypter File Transfer | ||
| * | ||
| * This file is part of the Crypter file transfer project. | ||
| * | ||
| * Crypter is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * The Crypter source code is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * You can be released from the requirements of the aforementioned license | ||
| * by purchasing a commercial license. Buying such a license is mandatory | ||
| * as soon as you develop commercial activities involving the Crypter source | ||
| * code without disclosing the source code of your own applications. | ||
| * | ||
| * Contact the current copyright holder to discuss commercial license options. | ||
| */ | ||
|
|
||
| using Crypter.API.Contracts.ModelBinders; | ||
| using Crypter.Common.Contracts.Features.Transfer; | ||
| using Microsoft.AspNetCore.Http; | ||
| using Microsoft.AspNetCore.Mvc; | ||
|
|
||
| namespace Crypter.API.Contracts; | ||
|
|
||
| public class UploadMessageTransferBundle | ||
| { | ||
| [ModelBinder(BinderType = typeof(FormDataJsonBinder))] | ||
| public UploadMessageTransferRequest? Data { get; init; } | ||
|
|
||
| public IFormFile? Ciphertext { get; init; } | ||
| } |
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.