Commit Graph

32 Commits

Author SHA1 Message Date
34d55db6a6 Files: added invitation by link without email, added existing user to room by link 2022-06-16 18:39:50 +03:00
b693779ea1 Merge branch 'develop' into feature/docspace-pin 2022-06-08 16:38:16 +03:00
7b6abe81a2 Files: added custom tags 2022-05-20 19:26:13 +03:00
025d13557d added a secure link to invite to the portal 2022-05-13 19:25:28 +03:00
a0f67cfe27 add loggers 2022-05-12 11:14:00 +03:00
503672e6b2 Merge branch 'develop' into feature/docspace 2022-04-28 15:45:09 +03:00
13bbce8ea4 Custom logger replaced with Microsoft.Extensions.Logging 2022-04-26 20:53:48 +03:00
e38fcc1acb Files: refactor api, added query parameters 2022-04-25 00:08:01 +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
6ecc8e7071 code cleanup 2022-04-14 22:42:15 +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
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
244e345ac6 Merge 'feature/backend-refactor' into feature/builder-extensions 2022-03-22 15:57:46 +03: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
ff79769307 Files: improvements for automapping 2022-03-18 11:51:33 +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
5e2f575483 added builders extensions 2022-03-10 20:30:29 +03:00
99378a027e Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00
1d398d47f6 Merge branch 'feature/backend-refactor' into feature/files-refactor 2022-03-04 13:25:12 +03:00
3d2d6b12e6 Files: removed unnecessary usings 2022-03-03 21:19:52 +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
c827c628c5 Files: separated controllers 2022-03-03 20:33:11 +03:00
6495da0d0b Merge branch 'feature/backend-refactor' into feature/asc-messaging-system-refactor 2022-02-25 16:34:15 +03:00
8563fbc373 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/Middleware/CommonApiResponse.cs
#	common/ASC.Api.Core/Middleware/ResponseWrapper.cs
#	common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs
#	products/ASC.Files/Core/Configuration/FilesSettings.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Utils/FileUploader.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
2022-02-23 17:37:34 +03:00
9fe4971055 add mapping, project reorganization 2022-02-21 18:35:57 +03:00
6c62d3427e refactoring: add globalUsings: files 2022-01-26 16:04:06 +03:00