Commit Graph

71 Commits

Author SHA1 Message Date
389bb3024f added support ILog<T> interface 2022-03-17 23:09:45 +03:00
21f85e7260 logger refactoring. added resolver ILog/IOptionsMonitor<ILog> 2022-03-17 09:55:08 +03:00
1b352c76f6 Added using AddControllers method 2022-03-03 14:04:17 +03:00
8288f3c4ca Common: return IEventBust to ICacheNotify 2022-02-14 12:05:05 +03:00
dba3efb235 Merge branch 'feature/backend-refactor' into feature/asc-common-refactor
# Conflicts:
#	common/ASC.Api.Core/GlobalUsings.cs
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/Collections/CachedDictionaryBase.cs
#	common/ASC.Common/Collections/HttpRequestDictionary.cs
#	common/ASC.Common/DIHelper.cs
#	common/ASC.Common/Data/StreamExtension.cs
#	common/ASC.Common/Data/TempStream.cs
#	common/ASC.Common/DependencyInjection/AutofacExtension.cs
#	common/ASC.Common/Logging/Log.cs
#	common/ASC.Common/Logging/SelfCleaningTarget.cs
#	common/ASC.Common/Logging/SpecialFolderPathConverter.cs
#	common/ASC.Common/Mapping/MappingProfile.cs
#	common/ASC.Common/Security/AscRandom.cs
#	common/ASC.Common/Security/Authorizing/AuthorizingException.cs
#	common/ASC.Common/Security/Authorizing/Constants.cs
#	common/ASC.Common/Security/Authorizing/Domain/Role.cs
#	common/ASC.Common/Security/Cryptography/Hasher.cs
#	common/ASC.Common/Threading/DistributedTask.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Utils/DnsLookup.cs
#	common/ASC.Common/Utils/HtmlUtil.cs
#	common/ASC.Common/Utils/HttpRequestExtensions.cs
#	common/ASC.Common/Utils/JsonWebToken.cs
#	common/ASC.Common/Utils/MailAddressUtils.cs
#	common/ASC.Common/Utils/RandomString.cs
#	common/ASC.Common/Utils/TimeZoneConverter/TimeZoneConverter.cs
#	common/ASC.Common/Utils/VelocityFormatter.cs
#	common/ASC.Common/Utils/Wildcard.cs
#	common/ASC.Common/Web/MimeMapping.cs
#	common/ASC.Common/Web/VirtualPathUtility.cs
#	common/services/ASC.ClearEvents/Program.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
2022-02-11 16:17:55 +03:00
ebcb6807ae Merge branch 'feature/backend-refactor' into feature/asc-clear-events-refactor
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.ClearEvents/ClearEventsServiceLauncher.cs
#	common/services/ASC.ClearEvents/Program.cs
2022-02-10 17:15:32 +03:00
5022501e58 Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Api.Core/Auth/CookieAuthHandler.cs
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Api.Core/Core/ApiDateTime.cs
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Api.Core/Core/CustomHealthCheck.cs
#	common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs
#	common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Api.Core/Routing/FormatRoute.cs
2022-02-10 13:56:54 +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
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
179c8ddb84 ApiCore: single line expressions replaced by expressions with braces 2022-02-07 19:03:16 +03:00
b2e779d7d8 Merge branch 'feature/backend-refactor' into feature/asc-common-refactor 2022-02-04 23:27:29 +03:00
03f0eedf3a Merge branch 'feature/backend-refactor' into feature/asc-clear-events-refactor 2022-02-04 23:24:40 +03:00
a913fa4589 Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor 2022-02-04 23:16:18 +03:00
973624c30b Merge branch 'feature/refactoring' into feature/asc-common-refactor 2022-02-03 17:30:13 +03:00
487a55a99e ApiCore: used file-scope namespaces, fix conflicts 2022-02-03 16:19:48 +03:00
524fb32a0d Merge branch 'feauter/refactoring' into feauter/asc-api-core-refactor 2022-02-03 16:08:15 +03:00
62c8f69f25 Merge branch 'feature/refactoring' into 'feature/asc-clear-events-refactor' 2022-02-03 15:16:05 +03:00
f6620e34ae Merge branch 'develop' into feature/refactoring 2022-02-02 13:09:25 +03:00
23eaa4be39 Common: private properties replaced with fields, used single line expressions, cosmetic 2022-02-01 17:51:29 +03:00
f2c0f3ec77 Common: ICahcheNotify is reduced to IEventBus 2022-02-01 14:38:03 +03:00
ad78c46495 Api: priveate properties replaced with fields, used single line expressions, cosmetic 2022-01-31 19:36:51 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
0628f4044a refactoring: bugfix: apiCore 2022-01-26 16:04:22 +03:00
6a918e52a2 refactoring: add globalUsing: api.core 2022-01-26 11:06:31 +03:00
b4334b8947 analizators/Add HttpClient service 2022-01-25 13:47:36 +03:00
fb65d3a09d analizators/1481 2022-01-21 16:15:15 +03:00
986d1d49e6 refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null 2022-01-13 14:24:14 +03:00
dcc7986a90 map ICacheNotify<> to RedisCache<> 2021-12-23 18:27:58 +03:00
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +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
26511d9fb7 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Tests.sln
2021-10-29 13:18:57 +03:00
8c7815d9a5
Merge pull request #427 from ONLYOFFICE/feature/sc
Feature/sc
2021-10-28 18:49:01 +03:00
40dc6a8e86 fix loading products 2021-10-28 16:07:14 +03:00
403388fbf1 Added solution filter
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
5a5e299d98 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
2021-10-19 18:30:59 +03:00
0f833ae1de net6: warning SYSLIB0020 2021-10-01 13:26:36 +03:00
315665e87a BuildAndDeploy 2021-09-23 20:58:39 +03:00
2e20b4958d fix CookieAuthHandler 2021-09-08 13:16:58 +03:00
Vashchuk Nikita
3b4cb1dfc6 Added GlobalFilter, fix 2021-09-03 17:02:52 +03:00
Vashchuk Nikita
45d221a109 Split webhooks into service and core 2021-08-26 21:43:41 +03:00
Vashchuk Nikita
c851641b6c Merge remote-tracking branch 'remotes/origin/feature/webhooks' into feature/webhooks 2021-08-23 13:01:48 +03:00
Vashchuk Nikita
9f0e41b880 Merge branch 'develop' into feature/webhooks 2021-08-23 12:36:01 +03:00
Vashchuk Nikita
e1c648e06a Merge branch 'develop' into feature/webhooks 2021-08-19 13:49:16 +03:00
Vashchuk Nikita
7d4b22ca83 added tests, migrations 2021-08-19 12:11:26 +03:00
16469eb138 Api: added ConfigureNLogLogging 2021-08-08 15:56:54 +03:00
Vashchuk Nikita
afdd1ab982 Added CustomMiddleware(WebhooksMiddleware.cs) 2021-07-28 13:10:14 +03:00
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
1268a436ca Startup: fix load products 2021-07-16 11:56:14 +03:00