Commit Graph

234 Commits

Author SHA1 Message Date
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
63ecb8fc87 Consumers: fix 2020-04-16 14:33:35 +03:00
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
3f4ad15b46 Files: fropbox 2020-03-06 16:17:17 +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
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
671d17c55a EF: Added opportunity to get string query from EF linq 2020-02-17 17:43:58 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
785cc4c5a3 Files: DI 2020-02-13 18:12:27 +03:00
3fa9046bec Merge branch 'master' into feature/elastic 2020-02-11 14:08:26 +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
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
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
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
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
4bad85defe moved from hotfix/10.5.2 2020-01-17 16:58:26 +03:00
ce6dfdf7e0 moved from hotfix/10.5.2 2020-01-17 12:25:22 +03:00
dd28738907 Settings: Added SendOwnerChangeInstructions and ChangeOwner 2020-01-15 18:22:43 +03:00
e4c1de4494 Core: Common: Fix "Sequence contains more than one matching element" on get TenantQuota 2019-12-26 10:13:09 +03:00
f0434a6546 People: fixed search by text 2019-12-25 18:28:19 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +03:00
04be312da4 EF: tenants. Use entity 2019-12-23 17:26:38 +03:00
51a9b78749 EF: feed. AddOrUpdate 2019-12-23 16:36:37 +03:00
2782d9f64c Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	common/ASC.VoipService/Dao/VoipDao.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
496854b0d1 Consumer: rename param name to key 2019-12-23 15:57:09 +03:00
82cc503636 EF: table renamed 2019-12-23 15:41:43 +03:00
26d02ba215 EF: Mail. QuotaError - bool 2019-12-23 15:38:26 +03:00
618a98e077 Merge branch 'feature/ef' of github.com:ONLYOFFICE/AppServer into feature/ef 2019-12-23 15:02:07 +03:00
2097fcdb32 EF: removed comment 2019-12-23 15:01:48 +03:00
65870f460b Removed unused elements 2019-12-20 14:27:03 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00