Commit Graph

534 Commits

Author SHA1 Message Date
212fb746c9 Files: thirdparty fix 2020-03-16 11:25:39 +03:00
5671ee6133 Files: fixed long operation 2020-03-06 17:48:58 +03:00
3f4ad15b46 Files: fropbox 2020-03-06 16:17:17 +03:00
10ec08c08e Partial autofac registration 2020-03-05 17:32:09 +03:00
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
67e7f536d1 ASC.ApiSystem: fixed auth header parsing 2020-02-25 15:06:16 +03:00
d44e359f24 ASC.ApiSystem: fixed using 2020-02-25 14:48:14 +03:00
39128a7ba0 ASC.ApiSystem: replace AuthSignatureAttribute with AuthHandler 2020-02-25 14:43:01 +03:00
28d932afff ASC.ApiSystem: added appsettings.services.json 2020-02-25 12:05:27 +03:00
449c0db1fa ASC.ApiSystem: replace HttpResponseMessage to IActionResult 2020-02-25 11:45:16 +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
a90b1fb424 People: added GetExpression 2020-02-25 11:02:13 +03:00
9db8b26985 Replaced NewtonsoftJson with System.Text.Json 2020-02-21 16:19:32 +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
46cfe9f382 ASC.ApiSystem: AuthSignatureService: using IConfiguration 2020-02-21 12:45:59 +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
f202b8f886 Merge remote-tracking branch 'remotes/origin/master' into feature/apisystem 2020-02-20 17:50:30 +03:00
edbb9088b1 ASC.ApiSystem: DI HostedSolution 2020-02-20 17:50:05 +03:00
0d01a4ff34 Merge remote-tracking branch 'remotes/origin/master' into feature/apisystem 2020-02-20 11:59:28 +03:00
1caab63fbc HostedSolution: DI 2020-02-20 11:16:58 +03:00
fbce5f3845 DI: HostedSolution 2020-02-20 11:05:10 +03:00
f83dcbced0 Added ASC.ApiSystem.csproj 2020-02-19 16:19: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
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
fe378e1eef EF: AuditEvent. fix Remove Old Event 2019-12-18 15:24:22 +03:00
f61fb897ac EF: added Dbfunction 2019-12-18 15:22:31 +03:00
f696558445 EF: AddOrUpdate 2019-12-17 16:01:59 +03:00
b2002a08db EF: MultiRegionHostedSolution 2019-12-17 11:27:38 +03:00
04d8bf05eb EF: MultiRegionalDbManager 2019-12-16 17:55:59 +03:00
f0f6b0a299 EF: resourceManager 2019-12-16 12:30:01 +03:00
08c98691d5 EF: GeolocationHelper 2019-12-13 16:05:24 +03:00
db5f113480 EF: Mail 2019-12-13 14:37:58 +03:00
b3c64af077 EF: files renamed 2019-12-12 18:33:48 +03:00
7ebca49738 EF: MobileAppInstall 2019-12-12 18:24:47 +03:00
a47196dc05 EF: Voip 2019-12-11 17:30:28 +03:00
6cd6eedde0 EF: notify 2019-12-11 12:47:55 +03:00
a4cfdb173c EF: fix 2019-12-10 18:31:37 +03:00
5d7f58cc2c EF: refactoring 2019-12-10 18:06:51 +03:00
aed98bea9a EF: ipRestriction 2019-12-10 17:47:48 +03:00
a623670582 EF: notify 2019-12-10 16:42:29 +03:00
6466aa9fc4 EF: Feed 2019-12-10 13:01:45 +03:00
4dfbdde28e EF: Feed 2019-12-10 11:54:53 +03:00
23838c0401 EF: files, Feed 2019-12-09 14:59:22 +03:00
b349a46649 EF: WebstudioUserVisit 2019-12-06 19:01:12 +03:00
8ad3b1ca1d "DeleteOldEvents" temporary removed 2019-12-06 13:32:10 +03:00
b4e5ac2e80 EF up to 3.1. 2019-12-06 13:31:24 +03:00
08db3b32b3 Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
2019-12-06 12:25:18 +03:00
c9939b0da1 .net core up to 3.1 2019-12-06 12:12:51 +03:00
74cb7e9582 EF: MessagingSystem 2019-12-05 11:51:28 +03:00
cb8d7ed191 EF: AccountLinker 2019-12-04 14:40:42 +03:00
a047332f9c Merge branch 'master' into feature/ef 2019-12-04 13:42:31 +03:00
ea60dbe63f DI: AccountLinker 2019-12-04 13:39:18 +03:00
d081c18c76 EF: settings 2019-12-04 12:04:32 +03:00
cbbaf1847c EF: removed DbBaseService 2019-12-03 18:28:27 +03:00
3dc8c87a94 EF: DbTenantService 2019-12-03 18:20:21 +03:00
36098aee2e EF: rename 2019-12-02 15:22:40 +03:00
37449e0221 EF: classes moved to folder 2019-12-02 15:18:42 +03:00
789d756038 EF: Subscription. 2019-12-02 15:04:22 +03:00
7e9a5db79d EF: Quota 2019-12-02 12:12:16 +03:00
7ce2fa22d4 EF: dbAzService 2019-11-29 16:47:05 +03:00
1cb1d2ace9 EF: TariffService 2019-11-29 15:26:53 +03:00
997cfa5fda EF: Updated Dependencies. Optimized logging and userPhotoManager 2019-11-29 12:22:20 +03:00
ae26212d5f EF: Configuration 2019-11-26 18:01:45 +03:00
c02a00f7c7 EF: di, log 2019-11-26 12:31:53 +03:00
e3255fb983 EF: optimization 2019-11-25 16:04:58 +03:00
538511a4dc EF: options 2019-11-25 14:49:21 +03:00
3586867429 EF: DbUserService 2019-11-25 12:49:12 +03:00
d05565107c EF: init commit 2019-11-15 18:04:05 +03:00
e579b124d9 fixed scope 2019-11-15 13:11:40 +03:00
711feca435 fixed scope 2019-11-15 12:28:20 +03:00
fcc4e4605f Common nlog config 2019-11-15 11:47:56 +03:00
190c0a5c48 TimeZoneConverter: fixed NullReferenceException 2019-11-14 16:51:15 +03:00
04464d52ad Add "AddEnvironmentVariables" setting 2019-11-14 12:21:15 +03:00
68bd46ef33 Notify: fixed styler 2019-11-12 16:23:15 +03:00
02663dbf0c Fixed object disposed exception 2019-11-12 13:40:02 +03:00
44d6e6e53d Dependencies updated 2019-11-12 13:28:30 +03:00
d3c696bb9e Common: fixed NullReferenceException 2019-11-12 11:32:24 +03:00
26c8d56219 DI: refactoring. Added EmployeeWraperHelper 2019-11-11 18:42:07 +03:00
e9b6976187 Renamed all "*factory" classes to "*Extension" 2019-11-11 14:50:46 +03:00
09406eccf4 renamed InstanseId -> InstanceId, BaseCommonLinkUtilityFactory -> BaseCommonLinkUtilityExtension 2019-11-11 14:22:11 +03:00
3e35efc027 ApiDateTime: removed TenantManager from param 2019-11-11 12:15:18 +03:00
9d2862bf9e Renamed all "*factory" classes to "*Extension"
https://github.com/ONLYOFFICE/AppServer/pull/7#pullrequestreview-314756136
2019-11-11 12:03:49 +03:00
6aeef025ab Storage: Fixed loading config 2019-11-11 11:51:19 +03:00
6ac10fac2f ISettings replaced with ISettingsExt 2019-11-08 18:11:30 +03:00
32781a87e2 DI: refactoring. Extract settings helpers 2019-11-08 15:21:51 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
89b1a0956a SettingsManager: cache 2019-11-06 11:55:59 +03:00
7a9c490467 Settings: fixed automapper settings 2019-11-05 15:34:00 +03:00
26420fd2b8 DI: Notify 2019-11-05 13:20:00 +03:00
0801877060 DI: ASC.Studio.Notify.
Settings: AutoMapper
2019-11-01 16:56:47 +03:00
0be2995e83 DI: filters and handlers 2019-11-01 12:37:02 +03:00
c54f575c26 DI: StudioNotifyService 2019-11-01 11:49:08 +03:00
9d08727f4c DI: refactoring. ASC.Web.Studio 2019-10-31 17:50:24 +03:00
a35a457f6e DI: refactoring. Web.Api 2019-10-31 16:54:43 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
0bbc383266 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
2019-10-30 11:45:55 +03:00
aae987ebf2 fixed AzRecordCache.proto 2019-10-29 15:26:23 +03:00
8ca3a63e24 DI: refactoring 2019-10-22 19:08:37 +03:00
726ca634e4 Revert "removed ConfigurationManager"
This reverts commit c03be150f4.

