Commit Graph

18 Commits

Author SHA1 Message Date
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
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
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
99378a027e Csproj: ImplicitUsings 2022-03-05 11:20:05 +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