pavelbannov e17f49e344 Merge branch 'develop' into feature/LDAP-new ... # Conflicts: # ASC.Web.sln # common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs # web/ASC.Web.Api/ASC.Web.Api.csproj # web/ASC.Web.Api/GlobalUsings.cs		2022-06-28 14:30:40 +03:00
..
Caching	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
Collections	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
Data	fileconverter: moved timer to separete worker service	2022-06-08 17:25:25 +03:00
DependencyInjection	refactoring	2022-04-15 12:08:06 +03:00
Geolocation	code cleanup	2022-04-14 22:42:15 +03:00
Log	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
Logging	Custom logger replaced with Microsoft.Extensions.Logging	2022-04-26 20:53:48 +03:00
Mapping	Merge branch 'feature/backend-refactor' into feature/files-mapping	2022-03-21 18:52:09 +03:00
Module	added new license headers	2022-03-15 21:00:53 +03:00
Properties	added new license headers	2022-03-15 21:00:53 +03:00
protos	remove unused proto file	2022-04-02 14:59:42 +03:00
Security	refactoring	2022-05-05 16:23:05 +03:00
Threading	fileconverter: moved timer to separete worker service	2022-06-08 17:25:25 +03:00
Utils	moved from ddf515b8	2022-06-01 17:07:08 +03:00
Web	moved from ddf515b8	2022-06-01 17:07:08 +03:00
ArgumentNullExceptionExtension.cs	IDE1006	2022-03-25 17:54:34 +03:00
ASC.Common.csproj	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
ASC.Common.sln	init commit	2019-05-15 17:56:09 +03:00
DIHelper.cs	refactoring	2022-04-15 12:08:06 +03:00
GlobalUsings.cs	moved from ddf515b8	2022-06-01 17:07:08 +03:00