pavelbannov 545bacfaf0 Merge branch 'develop' into fix-conflicts-merge ... # Conflicts: # packages/client/src/pages/VersionHistory/Section/Body/index.js # products/ASC.Files/Core/Configuration/FilesSettings.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Security/FileSecurity.cs # products/ASC.Files/Core/Core/Security/FileShareOptions.cs # products/ASC.Files/Server/Api/FoldersController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs		2023-07-21 16:51:49 +03:00
..
Caching	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Collections	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
Data	refactoring	2022-11-24 17:21:34 +03:00
DependencyInjection	refactoring	2022-04-15 12:08:06 +03:00
Geolocation	Payments: fixed price for eu	2023-05-15 19:30:14 +03:00
Log	fix build	2022-07-22 11:54:42 +03:00
Logging	fix ide001	2022-11-07 12:49:29 +03:00
Mapping	fix	2022-09-08 18:39:53 +03:00
Module	remove waste asc.common	2022-09-01 11:16:46 +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	Common: refactor	2023-02-17 16:29:13 +03:00
Threading	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Utils	Merge branch 'develop' into feature/public-room-backend	2023-06-02 16:42:16 +03:00
Web	formats for editor(pr 1305)	2023-03-21 12:42:09 +03:00
ArgumentNullExceptionExtension.cs	IDE1006	2022-03-25 17:54:34 +03:00
ASC.Common.csproj	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
ASC.Common.sln	init commit	2019-05-15 17:56:09 +03:00
DIHelper.cs	DI: optimization	2022-11-25 17:00:49 +03:00
GlobalUsings.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
RegionSettings.cs	set region when start app	2022-11-30 19:03:44 +03:00