Commit Graph

348 Commits

Author SHA1 Message Date
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
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
7798898100 moved from hotfix/10.5.2 2020-01-16 21:17:17 +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
fbd6656df6 DI: little twitter fix 2019-12-20 16:07:27 +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
NikolayRechkin
8122eaffdb EF: added check for null 2019-12-19 17:06:18 +03:00
ec3a984e4a EF: notify. fix 2019-12-18 16:10:20 +03:00