pavelbannov 978cf0e34e Merge branch 'master' into feature/files-refactoring ... # Conflicts: # products/ASC.Files/Server/Controllers/FilesController.cs # products/ASC.Files/Server/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Server/Services/WCFService/FileOperations/FileOperation.cs		2020-03-19 16:07:16 +03:00
..
Billing	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00
Caching	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00
Configuration	Files: fropbox	2020-03-06 16:17:17 +03:00
Context	Files: fixed removing file method	2020-03-04 10:42:43 +03:00
Contracts	Code Cleanup	2019-08-15 15:04:42 +03:00
Core	Added DIHelper	2020-02-17 11:58:14 +03:00
Data	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00
EF	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00
Notify	Added DIHelper	2020-02-17 11:58:14 +03:00
Properties	Code Cleanup	2019-08-15 15:04:42 +03:00
protos	Merge branch 'master' into refactoring/di	2019-10-30 11:45:55 +03:00
Security	Added DIHelper	2020-02-17 11:58:14 +03:00
Settings	Added DIHelper	2020-02-17 11:58:14 +03:00
Tenants	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00
Tests	DI: HostedSolution	2020-02-20 11:05:10 +03:00
Users	Added DIHelper	2020-02-17 11:58:14 +03:00
WhiteLabel	Added DIHelper	2020-02-17 11:58:14 +03:00
ASC.Core.Common.csproj	updated dependecies	2020-02-21 11:13:01 +03:00
BaseCommonLinkUtility.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
GeolocationHelper.cs	EF: GeolocationHelper	2019-12-13 16:05:24 +03:00
HostedSolution.cs	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00
MultiRegionHostedSolution.cs	DI: HostedSolution	2020-02-20 11:05:10 +03:00