Commit Graph

368 Commits

Author SHA1 Message Date
ef806e6c2b Added url shortener service launcher 2020-03-05 14:55:12 +03:00
48cb7728ce Added url shortener service 2020-03-05 14:45:34 +03:00
c780a881df Files: fixed removing file method 2020-03-04 10:42:43 +03:00
46ae46dcd1 Files: fixed start services 2020-02-27 11:44:55 +03:00
35e2e20049 Files: added model 2020-02-25 15:21:48 +03:00
44ec45ebb6 Merge branch 'master' into feature/elastic
# Conflicts:
#	common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/AuthManager.cs
#	common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Data/DbSettingsManager.cs
#	common/ASC.Core.Common/Tenants/TenantUtil.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2020-02-25 11:24:45 +03:00
30d952b946 fix 2020-02-21 15:38:04 +03:00
7fce0d5de6 EF: GetKeys - is now public 2020-02-21 14:23:56 +03:00
8b29a20411 EF: AddOrUpdate now return entity 2020-02-21 12:58:40 +03:00
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
1caab63fbc HostedSolution: DI 2020-02-20 11:16:58 +03:00
fbce5f3845 DI: HostedSolution 2020-02-20 11:05:10 +03:00
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +03:00
56d5d3f111 Files: Resources, EF 2020-02-18 11:39:28 +03:00
671d17c55a EF: Added opportunity to get string query from EF linq 2020-02-17 17:43:58 +03:00
45266f6647 DIHelper: fixed configure method 2020-02-17 15:13:40 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
c082019270 Files: DI 2020-02-14 13:45:46 +03:00
785cc4c5a3 Files: DI 2020-02-13 18:12:27 +03:00
c0cc00bfbe Files:DI 2020-02-13 15:19:25 +03:00
efef2f696d Files: DI 2020-02-12 16:50:38 +03:00
fdf5b27903 Files: DI 2020-02-11 18:10:30 +03:00
3fa9046bec Merge branch 'master' into feature/elastic 2020-02-11 14:08:26 +03:00
1291be98e3 Autofac: fix 2020-02-11 13:47:04 +03:00
96687f4fa6 Files: DI 2020-02-07 14:34:25 +03:00
3c23e2f4a7 Files: DI 2020-02-07 13:29:16 +03:00
7183be383f Core: fixed removing group 2020-02-06 18:35:24 +03:00
35eca0d863 Files: DI 2020-02-06 11:56:12 +03:00
201bd72624 EF: Added ignore case for search users by filter text 2020-02-05 16:59:04 +03:00
508efb1fca Files: EF, DI 2020-02-05 16:33:09 +03:00
ff84afb110 Merge branch 'master' into feature/elastic
# Conflicts:
#	web/ASC.Web.Core/SetupInfo.cs
2020-02-05 11:43:03 +03:00
767448acb9 Files: EF, DI 2020-02-04 11:41:04 +03:00
671b043b7e Files: GoogleDriveApp 2020-02-03 16:31:42 +03:00
8c2b39406f Merge branch 'master' into feature/merge 2020-02-03 14:29:41 +03:00
7a9b02abdb TreatWarningsAsErrors=false 2020-02-03 14:27:41 +03:00
709343fc17 fixed removing from group 2020-02-03 14:27:13 +03:00
f017d9cc23 fix from review 2020-02-03 13:48:06 +03:00
51d8b9758c Files: BoxApp 2020-02-03 13:41:24 +03:00
acde301b26 Merge branch 'master' into feature/merge 2020-01-31 10:59:00 +03:00
b087949c10 Files: init commit 2020-01-27 14:15:18 +03:00
0ced5c1fda ElasticSearch: first version 2020-01-24 16:07:51 +03:00
d3db1d0beb ResManager: DI fix 2020-01-23 14:03:38 +03:00
97215d0f95 moved from hotfix/10.5.2 2020-01-21 18:28:34 +03:00
cba569ac6a moved from hotfix/10.5.2 2020-01-21 17:41:10 +03:00
9ff06671c2 moved from hotfix/10.5.2 2020-01-21 16:40:01 +03:00
2722dfd693 moved from hotfix/10.5.2 2020-01-21 15:44:05 +03:00
d2bf5ece2b EF: fixed GetUserGroupRefs 2020-01-21 13:52:04 +03:00
011972be6f fixed method set people admin 2020-01-21 12:03:25 +03:00
84062bc0c4 EF: fixed argumentNullException 2020-01-20 18:09:52 +03:00