4a773679e1
fix-tests: rework files tests
...
-rework tests (use httpClient)
-fix migration
-add description
-union similar tests
-add random port for asc.Files
-add time to db name
-change TestCaseSource to TestCase
2022-04-28 18:55:41 +03:00
9eba173a44
Merge branch 'develop' into feature/backend-refactor
...
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2022-04-21 22:36:29 +03:00
1dff9e18c4
Merge branch 'develop' into feature/backend-refactor
...
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.IPSecurity/IPRestrictionsRepository.cs
# common/ASC.IPSecurity/IPRestrictionsService.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-04-21 17:51:31 +03:00
3380e87811
Files: oforms gallery manager
2022-04-20 10:34:33 +03:00
e603b26caa
refactoring
2022-04-15 13:27:48 +03:00
cb2580dd50
refactoring
2022-04-15 12:08:06 +03:00
6ecc8e7071
code cleanup
2022-04-14 22:42:15 +03:00
f138ff7c79
fixed warnings
2022-04-14 22:23:57 +03:00
Timofey Boyko
792bd7065f
Merge branch 'develop' into feature/virtual-rooms-1.2
2022-04-13 10:22:20 +03:00
4828678e03
merge from feature/backend-refactor
2022-04-12 22:04:10 +03:00
900d33b2d1
fix copyas
2022-04-12 18:31:50 +03:00
1ea6058232
fixed owner method
2022-04-12 13:21:39 +03:00
387119f6f2
remove waste
2022-04-11 10:58:18 +03:00
6dfb0d86d5
filter of files
...
add searchInContent in filesController's methods
2022-04-06 14:32:15 +03:00
a150b59fd9
Merge branch 'develop' into feature/virtual-rooms-1.2
2022-04-05 12:16:27 +03:00
49abfdf84a
fix docxf templates
2022-04-05 12:07:46 +03:00
c44ff9a190
fix
2022-04-01 17:14:14 +03:00
1e13f42c9c
Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
...
# Conflicts:
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Server/Api/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-04-01 15:17:46 +03:00
49efbc9780
refactoring: remove IServiceProvider
2022-03-31 20:32:46 +03:00
90623263e9
merge from feature/backend-refactor
2022-03-29 23:29:03 +03:00
df8b7182b6
merge feature/backend-refactor
2022-03-29 16:12:36 +03:00
4fe34215c9
Merge pull request #580 from ONLYOFFICE/feature/files-mapping
...
Feature/files mapping
2022-03-29 16:59:43 +04:00
cfad6e7ee7
removed IServiceProvider
2022-03-28 19:51:16 +03:00
81f3a1fb09
DistributedTaskQueue refactoring. set MaxThreadsCount to 1
2022-03-26 16:31:13 +03:00
1ee814a2ef
Merge branch 'feature/backend-refactor' into feature/files-controller-refactoring
...
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
# products/ASC.Files/Server/GlobalUsings.cs
2022-03-24 17:11:33 +03:00
cb4d39e427
refactor
2022-03-23 19:23:25 +03:00
a857089ee6
renamed
2022-03-23 17:33:43 +03:00
079618e4e2
refactor
2022-03-23 16:08:27 +03:00
244e345ac6
Merge 'feature/backend-refactor' into feature/builder-extensions
2022-03-22 15:57:46 +03:00
82c96d160f
Merge branch 'feature/backend-refactor' into feature/files-mapping
2022-03-22 12:09:41 +03:00
172eaa8985
Merge pull request #589 from ONLYOFFICE/feature/update-packages
...
Feature/update packages
2022-03-21 22:24:11 +04:00
b4c44d1b09
Merge branch 'feature/backend-refactor' into feature/files-controller-refactor
2022-03-21 19:03:57 +03:00
cf8c1ba3ff
Merge branch 'feature/backend-refactor' into feature/files-mapping
2022-03-21 18:52:09 +03:00
a6f111463b
refactor
2022-03-21 18:11:26 +03:00
7f81a77556
Redis.Newtonsoft, Redis.AspNetCore moved to shared ASC.Api.Core
2022-03-21 17:53:23 +03:00
e9671701cb
Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core
2022-03-21 17:39:01 +03:00
8381b3e9c6
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
2022-03-21 17:15:55 +03:00
6e4761b8c2
Systemd package moved to shared ASC.Api.Core
2022-03-21 16:40:09 +03:00
a3f85f8e0b
Merge branch 'feature/backend-refactor' into feature/update-packages
2022-03-21 14:44:30 +03:00
679aecbc76
Merge branch 'feature/backend-refactor' into feature/license-refactor
...
# Conflicts:
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
2022-03-20 16:47:31 +03:00
868492b562
Merge branch 'develop' into feature/backend-refactor
...
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Billing/BillingClient.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Notify/Context.cs
# common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
# common/ASC.FederatedLogin/Helpers/RequestHelper.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Helpers/DocuSignHelper.cs
# products/ASC.Files/Core/Helpers/EasyBibHelper.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
2022-03-19 22:16:03 +03:00
21a8c0e0fc
removed httpclient ctor
2022-03-18 22:34:01 +03:00
37e0a4715c
fix tests
2022-03-18 18:44:00 +03:00
ff79769307
Files: improvements for automapping
2022-03-18 11:51:33 +03:00
Timofey Boyko
27fab6de23
Merge branch 'feature/virtual-rooms-1.2' into feature/refactoring-pagelayout
2022-03-18 11:05:58 +03:00
fb675dd307
updated packages
2022-03-16 16:37:56 +03:00
65db98f65c
added new license headers
2022-03-15 21:00:53 +03:00
3d50d7977b
removed past license headers
2022-03-15 19:59:24 +03:00
7bb1f0c755
Files: added DownloadModelBinder
2022-03-15 16:47:37 +03:00
882507496d
added new routing mechanism
2022-03-14 13:57:59 +03:00