ProgressQueue init
2019-10-22 16:48:48 +03:00
c03be150f4 removed ConfigurationManager 2019-10-22 16:30:03 +03:00
78584b78a3 DI: removed LogManager 2019-10-22 14:21:44 +03:00
0dcd2dbc91 Removed CommonServiceProvider 2019-10-21 17:56:35 +03:00
fac39ca6ab Removed HttpContext.Current, DbManagerProxy 2019-10-21 17:44:14 +03:00
53d2aaa4e3 DI: DbManager 2019-10-21 16:50:20 +03:00
e0b5661188 DI: dbManager 2019-10-21 15:52:16 +03:00
e82366a2cd DI: dbManager 2019-10-21 15:33:02 +03:00
247a3b787f DI: DbManager 2019-10-18 17:22:40 +03:00
09881619b8 DI: DbManager 2019-10-18 16:29:24 +03:00
219036d4a4 DI: HttpContext 2019-10-18 11:48:27 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
5ec41ccaff DI: removed appSettings 2019-10-14 11:23:45 +03:00
7c05ba927b DI: KafkaCache 2019-10-11 18:03:03 +03:00
bc4af1b2dc DI: TenantManager 2019-10-11 11:57:35 +03:00
f0e7e2e41b DI: notify 2019-10-11 11:31:21 +03:00
85fe70087e DI: CoreConfiguration 2019-10-10 16:18:12 +03:00
75285dfc69 DI: configuration 2019-10-10 13:59:22 +03:00
42fe613918 DI: configuration 2019-10-10 12:53:58 +03:00
2ebe431c98 DI: configuration 2019-10-10 11:52:21 +03:00
74d8709f62 DI: configuration 2019-10-09 19:08:37 +03:00
515f7de555 DI: Configuration 2019-10-09 18:04:46 +03:00
080a343eb5 DI: AppSettings 2019-10-09 13:09:54 +03:00
Daniil Senkiv
2ed3ee4905 Web.Client/Core: added method of deleting self profile 2019-10-04 07:58:38 +03:00
0e3ad46012 Auth: fix 2019-09-27 19:16:11 +03:00
55138419b4 Confirm: fix auth 2019-09-27 18:53:40 +03:00
5e2823974e DI: configuration 2019-09-27 18:12:13 +03:00
665ed9eb3c Settings: GetPasswordSettings available for everyone
ConfirmAuthHandler: handle ArgumentNullException
2019-09-27 17:03:24 +03:00
c8573b8301 Confirm: fixed invite link 2019-09-27 15:28:51 +03:00
387ce4e9ad DI: configuration 2019-09-27 14:51:09 +03:00
d8fb67f683 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	web/ASC.Web.Api/Controllers/AuthenticationController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Utility/CommonLinkUtility.cs
2019-09-27 13:45:37 +03:00
48b2726d78 Confirm: added uid to activation link 2019-09-27 12:20:10 +03:00
1afcd2442c ConfirmAuthHandler: auth by uid 2019-09-27 12:18:48 +03:00
84ba343460 Auth: added check confirm method 2019-09-26 16:36:53 +03:00
647a7fb2d4 Kafka: fixed onmessage error 2019-09-26 14:53:54 +03:00
22e4d19458 PasswordChange: added userId 2019-09-26 12:15:01 +03:00
710a3f62fa Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-25 18:56:28 +03:00
adc6dc801e Notify: fixed textile 2019-09-25 17:25:28 +03:00
2564a0c760 fixed start services 2019-09-25 15:55:35 +03:00
4aac6be6ab fixed start services 2019-09-25 15:49:21 +03:00