|
e68ac70005
|
Merge branch 'develop' into feature/docspace
|
2022-06-20 12:15:08 +03:00 |
|
|
8ea04bcc81
|
Merge branch 'develop' into feature/12.0
# Conflicts:
# common/ASC.MessagingSystem/Data/MessagesRepository.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
|
2022-06-17 19:19:00 +03:00 |
|
|
b693779ea1
|
Merge branch 'develop' into feature/docspace-pin
|
2022-06-08 16:38:16 +03:00 |
|
|
025d13557d
|
added a secure link to invite to the portal
|
2022-05-13 19:25:28 +03:00 |
|
|
f195f7113c
|
add loggers
|
2022-05-06 11:23:18 +03:00 |
|
|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
|
fe39f4d398
|
fix namespaces
|
2022-04-26 21:34:27 +03:00 |
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +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 |
|
|
33eac101fc
|
fixed usings
|
2022-04-01 22:49:12 +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 |
|
|
e7e0f5327a
|
Merge branch 'feature/backend-refactor' into feature/log-refactor
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
|
2022-03-28 14:29:36 +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 |
|
|
079618e4e2
|
refactor
|
2022-03-23 16:08:27 +03:00 |
|
|
63e12f49ab
|
merge from feature/backend-refactor
|
2022-03-23 14:56:18 +03:00 |
|
|
244e345ac6
|
Merge 'feature/backend-refactor' into feature/builder-extensions
|
2022-03-22 15:57:46 +03:00 |
|
|
f4c75f91f4
|
refactor
|
2022-03-22 15:46:13 +03:00 |
|
|
b4c44d1b09
|
Merge branch 'feature/backend-refactor' into feature/files-controller-refactor
|
2022-03-21 19:03:57 +03:00 |
|
|
21f85e7260
|
logger refactoring. added resolver ILog/IOptionsMonitor<ILog>
|
2022-03-17 09:55:08 +03:00 |
|
|
c62bd4a6d1
|
fix
|
2022-03-15 22:05:54 +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 |
|
|
2585c22b3b
|
merge from feature/backend-refactor
|
2022-03-09 12:10:30 +03:00 |
|
|
99378a027e
|
Csproj: ImplicitUsings
|
2022-03-05 11:20:05 +03:00 |
|
|
609427bf20
|
merge from feature/backend-refactor
|
2022-03-01 15:57:49 +03:00 |
|
|
d1f7d41a57
|
Merge branch 'feature/backend-refactor' into feature/asc-audit-trail-refactor
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
# common/services/ASC.AuditTrail/AuditEventsRepository.cs
# common/services/ASC.AuditTrail/LoginEventsRepository.cs
# common/services/ASC.AuditTrail/Mappers/AuditActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/CrmActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/DocumentsActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/LoginActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/OthersActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/PeopleActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/ProjectsActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/SettingsActionMapper.cs
# common/services/ASC.ClearEvents/ClearEventsServiceLauncher.cs
|
2022-02-10 21:54:45 +03:00 |
|
|
179c8ddb84
|
ApiCore: single line expressions replaced by expressions with braces
|
2022-02-07 19:03:16 +03:00 |
|
|
c67c5e80e2
|
Merge branch 'feature/backend-refactor' into feature/asc-audit-trail-refactor
|
2022-02-04 23:20:49 +03:00 |
|
|
a913fa4589
|
Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor
|
2022-02-04 23:16:18 +03:00 |
|
|
3ad4ba6c08
|
fix after merge
|
2022-02-03 16:53:34 +03:00 |
|
|
487a55a99e
|
ApiCore: used file-scope namespaces, fix conflicts
|
2022-02-03 16:19:48 +03:00 |
|
|
c2d3d10ec5
|
refactoring : bugfix
|
2022-02-02 13:09:37 +03:00 |
|
|
6a918e52a2
|
refactoring: add globalUsing: api.core
|
2022-01-26 11:06:31 +03:00 |
|