Commit Graph

351 Commits

Author SHA1 Message Date
424c6a6806 migrate base mapper class from ASC.CRM to ASC.Common 2021-04-30 17:52:57 +03:00
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
560d803d86 Common: added assembly version 2021-04-09 11:12:10 +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
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
b25dd2d6e2 .net 5 2021-02-25 12:02:28 +03:00
f0e227731f Fixed loading products, lazy loading webitemmanager 2021-01-26 12:29:50 +03:00
036ddc87c3 5.0.2 2021-01-22 16:49:38 +03:00
f222f4be0c .net 5 2021-01-22 16:42:26 +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
ae69a9559e Files: removed temp 2021-01-13 12:41:29 +03:00
60562d69a3 Files: test fix 2021-01-13 10:21:29 +03:00
b7d3cd8650 Files: test 2021-01-12 22:42:17 +03:00
88eac5b10a Files: test 2021-01-12 21:51:39 +03:00
a65aa18c17 Files: temp fix 2021-01-12 21:35:56 +03:00
2bbf510768 Files: test. Fix cache 2021-01-12 21:11:01 +03:00
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
5289f92935 Files: temp fix 2021-01-12 18:01:38 +03:00
13cf5e5ad0 Files: tests. long operations 2021-01-12 16:00:05 +03:00
682ca73a91 Files: fix tests 2021-01-12 13:16:11 +03:00
62cd0a6af0 Test: fix test migrate, drop test db 2020-12-25 13:48:04 +03:00
bc9dc7cd65 Log: fix 2020-12-11 18:27:59 +03:00
2bb8502526 Core: fix parse 2020-12-11 13:34:23 +03:00
d00d13bb8f Core: fix 2020-12-11 13:03:30 +03:00
156bf72046 Core: fix GetProperty 2020-12-11 12:48:21 +03:00
c764812d3a Common: refactoring 2020-12-04 16:48:54 +03:00
1675896294 Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
2020-12-04 11:59:10 +03:00
ed22ffb326 Files: bugfix and optimization 2020-11-25 18:40:23 +03:00
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
d2a0d318f7 dotnet 5 2020-11-17 12:59:15 +03:00
68483bc979 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Startup.cs
2020-11-13 16:03:17 +03:00
79ea471098 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-11-04 15:22:43 +03:00
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
4056ea888a Notify: fix urls 2020-10-30 17:57:31 +03:00
43beaf6f6b Refactoring: scope 2020-10-29 17:30:08 +03:00
265feee81e Refactoring: scope 2020-10-29 12:31:55 +03:00
049e8f63e9 Refactoring: scope. 2020-10-29 11:13:51 +03:00
3256a3dbc7 DI: fix 2020-10-28 23:02:03 +03:00
e9a9b320e8 Scope: refactoring. Notify, People 2020-10-27 18:34:22 +03:00
75bbe888cd Scope: refactoring. Migration, ASC.Files.Service 2020-10-26 19:38:23 +03:00
035a98b878 Refactoring: scope. Backup 2020-10-26 16:38:21 +03:00
367c93fd91 Refactoring: scope 2020-10-22 20:57:18 +03:00
2143f376a3 Scope: refactoring 2020-10-21 16:39:06 +03:00
3ddb202c56 Scope: refactoring 2020-10-21 14:52:44 +03:00
6f25e2e83e Refacoring: scope 2020-10-21 14:12:08 +03:00
1d2f65ba12 Refactoring: scope 2020-10-20 23:10:17 +03:00
bff9629389 Scope: refactoring 2020-10-20 16:24:46 +03:00
b9cb483d65 DIHelper: fix 2020-10-19 22:11:23 +03:00
f56f231c91 Refactoring: scope 2020-10-19 22:04:07 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
9fe6fc3832 Refactoring: scope 2020-10-19 10:19:32 +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
181ac04fd8 DI: register fix 2020-10-18 19:34:30 +03:00
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +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
SuhorukovAnton
2e4f612f93 remove-wq: fix encryption 2020-10-13 17:28:10 +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
573dc8922b Merge branch 'master' into feature/schema
# Conflicts:
#	common/ASC.Common/DIHelper.cs
2020-10-08 11:42:57 +03:00
e8061d10bd DI: refactoring 2020-10-08 11:36:47 +03:00
1ba65b9c01 EF: new Migration scheme 2020-10-06 10:06:18 +03:00
38b204ca5a DistributedTaskQueue: refactoring 2020-10-02 10:34:29 +03:00
3f5b8b77c4 DistributedTaskQueue: refactoring 2020-10-02 10:19:02 +03:00
88d7a0d267 DistributedTaskQueue: fix 2020-10-01 10:22:08 +03:00
SuhorukovAnton
edbc0f247c fix-messages: IDE0022 2020-09-30 17:47:42 +03:00
SuhorukovAnton
f618f8799b fix-messages: IDE0062 2020-09-30 15:46:16 +03:00
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
90e61ba082 Added DistributedTaskProgress 2020-09-30 13:54:49 +03:00
e4d4db6563 Merge branch 'master' into feature/remove-wq
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressBase.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2020-09-29 19:46:40 +03:00
b56df84bce Settings: added password settings 2020-09-29 18:08:54 +03:00
e4acc15773 removed WorkerQueue, ProgressQueue 2020-09-29 16:02:47 +03:00
SuhorukovAnton
29ec562a78 fix-messages: IDE0038 2020-09-28 18:21:29 +03:00
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00
82dd4a8828 Settings: fix timeZones for unix 2020-09-03 18:30:14 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
SuhorukovAnton
6a005af895 private: bugfix 2020-08-12 14:11:41 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
992ab07b87 Common: Reassign. DistributedTaskQueue 2020-08-07 18:42:58 +03:00
ffc756f32b Backup: DistributedTaskQueue 2020-08-06 21:07:27 +03:00
df5925ffc1 Files: FileMarker. Replace WorkerQueue with DistributedTaskQueue 2020-08-06 13:53:34 +03:00
8cd5ef6233 Merge branch 'master' into feature/remove-wq 2020-08-06 11:00:55 +03:00
f9dc19526c Added sendjoininvite, sendadmmail 2020-07-24 17:01:20 +03:00
7510a77f68 Merge branch 'master' into feature/remove-wq
# Conflicts:
#	products/ASC.Files/Core/ASC.Files.Core/Services/WCFService/FileOperations/FileOperationsManager.cs
2020-07-17 17:44:17 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
ff41b28a64 DI: files fix 2020-07-16 12:08:20 +03:00
47e597d3b0 Autofac: fix 2020-07-15 14:18:47 +03:00
baa71247d8 Merge branch 'master' into feature/general-startup 2020-07-15 13:06:32 +03:00
5650bc2a93 DistributedTaskQueue: configuring 2020-07-13 18:26:21 +03:00
dfd8bbfdb8 Merge branch 'master' into feature/api-defaultvalue 2020-07-13 15:28:11 +03:00
cd3240a7f6 Removed LimitedConcurrencyLevelTaskScheduler 2020-07-13 14:11:36 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
SuhorukovAnton
8b5ab8c9a4 api-defaultvalue: delete DataContracts 2020-07-08 13:10:09 +03:00
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
d53b11967a Merge branch 'master' into feature/backup 2020-06-25 15:37:53 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
725955e851 ProgressQueue: fix 2020-06-08 12:44:01 +03:00
f59be0f44b Merge branch 'master' into feature/backup 2020-06-04 17:12:34 +03:00
fed4d206f7 Revert logger 2020-06-04 16:46:58 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
4ea72a0e65 Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
2020-06-04 14:39:40 +03:00
1c25d16fc2 Products: added absolute path support 2020-06-04 14:01:25 +03:00
SuhorukovAnton
89368aed8b Backup: refactoring 2020-06-03 12:15:05 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
3fadf8db6c fix log, added UrlShortenerService config 2020-05-21 11:03:35 +03:00
SuhorukovAnton
6acb0d4208 creating 2020-05-20 18:14:44 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
78442cd9eb Files: Service fix 2020-05-15 14:02:05 +03:00
02b33bc07b Merge branch 'master' into feature/files-index
# Conflicts:
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
2020-05-06 11:54:26 +03:00
1526d8e502 Common: removed StreamCopyTo 2020-05-06 11:41:27 +03:00
af7fb87e73 Elastic: settings 2020-05-03 18:50:40 +03:00
37b126e5cd Files: search 2020-04-29 17:11:31 +03:00
623a6609cc JWT: fix 2020-04-24 13:28:06 +03:00
4f025d9931 Files: fixed download 2020-04-23 14:50:34 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00
e986f73293 Files: fixed ComposeFileOperation 2020-03-20 11:11:38 +03:00
5671ee6133 Files: fixed long operation 2020-03-06 17:48:58 +03:00
c780a881df Files: fixed removing file method 2020-03-04 10:42:43 +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
fbce5f3845 DI: HostedSolution 2020-02-20 11:05:10 +03:00
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +03:00
45266f6647 DIHelper: fixed configure method 2020-02-17 15:13:40 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
efef2f696d Files: DI 2020-02-12 16:50:38 +03:00
3fa9046bec Merge branch 'master' into feature/elastic 2020-02-11 14:08:26 +03:00
1291be98e3 Autofac: fix 2020-02-11 13:47:04 +03:00
96687f4fa6 Files: DI 2020-02-07 14:34:25 +03:00
8c2b39406f Merge branch 'master' into feature/merge 2020-02-03 14:29:41 +03:00
7a9b02abdb TreatWarningsAsErrors=false 2020-02-03 14:27:41 +03:00
f017d9cc23 fix from review 2020-02-03 13:48:06 +03:00
7798898100 moved from hotfix/10.5.2 2020-01-16 21:17:17 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +03:00
2782d9f64c Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	common/ASC.VoipService/Dao/VoipDao.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
65870f460b Removed unused elements 2019-12-20 14:27:03 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
04d8bf05eb EF: MultiRegionalDbManager 2019-12-16 17:55:59 +03:00
f0f6b0a299 EF: resourceManager 2019-12-16 12:30:01 +03:00
08c98691d5 EF: GeolocationHelper 2019-12-13 16:05: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
3dc8c87a94 EF: DbTenantService 2019-12-03 18:20:21 +03:00
997cfa5fda EF: Updated Dependencies. Optimized logging and userPhotoManager 2019-11-29 12:22:20 +03:00