Commit Graph

70 Commits

Author SHA1 Message Date
34dab043e0 Merge branch 'develop' into feature/analizators
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
2022-02-03 12:55:33 +03:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
edd627ee23 analizators/s2696 2022-01-19 18:33:27 +03:00
20b60958a8 analizators/U2U1022 2022-01-19 13:24:11 +03:00
6c5792583a analizators/U2U1209 2022-01-18 17:43:46 +03:00
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
3d33fecf77 analizators/s2259 2021-12-30 14:00:03 +03:00
8ca88e4620 Merge branch 'develop' into feature/net6
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
2021-11-23 16:40:50 +03:00
ea4fa97838 Merge branch 'develop' into feature/wizard/migration
# Conflicts:
#	ASC.Tests.sln
#	common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj
#	common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj
#	common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj
2021-09-15 15:52:13 +03:00
b791586252 net6 2021-08-25 18:26:13 +03:00
1d4cabe5b9 MessagesRepository: optimization 2021-08-10 17:57:20 +03:00
44847c1e8f backend: change TargetFramework from netstandard2.1 to net5.0 2021-08-06 18:37:22 +03:00
diana-vahomskaya
af84cd6532 fix Context 2021-08-03 17:11:53 +03:00
c5fe4a9989 Merge branch 'develop' into feature/ClearEvents 2021-06-08 12:17:36 +03:00
SuhorukovAnton
860b682594 replace "DeleteOldEvents" in new service 2021-06-04 14:10:37 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
440638a18d Audit: fix request 2021-05-29 17:55:36 +03:00
7e80f26bc9 MessagesRepository: fix 2021-01-12 10:27:48 +03:00
71b6f71fd7 Files: fix dispose 2020-11-20 15:49:57 +03:00
6f25e2e83e Refacoring: scope 2020-10-21 14:12:08 +03:00
bff9629389 Scope: refactoring 2020-10-20 16:24:46 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
bdcfcd697b Audit: fix 2020-10-14 16:27:12 +03:00
075798b90c moved from release/11 4414f77b 2020-09-22 17:17:17 +03:00
SuhorukovAnton
7d3bb9e9a8 encryption: add api start 2020-09-17 16:56:12 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
dbfb84786e Files: simplified getHeaders method 2020-06-01 15:16:24 +03:00
adab38548a Files: Index Service 2020-04-28 18:11:10 +03:00
22e379b37b Files: MoveOrCopy operation 2020-03-24 15:30: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
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
cba569ac6a moved from hotfix/10.5.2 2020-01-21 17:41:10 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +03:00
fe378e1eef EF: AuditEvent. fix Remove Old Event 2019-12-18 15:24:22 +03:00
a4cfdb173c EF: fix 2019-12-10 18:31:37 +03:00
aed98bea9a EF: ipRestriction 2019-12-10 17:47:48 +03:00
8ad3b1ca1d "DeleteOldEvents" temporary removed 2019-12-06 13:32:10 +03:00
74cb7e9582 EF: MessagingSystem 2019-12-05 11:51:28 +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
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +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
247a3b787f DI: DbManager 2019-10-18 17:22:40 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00