Commit Graph

16939 Commits

Author SHA1 Message Date
01c18cb878 IPSecurity: resolve properties for projection 2022-02-11 18:22:46 +03:00
5c3f8aefd9 IPSecurity: add braces 2022-02-11 18:22:17 +03:00
ab0378aed3 Merge branch 'feature/backend-refactor' into feature/refactoring-healthChecks.UI 2022-02-11 18:11:04 +03:00
077d5dbb81 IPSecurity: private properties replaced by private fileds, cosmetic changes 2022-02-11 18:11:00 +03:00
adc406fba1 refactoring: reorganizing 2022-02-11 18:10:40 +03:00
d101aaa3ba refactoring: reorganizing 2022-02-11 18:05:40 +03:00
1ff67b6b1c Merge branch 'feature/backend-refactor' into feature/refactoring-webstudio 2022-02-11 18:00:03 +03:00
c979d72430 FeedAggregator: refactor 2022-02-11 17:59:18 +03:00
10cf3975b8 Merge branch 'feature/backend-refactor' into feature/refactoring-webhooks.core 2022-02-11 17:47:53 +03:00
205e13ab09 refactoring: webhooks.core 2022-02-11 17:46:49 +03:00
8dd4853d61 refactoring: webhooks.service 2022-02-11 17:39:34 +03:00
1a24054bac refactoring: webhooks.service 2022-02-11 17:33:00 +03:00
05d211bc1c FeedAggregator: changed logger name 2022-02-11 16:57:42 +03:00
7b36caac60 Merge branch 'feature/backend-refactor' into feature/asc-common-refactor 2022-02-11 16:19:25 +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
66c8af352d
Merge pull request #509 from ONLYOFFICE/feature/asc-audit-trail-refactor
Feature/asc audit trail refactor
2022-02-11 15:43:46 +03:00
2565a4c412 refactoring: HttpClient to IHttpClientFactory 2022-02-11 15:34:39 +03:00
ab58c28bbe FeedAggreagator: Feed Aggregator Service is divided into Aggregator and Cleaner 2022-02-11 14:39:42 +03:00
68da688519 refactroring: web.hooks.service: WebApplication 2022-02-11 14:22:14 +03:00
a497f3ff19 Web: Files: fixed files fileStatus 2022-02-11 13:42:17 +03:00
876f5053c2 Merge branch 'feature/backend-refactor' into feature/refactoring-webhooks.core 2022-02-11 13:39:49 +03:00
1b53e3f708 Merge branch 'feature/backend-refactor' into feature/refactoring-webhooks.service 2022-02-11 13:39:30 +03:00
6693d56846 refactoring: update globalUsings 2022-02-11 13:36:06 +03:00
05d0fd89ed Merge branch 'feature/backend-refactor' into feature/refactoring-healthChecks.UI 2022-02-11 13:35:38 +03:00
3182235fc9 refactoring: update globalusings 2022-02-11 13:24:23 +03:00
91736a28d1 Merge branch 'feature/backend-refactor' into feature/refactoring-webstudio 2022-02-11 13:23:56 +03:00
7de212d2b2 FederatedLogin: refactor 2022-02-11 13:12:25 +03:00
54dde2e54c ElasticSearch: refactor 2022-02-11 13:06:30 +03:00
f11bf4c124 Storage: refactor 2022-02-11 13:04:06 +03:00
8c2766198c BackupCore: rename 2022-02-11 12:59:06 +03:00
85c883afe8 FeedAggregator: refactor properties and fileds 2022-02-11 12:49:49 +03:00
37c1cd7d11 AuditTrail: removed Db prefix, added Dto ending 2022-02-11 12:27:08 +03:00
577b5af0f7 Audit: fix 2022-02-10 22:02:42 +03:00
d1f7d41a57 Merge branch 'feature/backend-refactor' into feature/asc-audit-trail-refactor
# Conflicts:
#	common/ASC.Api.Core/GlobalUsings.cs
#	common/ASC.Core.Common/EF/Context/MessagesContext.cs
#	common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	common/services/ASC.AuditTrail/Mappers/AuditActionMapper.cs
#	common/services/ASC.AuditTrail/Mappers/CrmActionMapper.cs
#	common/services/ASC.AuditTrail/Mappers/DocumentsActionMapper.cs
#	common/services/ASC.AuditTrail/Mappers/LoginActionMapper.cs
#	common/services/ASC.AuditTrail/Mappers/OthersActionMapper.cs
#	common/services/ASC.AuditTrail/Mappers/PeopleActionMapper.cs
#	common/services/ASC.AuditTrail/Mappers/ProjectsActionMapper.cs
#	common/services/ASC.AuditTrail/Mappers/SettingsActionMapper.cs
#	common/services/ASC.ClearEvents/ClearEventsServiceLauncher.cs
2022-02-10 21:54:45 +03:00
927352c637 Feed: used file-scoped namespaces 2022-02-10 21:39:04 +03:00
8a60005fea Feed: add mapping 2022-02-10 21:31:44 +03:00
Vashchuk Nikita
7164c54b44 fix 2022-02-10 21:25:40 +03:00
ef7c77b669 Feed: add mapping 2022-02-10 20:48:08 +03:00
395233ea90 Feed: resolve names for mapping, add mapping 2022-02-10 20:47:58 +03:00
e9c52a232d Feed: add braces 2022-02-10 19:59:02 +03:00
ccd017a927 Feed: refactor properties and fields 2022-02-10 19:53:52 +03:00
8a0aeda83c Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 19:50:30 +03:00
fecb7d5e37 Fix Bug 49777 - Docs. The version icon does not appear next to the file name after it has been created and edited. 2022-02-10 19:49:44 +03:00
e06b485c1b ElasticSearch: rename scope 2022-02-10 19:33:35 +03:00
e153f5629a ElasticSearch: fix dispose 2022-02-10 19:32:41 +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
2736a945dc Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 18:57:21 +03:00