Commit Graph

62 Commits

Author SHA1 Message Date
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +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
diana-vahomskaya
a5e1609dac two methods 2021-09-16 11:25:17 +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
a0f5c4231f fixed run via vs 2021-08-23 15:55:19 +03:00
44847c1e8f backend: change TargetFramework from netstandard2.1 to net5.0 2021-08-06 18:37:22 +03:00
diana-vahomskaya
eaa449db1f Updated migrations for ASC.Core.Common 2021-08-04 00:41:33 +03:00
diana-vahomskaya
34c4161f08 Update migrations, fix Context with repetitive Models 2021-07-27 19:26:56 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
c93813c7d3 Pomelo up to 5.0.0 2021-05-06 12:31:55 +03:00
ee6ffd3ace Updated packages 2021-04-06 20:16:24 +03:00
65e1c72c01 Sln: fixed packages 2021-03-26 12:26:12 +03:00
b25dd2d6e2 .net 5 2021-02-25 12:02:28 +03:00
036ddc87c3 5.0.2 2021-01-22 16:49:38 +03:00
f8be896241 Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2021-01-22 16:34:40 +03:00
53c422c2b2 revert 2020-12-30 18:03:21 +03:00
fa7c2bf9f1 Merge branch 'develop' into feature/asc-files-tests 2020-12-29 18:37:28 +03:00
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
Diana
aa667a02ef fix 2020-12-24 03:21:29 +03:00
d2a0d318f7 dotnet 5 2020-11-17 12:59:15 +03:00
5eed00dd28 Removed sq bugs and code smells 2020-10-16 16:21:59 +03:00
e6be6f5072 References updated 2020-10-16 10:27:44 +03:00
f69281a07d References updated 2020-10-15 21:30:16 +03:00
6bad98e277 Merge branch 'master' into feature/schema
# Conflicts:
#	config/appsettings.json
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
2020-10-01 12:25:07 +03:00
SuhorukovAnton
b1090335d0 Telegram: fix 2020-09-25 14:36:09 +03:00
SuhorukovAnton
c455419113 Telegram: fix Kafka 2020-09-25 14:13:43 +03:00
SuhorukovAnton
693e35ac57 add ASC.TelegramService 2020-09-24 17:30:27 +03:00
SuhorukovAnton
89daf213c5 encryption: fix 2020-09-08 15:07:59 +03:00
Diana
bb5c2a23e7 postgree 2020-08-21 05:34:37 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
7a9b02abdb TreatWarningsAsErrors=false 2020-02-03 14:27:41 +03:00
f61fb897ac EF: added Dbfunction 2019-12-18 15:22:31 +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
997cfa5fda EF: Updated Dependencies. Optimized logging and userPhotoManager 2019-11-29 12:22:20 +03:00
d05565107c EF: init commit 2019-11-15 18:04:05 +03:00
44d6e6e53d Dependencies updated 2019-11-12 13:28:30 +03:00
0801877060 DI: ASC.Studio.Notify.
Settings: AutoMapper
2019-11-01 16:56:47 +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
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
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00