ce1917c77f
Async: refactoring
2022-08-03 17:29:20 +03:00
e68ac70005
Merge branch 'develop' into feature/docspace
2022-06-20 12:15:08 +03:00
35bebe49f9
moved from ddf515b8
2022-06-14 11:11:41 +03:00
b693779ea1
Merge branch 'develop' into feature/docspace-pin
2022-06-08 16:38:16 +03:00
13ad4381f7
Api: removed CustomHttpMethodAttribute
...
added AllowNotPaymentAttribute
2022-05-23 18:48:23 +03:00
36855d656f
remove application/x-www-form-urlencoded
2022-05-17 12:29:24 +03:00
6c45bb0632
Merge branch 'develop' into feature/docspace
2022-05-17 11:50:56 +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
503672e6b2
Merge branch 'develop' into feature/docspace
2022-04-28 15:45:09 +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
e78253a6b9
Files: added root virtual rooms folder
2022-04-10 14:35:43 +03:00
b4c44d1b09
Merge branch 'feature/backend-refactor' into feature/files-controller-refactor
2022-03-21 19:03:57 +03:00
65db98f65c
added new license headers
2022-03-15 21:00:53 +03:00
882507496d
added new routing mechanism
2022-03-14 13:57:59 +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
c827c628c5
Files: separated controllers
2022-03-03 20:33:11 +03:00
