5fa9c839e6
Files: fix
2022-05-23 12:29:14 +03:00
c9357da3b0
Files: added deleting tags, fix
2022-05-23 12:25:33 +03:00
7b6abe81a2
Files: added custom tags
2022-05-20 19:26:13 +03:00
2e33540486
Merge branch 'feature/docspace' into feature/docspace-links
2022-05-17 11:53:37 +03:00
6c45bb0632
Merge branch 'develop' into feature/docspace
2022-05-17 11:50:56 +03:00
025d13557d
added a secure link to invite to the portal
2022-05-13 19:25:28 +03:00
68f949f2e7
Files: added link generation
2022-05-05 15:31:04 +03:00
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
2efbdddf15
Files: fix
2022-04-28 16:00:05 +03:00
503672e6b2
Merge branch 'develop' into feature/docspace
2022-04-28 15:45:09 +03:00
b6fe254379
Files: docspace default enabled
2022-04-28 12:40:17 +03:00
3d9e9eb94f
Files: refactor
2022-04-26 02:14:32 +03:00
e38fcc1acb
Files: refactor api, added query parameters
2022-04-25 00:08:01 +03:00
70006499f1
Files: removed unnecessary multipart api methods
2022-04-22 11:33:08 +03:00
639c6fc7cc
Files: removed unnecessary
2022-04-22 11:28:57 +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
bc64ff4cf7
Files: docspace check
2022-04-20 11:26:31 +03:00
a1df51bb5c
Files: added security api methods for rooms
2022-04-19 00:05:52 +03:00
57ae539f8b
Files: added api methods for form
2022-04-18 14:33:11 +03:00
678e1c2ada
Files: refactor
2022-04-18 14:12:29 +03:00
7f094cbf94
Files: added archive folder
2022-04-15 17:22:44 +03:00
8d4c248f2e
Files: added rename room api method
2022-04-13 17:25:12 +03:00
5badce9117
Files: added delete rooms api method
2022-04-13 16:01:50 +03:00
080dfd2bd8
Files: rename
2022-04-12 10:33:59 +03:00
efb225a3d8
Files: added creating rooms
2022-04-11 13:12:34 +03:00
8292795d8c
Files: added root folders filter
2022-04-10 15:30:46 +03:00
e78253a6b9
Files: added root virtual rooms folder
2022-04-10 14:35:43 +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
df8b7182b6
merge feature/backend-refactor
2022-03-29 16:12:36 +03:00
cfad6e7ee7
removed IServiceProvider
2022-03-28 19:51:16 +03:00
b4c44d1b09
Merge branch 'feature/backend-refactor' into feature/files-controller-refactor
2022-03-21 19:03:57 +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
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
b1664fd2e5
Files: renamed helper
2022-03-08 20:43:47 +03:00
358ea18086
Files: divided files controller helper
2022-03-08 20:37:23 +03:00
e58d3324f2
Files: renamed api parameters
2022-03-05 17:41:47 +03:00
1d398d47f6
Merge branch 'feature/backend-refactor' into feature/files-refactor
2022-03-04 13:25:12 +03:00
f82d9ffaf8
Files: used WebApplicationBuilder, implicit usings
2022-03-03 21:15:48 +03:00
99f0f702f8
Files: refactor
2022-03-03 21:01:34 +03:00
ee027f8508
Files: rremoved unnecessary
2022-03-03 20:55:16 +03:00
c827c628c5
Files: separated controllers
2022-03-03 20:33:11 +03:00
