|
e42e0aa4e5
|
refactoring: voipService
|
2022-02-16 17:07:58 +03:00 |
|
|
420f34c3ee
|
Merge pull request #522 from ONLYOFFICE/feature/asc-backup-core-refactor
Feature/asc backup core refactor
|
2022-02-16 13:31:11 +03:00 |
|
|
d139c407d9
|
BackapCore: remove empty lines
|
2022-02-16 13:14:00 +03:00 |
|
|
a76ad4c2a1
|
Merge branch 'feature/backend-refactor' into feature/asc-backup-core-refactor
# Conflicts:
# common/ASC.Data.Backup.Core/ActionInvoker.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/Core/DbBackupProvider.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Core/ZipOperator.cs
# common/ASC.Data.Backup.Core/Exceptions/ThrowHelper.cs
# common/ASC.Data.Backup.Core/Extensions/EnumerableExtensions.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/ColumnMapper.cs
# common/ASC.Data.Backup.Core/Tasks/Data/DataRowInfo.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/KeyHelper.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/MailModuleSpecifics.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/ModuleProvider.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/ModuleSpecificsBase.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/ProjectsModuleSpecifics.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/RestoreDbModuleTask.cs
# common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
|
2022-02-15 19:56:43 +03:00 |
|
|
64dd260a07
|
Merge pull request #531 from ONLYOFFICE/feature/refactoring-healthChecks.UI
Feature/refactoring health checks.UI
|
2022-02-14 19:24:08 +03:00 |
|
|
4e717e7bcd
|
Merge pull request #530 from ONLYOFFICE/feature/refactoring-webstudio
Feature/refactoring webstudio
|
2022-02-14 19:22:45 +03:00 |
|
|
b5c3c5c54e
|
Merge pull request #526 from ONLYOFFICE/feature/asc-federatedlogin-refactor
Feature/asc federatedlogin refactor
|
2022-02-14 18:36:09 +03:00 |
|
|
aa102f9435
|
Merge branch 'feature/backend-refactor' into feature/asc-federatedlogin-refactor
|
2022-02-14 17:54:26 +03:00 |
|
|
a93f6208c2
|
Merge pull request #510 from ONLYOFFICE/feature/asc-common-refactor
Feature/asc common refactor
|
2022-02-14 12:12:18 +03:00 |
|
|
8288f3c4ca
|
Common: return IEventBust to ICacheNotify
|
2022-02-14 12:05:05 +03:00 |
|
|
ab0378aed3
|
Merge branch 'feature/backend-refactor' into feature/refactoring-healthChecks.UI
|
2022-02-11 18:11:04 +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 |
|
|
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 |
|
|
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 |
|
|
8c2766198c
|
BackupCore: rename
|
2022-02-11 12:59:06 +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 |
|
|
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 |
|
|
de6bc3da35
|
Merge pull request #508 from ONLYOFFICE/feature/asc-clear-events-refactor
Feature/asc clear events refactor
|
2022-02-10 18:35:23 +03:00 |
|
|
0a1c864c4e
|
ClearEvents: fix dispose
|
2022-02-10 18:10:43 +03:00 |
|
|
3c802cd789
|
FederatedLogin: fields and properties refactor
|
2022-02-10 18:04:48 +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 |
|
|
9025dcc0a3
|
Merge branch 'develop' into feature/backend-refactor
|
2022-02-10 16:55:19 +03:00 |
|
|
77e14da218
|
fixed tests
|
2022-02-10 16:24:55 +03:00 |
|
|
946fea8098
|
Merge pull request #507 from ONLYOFFICE/feature/asc-api-core-refactor
Feature/asc api core refactor
|
2022-02-10 15:52:35 +03:00 |
|
|
d1b9e56c5d
|
BackupCore: removed 's' prefix
|
2022-02-10 15:29:49 +03:00 |
|
|
a06903129e
|
Common: removed 's' prefix
|
2022-02-10 15:14:50 +03:00 |
|
|
599b5b9a73
|
ApiCore: removed 's' prefix
|
2022-02-10 15:10:27 +03:00 |
|
|
fca62cfa28
|
Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor
|
2022-02-10 14:01:51 +03:00 |
|
|
c20a470508
|
People: fix
|
2022-02-10 14:00:53 +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 |
|
|
fe80ccb0a4
|
BackupCore: removed unused fields
|
2022-02-10 10:49:04 +03:00 |
|
|
85f9055eb2
|
BackupCore: used file-scoped namespaces
|
2022-02-09 21:49:52 +03:00 |
|
|
0fc1f2f67b
|
BackupCore: IServiceProvider replaced by IServiceScopeFactory
|
2022-02-09 21:43:11 +03:00 |
|
|
bfbebf9733
|
BackupCore: cosmetic changes
|
2022-02-09 21:33:50 +03:00 |
|
|
dfce143db0
|
BackupCore: add braces
|
2022-02-09 19:46:09 +03:00 |
|