Commit Graph

144 Commits

Author SHA1 Message Date
fb65d3a09d analizators/1481 2022-01-21 16:15:15 +03:00
2029c34f9c analizators/s1121 2022-01-21 14:02:17 +03:00
bf3b0395a5 analizators/s1116 2022-01-21 11:04:08 +03:00
20b60958a8 analizators/U2U1022 2022-01-19 13:24:11 +03:00
fbb50e676e analizators/U2U1202 2022-01-19 12:51:30 +03:00
6c5792583a analizators/U2U1209 2022-01-18 17:43:46 +03:00
f1f7a82b39 analizators/U2U1208 2022-01-18 17:00:48 +03:00
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +03:00
8f53895e3d analizators/s2201 2021-12-30 14:03:05 +03:00
70bfe70563 Merge branch 'develop' into feature/optimization 2021-12-16 18:14:54 +03:00
fb3bfba1bd Files: optimization 2021-12-16 15:49:35 +03:00
6ccda4d68d UserManager: revert cache 2021-11-23 15:25:34 +03:00
49c820b779 Merge branch 'develop' into feature/reworked-user-service 2021-11-02 13:07:07 +03:00
dd8f77f827 Merge branch 'develop' into feature/wizard/migration 2021-10-22 11:44:21 +03:00
2bd3a5764d add method GetUserGroupRef, change return type 2021-09-28 20:26:16 +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
ec66a65d38 User: fix request 2021-09-10 17:00:26 +03:00
2addb81adf Quota: Price2 removed 2021-08-30 18:19:20 +03:00
91fd7615b3 Optimization 2021-08-20 10:52:52 +03:00
diana-vahomskaya
945739fe44 fix test ASC.Web.Api.Tests 2021-08-16 15:20:41 +03:00
90bb8a139a UserManager: fix for personal 2021-08-06 17:30:51 +03:00
diana-vahomskaya
bcfddd88d7 fix context 2021-08-02 17:49:36 +03:00
2d75554b0d DbContext: optimization 2021-07-15 13:07:47 +03:00
570ede7bba Merge branch 'develop' into feature/11.5.2
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
db7e2b8700 People: fixed query 2021-05-18 16:16:17 +03:00
a5c6ba5dcc Common, db: moved from 08a01422 2021-05-17 14:35:00 +03:00
50d01a646d Core: fixed creating group 2021-04-06 21:04:15 +03:00
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
76d7ed6c73 Merge branch 'master' into develop
# Conflicts:
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-23 21:42:44 +03:00
d4b736103a Users: fixed queries 2020-12-23 13:12:07 +03:00
b0dd9c1400 Files: optimization 2020-12-15 13:29:53 +03:00
c764812d3a Common: refactoring 2020-12-04 16:48:54 +03:00
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
367c93fd91 Refactoring: scope 2020-10-22 20:57:18 +03:00
2143f376a3 Scope: refactoring 2020-10-21 16:39:06 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
3a29e9970f Merge branch 'develop' into refactoring/scope
# Conflicts:
#	products/ASC.Files/Server/Startup.cs
2020-10-18 22:52:24 +03:00
af1bf4a56e Refactoring: lazy 2020-10-18 22:00:38 +03:00
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +03:00
d41b12cdc8 DbTenant: fix 2020-10-14 12:59:37 +03:00
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
36034bf97a fix warnings 2020-10-12 16:52:31 +03:00
e01ee037f2 Merge branch 'master' into feature/fix-messages
# Conflicts:
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Core.Common/EF/Context/CoreDbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContextManager.cs
#	common/ASC.Core.Common/EF/Context/FeedDbContext.cs
#	common/ASC.Core.Common/EF/Context/FilesDbContext.cs
#	common/ASC.Core.Common/EF/Context/MessagesContext.cs
#	common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
#	common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
#	common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
#	common/ASC.Core.Common/EF/Model/AccountLinks.cs
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
#	common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
#	common/ASC.Core.Common/EF/Model/Core/Subscription.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
#	common/ASC.Core.Common/EF/Model/FilesConverts.cs
#	common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
#	common/ASC.Core.Common/EF/Model/TelegramUser.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
#	common/ASC.Core.Common/EF/Model/User/UserGroup.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
#	products/ASC.Files/Core/Core/EF/DbFile.cs
#	products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
#	products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
#	products/ASC.Files/Core/Core/EF/DbFolderTree.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-10-09 15:40:44 +03:00
c08abfc396 User: fix SetUserPasswordHash 2020-09-30 15:54:36 +03:00
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
bfd450e602 DbUserService: fix 2020-09-30 14:20:54 +03:00
8094848d05 Settings: fix 2020-09-24 12:45:02 +03:00
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00