IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,237 Commits 40 Branches 22 Tags 420 MiB
0771a54c47
Commit Graph

12 Commits

Author SHA1 Message Date
pavelbannov
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
pavelbannov
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +03:00
pavelbannov
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
pavelbannov
26511d9fb7 Merge branch 'develop' into feature/webhooks 
# Conflicts:
#	ASC.Tests.sln
 2021-10-29 13:18:57 +03:00
SuhorukovAnton
30277d4fb3 net6: bugfix 2021-10-22 17:20:40 +03:00
SuhorukovAnton
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
pavelbannov
dd8f77f827 Merge branch 'develop' into feature/wizard/migration 2021-10-22 11:44:21 +03:00
pavelbannov
5a5e299d98 Merge branch 'develop' into feature/webhooks 
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
 2021-10-19 18:30:59 +03:00
pavelbannov
e755d2eda8 renamed providers to lowercase 2021-09-24 17:36:46 +03:00
pavelbannov
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
pavelbannov
d099326e7f Merge branch 'develop' into feature/backup.core 
# Conflicts:
#	common/services/ASC.Data.Backup/Program.cs
 2021-09-05 12:50:05 +03:00
SuhorukovAnton
8171563965 backup.core: move backup.core 2021-09-02 15:41:54 +03:00