Commit Graph

73 Commits

Author SHA1 Message Date
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
6867ded281 Merge branch 'develop' into feature/remove-wq
# Conflicts:
#	common/ASC.Common/DIHelper.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/QueueWorker.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
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2021-05-13 11:23:44 +03:00
0dbadc6394 from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects 2021-04-30 18:42:10 +03:00
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
1623241d8a Code cleanup 2020-11-17 13:00:01 +03:00
75fce656f0 Merge branch 'develop' into feature/dotnet5 2020-11-17 11:31:14 +03:00
a66f99f574 net5.0 2020-11-15 18:55:57 +03:00
e9a9b320e8 Scope: refactoring. Notify, People 2020-10-27 18:34:22 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +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
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
SuhorukovAnton
917493f397 fix-messages: IDE0058 2020-10-10 14:35:05 +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
0a7eb28989 Reassign: fix scope 2020-10-07 11:23:43 +03:00
3f5b8b77c4 DistributedTaskQueue: refactoring 2020-10-02 10:19:02 +03:00
88d7a0d267 DistributedTaskQueue: fix 2020-10-01 10:22:08 +03:00
3741f3a5d1 Encryption: DistributedQueue 2020-09-30 15:23:35 +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
SuhorukovAnton
2d34d70a4e fix-messages: IDE0051 and IDE0052 2020-09-29 11:57:37 +03:00
SuhorukovAnton
80198032a4 scope: refactoring 2020-09-07 15:01:15 +03:00
SuhorukovAnton
132a6b05ae scope: add deconstructs 2020-08-31 11:18:07 +03:00
SuhorukovAnton
055e787d63 scope: fix 2020-08-24 21:41:06 +03:00
SuhorukovAnton
faec4269db Merge branch 'master' into feature/scope 2020-08-16 12:23:20 +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
SuhorukovAnton
456866d4d9 scope: refactoring 2020-07-30 00:57:58 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
725955e851 ProgressQueue: fix 2020-06-08 12:44:01 +03:00
81e0917847 Files: simplified getHeaders method 2020-06-03 18:04:14 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +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
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
c9939b0da1 .net core up to 3.1 2019-12-06 12:12:51 +03:00
44d6e6e53d Dependencies updated 2019-11-12 13:28:30 +03:00
9d2862bf9e Renamed all "*factory" classes to "*Extension"
https://github.com/ONLYOFFICE/AppServer/pull/7#pullrequestreview-314756136
2019-11-11 12:03:49 +03:00
32781a87e2 DI: refactoring. Extract settings helpers 2019-11-08 15:21:51 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
78584b78a3 DI: removed LogManager 2019-10-22 14:21:44 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +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
dec4bb266e DI: configuration 2019-09-24 13:32:12 +03:00