Commit Graph

163 Commits

Author SHA1 Message Date
99378a027e Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00
ca7140186d Core: resolve properties for mapping, add mapping/projection 2022-02-15 13:30:05 +03:00
7de212d2b2 FederatedLogin: refactor 2022-02-11 13:12:25 +03:00
d6d0886c3e FederatedLogin: IServiceProvider replaced by IServiceScopeFactory 2022-02-10 19:30:13 +03:00
c9736832c0 FederatedLogin: used file-scoped namespaces 2022-02-10 19:26:09 +03:00
3da786804e FederatedLogin: added 'Async' ending to the names of asynchronous methods, changed the order of methods by access modifier 2022-02-10 19:22:16 +03:00
2e6d117307 FederatedLogin: add braces, refactor properties and fields 2022-02-10 19:06:48 +03:00
9081371e4a FederatedLogin: property and fields refactor 2022-02-10 18:50:15 +03:00
3c802cd789 FederatedLogin: fields and properties refactor 2022-02-10 18:04:48 +03:00
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
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
8a90ccc30b
Merge pull request #504 from ONLYOFFICE/feature/refactoring
Feature/refactoring
2022-02-04 22:42:16 +03:00
34dab043e0 Merge branch 'develop' into feature/analizators
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
2022-02-03 12:55:33 +03:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
2584fc4042 refactoring: remove waste 2022-01-31 18:15:43 +03:00
4f0de0b643 refactoring: bugfix 2022-01-31 16:59:38 +03:00
5b22e2c7bd refactoring: bugfix 2022-01-31 16:57:41 +03:00
7ab885b2e2 refactoring: bugfix 2022-01-31 16:56:30 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
e6389ebd5e refactoring: add globalUsings: FederatedLogin 2022-01-26 15:34:57 +03:00
445f03097d Fix content-type header 2022-01-24 22:44:18 +03:00
fce8d26cef analizators/ca1507 2022-01-24 13:49:00 +03:00
667697f933 analizators/s2259 2022-01-21 16:46:30 +03:00
2029c34f9c analizators/s1121 2022-01-21 14:02:17 +03:00
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
f956ad22fa analizators/s2223 2022-01-20 11:53:38 +03:00
25050cb5fd analizators/s2223 2022-01-19 17:16:15 +03:00
e046f6f8df analizators/s1006 2022-01-19 16:14:51 +03:00
1403afbc16 analizators/U2U1209 2022-01-19 11:59:14 +03:00
78047d3b93 analizators/U2U1210 2022-01-18 18:29:46 +03:00
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
36c26bc803 analizators/U2U1117 2022-01-18 15:40:28 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
cacb889ee2 analizators/U2U1100 2022-01-13 15:04:28 +03:00
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +03:00
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +03:00
fb3bfba1bd Files: optimization 2021-12-16 15:49:35 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
8ca88e4620 Merge branch 'develop' into feature/net6
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
2021-11-23 16:40:50 +03:00
1bc93172d3 OAuth: fix 2021-11-02 20:39:30 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
9dd28a144d Web: Fixed callback pages, added login callback for desktop client 2021-10-19 10:31:34 +03:00
fb7922f579 Thirdparty: login. Desktop 2021-10-15 11:34:34 +03:00
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
66d126410c Login: added desktop param 2021-10-13 10:25:19 +03:00
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
e755d2eda8 renamed providers to lowercase 2021-09-24 17:36:46 +03:00
b791586252 net6 2021-08-25 18:26:13 +03:00