Commit Graph

61 Commits

Author SHA1 Message Date
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
f00a964c32 Merge branch 'master' into feature/private
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2020-08-14 17:19:36 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
e860d1ab76 Fix Incorrect datetime value: '0001-01-01 00:00:00' for column 'create_on' 2020-08-10 20:16:34 +03:00
518648cb19 Fix parse license 2020-08-04 17:29:43 +03:00
39b984debd Settings: added license/required and license upload 2020-08-03 16:42:59 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
a822f9b349 Files: fix 2020-07-13 15:57:39 +03:00
SuhorukovAnton
28e70e91f6 api-defaultvalue: add JsonPropertyNames 2020-07-09 18:37:36 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
SuhorukovAnton
8b5ab8c9a4 api-defaultvalue: delete DataContracts 2020-07-08 13:10:09 +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
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
fbce5f3845 DI: HostedSolution 2020-02-20 11:05:10 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
4bad85defe moved from hotfix/10.5.2 2020-01-17 16:58:26 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +03:00
f696558445 EF: AddOrUpdate 2019-12-17 16:01:59 +03:00
b2002a08db EF: MultiRegionHostedSolution 2019-12-17 11:27:38 +03:00
36098aee2e EF: rename 2019-12-02 15:22:40 +03:00
7ce2fa22d4 EF: dbAzService 2019-11-29 16:47:05 +03:00
1cb1d2ace9 EF: TariffService 2019-11-29 15:26:53 +03:00
711feca435 fixed scope 2019-11-15 12:28:20 +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
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
8ca3a63e24 DI: refactoring 2019-10-22 19:08:37 +03:00
78584b78a3 DI: removed LogManager 2019-10-22 14:21:44 +03:00
e82366a2cd DI: dbManager 2019-10-21 15:33:02 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
7c05ba927b DI: KafkaCache 2019-10-11 18:03:03 +03:00
85fe70087e DI: CoreConfiguration 2019-10-10 16:18:12 +03:00
75285dfc69 DI: configuration 2019-10-10 13:59:22 +03:00
2ebe431c98 DI: configuration 2019-10-10 11:52:21 +03:00
74d8709f62 DI: configuration 2019-10-09 19:08:37 +03:00
387ce4e9ad DI: configuration 2019-09-27 14:51:09 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
8184492a4f DI: ConfigurationManager 2019-09-20 18:08:45 +03:00
409da28d4b DI: SubscriptionManager 2019-09-19 16:43:28 +03:00
a07cbe30f4 DI: CoreSettings 2019-09-18 18:19:30 +03:00
4489d01b82 DI: PaymentManager, AuthorizationManager 2019-09-18 17:18:44 +03:00
6ab71a7b65 DI: tenantManager 2019-09-18 16:33:01 +03:00
2f5fe4301e DI: TenantManager 2019-09-18 15:14:15 +03:00
bcdbcf5ccc DI: TenantManager 2019-09-18 11:25:57 +03:00
a46a092890 DI: TenantManager 2019-09-17 11:07:46 +03:00
deb8231f26 revert f85711b736 2019-09-12 14:34:58 +03:00
e0cb81adc4 Merge branch 'master' into refactoring/di
# Conflicts:
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-11 21:21:21 +03:00
cc135070ea SecurityProtocolType.Ssl3' is obsolete. Removed 2019-09-10 16:42:36 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00