Commit Graph

32 Commits

Author SHA1 Message Date
320a1f2250 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/Data/StreamExtension.cs
#	common/ASC.Common/Utils/RandomString.cs
#	common/ASC.Core.Common/Billing/CouponManager.cs
#	common/ASC.Core.Common/Billing/License/LicenseReader.cs
#	common/ASC.Core.Common/Core/UserGroupRef.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Notify/Jabber/JabberServiceClientWcf.cs
#	common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
#	common/ASC.Data.Storage/BaseStorage.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Notify.Textile/JabberStyler.cs
#	common/ASC.Textile/Blocks/GlyphBlockModifier.cs
#	common/ASC.Textile/States/TableRowFormatterState.cs
#	common/services/ASC.ApiSystem/Classes/CommonMethods.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	common/services/ASC.ClearEvents/Program.cs
#	common/services/ASC.TelegramService/Startup.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Core/Entries/File.cs
#	products/ASC.Files/Core/Core/Entries/FileEntry.cs
#	products/ASC.Files/Core/Core/Entries/FileHelper.cs
#	products/ASC.Files/Core/Core/Entries/Folder.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
#	web/ASC.Web.Core/Files/DocumentServiceLicense.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Sms/SmsKeyStorage.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	web/ASC.Web.HealthChecks.UI/Program.cs
#	web/ASC.Web.Studio/Startup.cs
2022-02-10 13:16:33 +03:00
9bccfa3ade refactoring: add globalUsing: core.common 2022-01-26 13:43:08 +03:00
728c1b896e analizators/s1104 2022-01-21 12:19:57 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +03:00
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +03:00
a40b06648a analizators/s3963 2021-12-28 19:01:12 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
51f1f92307 Scope: refactoring. 2020-10-28 15:26:27 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
89df700fb1 Files: fix 2020-09-25 13:47:21 +03:00
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00
f837b3aa24 Merge branch 'master' into feature/socket.io
# Conflicts:
#	ASC.Web.sln
2020-08-19 19:53:13 +03:00
SuhorukovAnton
645b07b511 socket: bagfix 2020-08-14 13:56:15 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
785cc4c5a3 Files: DI 2020-02-13 18:12:27 +03:00
3c23e2f4a7 Files: DI 2020-02-07 13:29:16 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
75285dfc69 DI: configuration 2019-10-10 13:59:22 +03:00
dec4bb266e DI: configuration 2019-09-24 13:32:12 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
9e32ad4b6c IDE0063 2019-08-15 18:08:40 +03:00
f8f2c94962 IDE0034 2019-08-15 16:00:20 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
5c0943f2dd Added custom ConfigurationManager instead of system 2019-05-17 18:27:52 +03:00
92ed33906c init commit 2019-05-15 17:56:09 +03:00