Commit Graph

77 Commits

Author SHA1 Message Date
26511d9fb7 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Tests.sln
2021-10-29 13:18:57 +03:00
dd8f77f827 Merge branch 'develop' into feature/wizard/migration 2021-10-22 11:44:21 +03:00
aa69a52272 fix test 2021-10-19 20:29:45 +03:00
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
021ab20fed fix tests 2021-09-17 18:28: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
Vashchuk Nikita
9f0e41b880 Merge branch 'develop' into feature/webhooks 2021-08-23 12:36:01 +03:00
Vashchuk Nikita
7d4b22ca83 added tests, migrations 2021-08-19 12:11:26 +03:00
11f6ab96bc Files: fixed tests 2021-08-17 15:50:05 +03:00
b96a66854f Files: Test. fix migrate 2021-08-05 12:57:16 +03:00
diana-vahomskaya
9c552cdf9c Fix Context in ASC.Files.Core, Update Migrations in ASC.Files.Core, ASC.Files.Test 2021-08-04 14:10:06 +03:00
diana-vahomskaya
81d8324afb ASC.Web.Api Tests added 2021-07-19 15:12:40 +03:00
diana-vahomskaya
eb3d18abc7 test for wizard 2021-07-16 15:10:53 +03:00
c906c2c419 remove itemList in tests 2021-06-29 12:47:32 +03:00
89d9ea6297 Test: fix 2021-06-22 19:15:04 +03:00
ee029d557b fixed tests 2021-06-15 17:20:53 +03:00
cc79e88737 increment version 2021-06-11 15:27:52 +03:00
5c0f414587 Files: fix tests 2021-04-07 18:08:15 +03:00
65e1c72c01 Sln: fixed packages 2021-03-26 12:26:12 +03:00
18a2c0a53d Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
2021-03-25 21:50:09 +03:00
Diana
73731f23b7 fix 2021-03-16 12:53:06 +03:00
Diana
3efc35a9fa fix 2021-03-09 20:58:40 +03:00
Diana
4e62f6a204 update migrations ef tools v.5.0.3 2021-03-09 20:56:57 +03:00
b25dd2d6e2 .net 5 2021-02-25 12:02:28 +03:00
7e32c26241 Files: fixed tests 2021-02-19 14:52:29 +03:00
ae69a9559e Files: removed temp 2021-01-13 12:41:29 +03:00
60562d69a3 Files: test fix 2021-01-13 10:21:29 +03:00
a65aa18c17 Files: temp fix 2021-01-12 21:35:56 +03:00
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
122048dd49 Files: temp fix 2021-01-12 18:27:56 +03:00
5289f92935 Files: temp fix 2021-01-12 18:01:38 +03:00
d118a9d5c8 Files: fix tests 2021-01-12 16:46:55 +03:00
13cf5e5ad0 Files: tests. long operations 2021-01-12 16:00:05 +03:00
1b1d57ba35 Files: fix tests 2021-01-12 13:43:44 +03:00
682ca73a91 Files: fix tests 2021-01-12 13:16:11 +03:00
abaf8df8dc Files: test. Show error 2021-01-12 12:26:09 +03:00
5dbd0653f5 Files: test. fix order 2021-01-12 11:35:10 +03:00
84a6f19e15 Files: fix test 2021-01-11 22:03:11 +03:00
ac3f877a7c Files: fix test 2021-01-11 21:22:53 +03:00
9375dfd540 Files: fix test 2021-01-11 21:16:40 +03:00
441cf7e7cd Files: Test. Fix path 2021-01-11 20:50:17 +03:00
bf5781c2c0 fix startup 2020-12-29 19:45:18 +03:00
62cd0a6af0 Test: fix test migrate, drop test db 2020-12-25 13:48:04 +03:00
Diana
aa667a02ef fix 2020-12-24 03:21:29 +03:00
Diana
589c17ac95 fix 2020-12-22 02:27:10 +03:00
Diana
8fdaddd38d fix 2020-12-16 18:00:43 +03:00
Diana
8f234d7418 fix 2020-12-15 14:08:07 +03:00
Diana
88a48348e0 Added Tests for Trash/Favorites/Recent folders 2020-12-10 00:07:08 +03:00
Diana
ca6454dc58 fix MyDocuments and Shared Documents 2020-12-10 00:06:16 +03:00
8ac1a767bc Files: fix tests 2020-12-08 19:36:19 +03:00