Commit Graph

84 Commits

Author SHA1 Message Date
57454bae0c References updated 2020-06-28 16:55:21 +03:00
b617257887 Notify: back rename 2020-06-28 14:08:12 +03:00
d53b11967a Merge branch 'master' into feature/backup 2020-06-25 15:37:53 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +03:00
SuhorukovAnton
af2295f98a Backup: fix 2020-06-08 13:40:26 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
1d245236ef Merge branch 'master' into feature/files-index 2020-05-14 12:19:34 +03:00
4160f42d27 Files: fixed upload 2020-05-07 14:33:12 +03:00
02b33bc07b Merge branch 'master' into feature/files-index
# Conflicts:
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
2020-05-06 11:54:26 +03:00
1526d8e502 Common: removed StreamCopyTo 2020-05-06 11:41:27 +03:00
adab38548a Files: Index Service 2020-04-28 18:11:10 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +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
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
2722dfd693 moved from hotfix/10.5.2 2020-01-21 15:44:05 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
c9939b0da1 .net core up to 3.1 2019-12-06 12:12:51 +03:00
e579b124d9 fixed scope 2019-11-15 13:11:40 +03:00
44d6e6e53d Dependencies updated 2019-11-12 13:28:30 +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
7a9c490467 Settings: fixed automapper settings 2019-11-05 15:34:00 +03:00
0801877060 DI: ASC.Studio.Notify.
Settings: AutoMapper
2019-11-01 16:56:47 +03:00
9d08727f4c DI: refactoring. ASC.Web.Studio 2019-10-31 17:50:24 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
78584b78a3 DI: removed LogManager 2019-10-22 14:21:44 +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
7c05ba927b DI: KafkaCache 2019-10-11 18:03:03 +03:00
74d8709f62 DI: configuration 2019-10-09 19:08:37 +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
afb1f90e9a .net core up to 3.0.0 2019-09-24 14:20:58 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
3e0f946372 DI: PathUtils 2019-09-21 19:39:17 +03:00
1e946b19b6 DI: refactoring 2019-09-20 18:53:27 +03:00
e7b7cabdd2 DI: TenantManager 2019-09-20 17:04:06 +03:00
41b4a909cd DI: TenantManager 2019-09-20 15:47:00 +03:00
db5dc66217 Kafka: fix 2019-09-19 15:48:37 +03:00
7ceb117690 DI: CoreConfiguration 2019-09-19 14:34:54 +03:00
a07cbe30f4 DI: CoreSettings 2019-09-18 18:19:30 +03:00
c171e2c903 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	common/ASC.IPSecurity/ASC.IPSecurity.csproj
#	common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
#	common/ASC.VoipService/ASC.VoipService.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/ASC.Web.Core.csproj
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
2019-09-18 13:32:39 +03:00
152c5d9697 .net core up to 3.0.0-rc1 2019-09-18 12:29:17 +03:00