|
75da995099
|
Merge branch 'develop' into feature/logger-refactoring
|
2022-05-20 17:01:51 +03:00 |
|
|
f5baafdfa2
|
Merge pull request #649 from ONLYOFFICE/feature/logger-Feed.Aggregator
Feature/logger feed.aggregator
|
2022-05-20 16:21:18 +03:00 |
|
|
ac9b82dba4
|
Merge pull request #645 from ONLYOFFICE/feature/logger-ClearEvents
Feature/logger clear events
|
2022-05-20 16:18:59 +03:00 |
|
|
a47c33f950
|
fix
|
2022-05-20 15:53:38 +03:00 |
|
|
7bc2d18b79
|
fix
|
2022-05-20 15:47:32 +03:00 |
|
|
d6eed4b8d7
|
Merge pull request #644 from ONLYOFFICE/feature/logger-AuditTrail
Feature/logger audit trail
|
2022-05-19 15:57:06 +03:00 |
|
|
0096efcd04
|
Merge pull request #657 from ONLYOFFICE/feature/logger-TelegramService
Feature/logger telegram service
|
2022-05-19 15:54:30 +03:00 |
|
|
f94409cc7c
|
Merge pull request #655 from ONLYOFFICE/feature/logger-Notify
logger-Notify
|
2022-05-19 14:47:16 +03:00 |
|
|
e602d183ab
|
Merge pull request #646 from ONLYOFFICE/feature/logger-Data.Backup.BackgroundTasks
Feature/logger data.backup.background tasks
|
2022-05-19 13:41:57 +03:00 |
|
|
addf33bf5a
|
telegram: remove cache from dao
|
2022-05-17 21:57:18 +03:00 |
|
|
16cc806615
|
telegram: separate integration event
|
2022-05-17 20:53:46 +03:00 |
|
|
7e6f8db8d9
|
telegram: update dependency
|
2022-05-17 18:27:34 +03:00 |
|
|
36855d656f
|
remove application/x-www-form-urlencoded
|
2022-05-17 12:29:24 +03:00 |
|
|
ab4fdcc367
|
add loggers
|
2022-05-16 11:11:20 +03:00 |
|
|
d0525e298c
|
thumbnails, notify, telegram: migrate from ICacheNotify to EventBus
|
2022-05-13 22:14:00 +03:00 |
|
|
5d9fc17f6a
|
add loggers
|
2022-05-13 14:35:39 +03:00 |
|
|
c9c6506060
|
ASC.Data.Backup.BackgroundTasks: refactoring
|
2022-05-13 14:34:57 +03:00 |
|
|
c8caf631e9
|
add logger
|
2022-05-13 14:02:39 +03:00 |
|
|
e9be6684ae
|
Resources: fixed projects
|
2022-05-12 18:32:39 +03:00 |
|
|
df1654ac3f
|
Audit: Resources
|
2022-05-12 13:40:23 +03:00 |
|
|
4ff9fcd55a
|
add loggers
|
2022-05-11 18:45:37 +03:00 |
|
|
62ff18ef7d
|
public to internal
|
2022-05-06 14:02:53 +03:00 |
|
|
525967672b
|
add loggers
|
2022-05-06 13:38:26 +03:00 |
|
|
fe6fc6ad16
|
add logger
|
2022-05-06 11:41:33 +03:00 |
|
|
89d43fa927
|
add loggers
|
2022-05-06 11:35:07 +03:00 |
|
|
cf0e9c322d
|
ElasticSearch: fix
|
2022-04-29 16:17:52 +03:00 |
|
|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
|
36d914724d
|
backend: updated packages version
|
2022-04-27 17:54:31 +03:00 |
|
|
19cf415898
|
backend: updated packages version
|
2022-04-27 13:02:17 +03:00 |
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
|
97b45d3bd5
|
ILog: refactoring
|
2022-04-25 21:02:18 +03:00 |
|
|
88b59b1c30
|
refactoring
|
2022-04-22 16:24:54 +03:00 |
|
|
1dff9e18c4
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.IPSecurity/IPRestrictionsRepository.cs
# common/ASC.IPSecurity/IPRestrictionsService.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
|
2022-04-21 17:51:31 +03:00 |
|
|
cb2580dd50
|
refactoring
|
2022-04-15 12:08:06 +03:00 |
|
|
6ecc8e7071
|
code cleanup
|
2022-04-14 22:42:15 +03:00 |
|
|
f138ff7c79
|
fixed warnings
|
2022-04-14 22:23:57 +03:00 |
|
|
26947072c6
|
Merge branch 'feature/backend-refactor' into feature/warnings
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Configuration/AmiPublicDnsSyncService.cs
# common/ASC.Core.Common/Notify/Engine/NotifyRequest.cs
# common/ASC.Core.Common/Notify/Model/NotifyClientImpl.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/StaticUploader.cs
# products/ASC.Files/Core/ApiModels/ResponseDto/FileDto.cs
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.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/FileOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Core/CollaboratorSettings.cs
# web/ASC.Web.Core/CustomNavigationSettings.cs
# web/ASC.Web.Core/EmailActivationSettings.cs
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
# web/ASC.Web.Core/Notify/SpamEmailSettings.cs
# web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
# web/ASC.Web.Core/PersonalSettings.cs
# web/ASC.Web.Core/PrivacyRoomSettings.cs
# web/ASC.Web.Core/PromotionsSettings.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Sms/SmsSender.cs
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
# web/ASC.Web.Core/StudioAdminMessageSettings.cs
# web/ASC.Web.Core/StudioDefaultPageSettings.cs
# web/ASC.Web.Core/StudioTrustedDomainSettings.cs
# web/ASC.Web.Core/TariffSettings.cs
# web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs
# web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs
# web/ASC.Web.Core/TipsSettings.cs
# web/ASC.Web.Core/Users/CustomNamingPeople.cs
# web/ASC.Web.Core/Users/UserHelpTourSettings.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs
# web/ASC.Web.Core/Utility/ColorThemesSettings.cs
# web/ASC.Web.Core/Utility/PasswordSettings.cs
# web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs
# web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs
# web/ASC.Web.Core/Utility/Settings/WizardSettings.cs
# web/ASC.Web.Core/Utility/TenantExtra.cs
# web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
# web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs
# web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-04-14 15:21:06 +03:00 |
|
|
86456159b9
|
Backup: fix registration
|
2022-04-13 19:28:58 +03:00 |
|
|
b877354203
|
BackupBackgroundTasks: port changed
|
2022-04-13 19:13:37 +03:00 |
|
|
4828678e03
|
merge from feature/backend-refactor
|
2022-04-12 22:04:10 +03:00 |
|
|
66cbc3aa48
|
Elastic: fix
|
2022-04-12 15:01:33 +03:00 |
|
|
e4fa21fb83
|
refactoring using
|
2022-04-01 23:07:21 +03:00 |
|
|
b41682efaa
|
refactoring
|
2022-04-01 19:17:21 +03:00 |
|
|
abce571695
|
backup: refactoring
|
2022-04-01 17:37:21 +03:00 |
|
|
e524ca03d1
|
Notify: removed scope class
|
2022-04-01 17:17:24 +03:00 |
|
|
1e13f42c9c
|
Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
# Conflicts:
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Server/Api/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-04-01 15:17:46 +03:00 |
|
|
2370f7bad5
|
refactoring DistributedTask. replace return value from string to dynamic for indexer
|
2022-04-01 10:10:15 +03:00 |
|
|
90623263e9
|
merge from feature/backend-refactor
|
2022-03-29 23:29:03 +03:00 |
|
|
4fe34215c9
|
Merge pull request #580 from ONLYOFFICE/feature/files-mapping
Feature/files mapping
|
2022-03-29 16:59:43 +04:00 |
|
|
03efcf7f00
|
Notify: remove serviceProvider
|
2022-03-29 13:53:05 +03:00 |
|
|
f55a6cb6b2
|
Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-03-28 17:45:42 +03:00 |
|
|
e7e0f5327a
|
Merge branch 'feature/backend-refactor' into feature/log-refactor
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
|
2022-03-28 14:29:36 +03:00 |
|
|
50a882a2b4
|
merge
|
2022-03-28 12:54:01 +03:00 |
|
|
e5229f12f5
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/Configuration/StorageSettings.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# products/ASC.Files/Core/Core/ResponseStream.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
|
2022-03-28 12:53:15 +03:00 |
|
|
81f3a1fb09
|
DistributedTaskQueue refactoring. set MaxThreadsCount to 1
|
2022-03-26 16:31:13 +03:00 |
|
|
abae61f2db
|
IDE1006
|
2022-03-25 19:26:06 +03:00 |
|
|
cd1d3058ff
|
DistributedTaskQueue refactoring
|
2022-03-25 19:15:28 +03:00 |
|
|
c7712fd7dc
|
Merge branch 'feature/backend-refactor' into feature/warnings
|
2022-03-24 18:01:09 +03:00 |
|
|
66ccce8eb5
|
Settings: refactoring
|
2022-03-24 12:35:00 +03:00 |
|
|
cb4d39e427
|
refactor
|
2022-03-23 19:23:25 +03:00 |
|
|
a857089ee6
|
renamed
|
2022-03-23 17:33:43 +03:00 |
|
|
079618e4e2
|
refactor
|
2022-03-23 16:08:27 +03:00 |
|
|
63e12f49ab
|
merge from feature/backend-refactor
|
2022-03-23 14:56:18 +03:00 |
|
|
244e345ac6
|
Merge 'feature/backend-refactor' into feature/builder-extensions
|
2022-03-22 15:57:46 +03:00 |
|
|
65b6bf9141
|
removed base extenshion
|
2022-03-22 13:48:50 +03:00 |
|
|
62fbab1185
|
Merge branch 'feature/backend-refactor' into feature/warnings
|
2022-03-22 13:20:43 +03:00 |
|
|
82c96d160f
|
Merge branch 'feature/backend-refactor' into feature/files-mapping
|
2022-03-22 12:09:41 +03:00 |
|
|
9bea7b362b
|
Merge branch 'develop' into feature/backup
|
2022-03-22 09:59:55 +03:00 |
|
|
172eaa8985
|
Merge pull request #589 from ONLYOFFICE/feature/update-packages
Feature/update packages
|
2022-03-21 22:24:11 +04:00 |
|
|
cf8c1ba3ff
|
Merge branch 'feature/backend-refactor' into feature/files-mapping
|
2022-03-21 18:52:09 +03:00 |
|
|
7f81a77556
|
Redis.Newtonsoft, Redis.AspNetCore moved to shared ASC.Api.Core
|
2022-03-21 17:53:23 +03:00 |
|
|
e9671701cb
|
Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core
|
2022-03-21 17:39:01 +03:00 |
|
|
010697ec97
|
Merge pull request #592 from ONLYOFFICE/bugfix/refactoring-fix
Bugfix/refactoring fix
|
2022-03-21 17:54:54 +04:00 |
|
|
6e4761b8c2
|
Systemd package moved to shared ASC.Api.Core
|
2022-03-21 16:40:09 +03:00 |
|
|
a3f85f8e0b
|
Merge branch 'feature/backend-refactor' into feature/update-packages
|
2022-03-21 14:44:30 +03:00 |
|
|
679aecbc76
|
Merge branch 'feature/backend-refactor' into feature/license-refactor
# Conflicts:
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
|
2022-03-20 16:47:31 +03:00 |
|
|
868492b562
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Billing/BillingClient.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Notify/Context.cs
# common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
# common/ASC.FederatedLogin/Helpers/RequestHelper.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Helpers/DocuSignHelper.cs
# products/ASC.Files/Core/Helpers/EasyBibHelper.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2022-03-19 22:16:03 +03:00 |
|
|
21a8c0e0fc
|
removed httpclient ctor
|
2022-03-18 22:34:01 +03:00 |
|
|
5cfe7e08ec
|
added registration mapping converters
|
2022-03-18 13:31:02 +03:00 |
|
|
645607aae5
|
default IOptionsMonitor<ILog> => ILog
|
2022-03-18 11:04:29 +03:00 |
|
|
568f427957
|
IDE1006
|
2022-03-17 19:57:02 +03:00 |
|
|
80eb1c8257
|
IDE0011
|
2022-03-17 18:01:39 +03:00 |
|
|
69950c9d8c
|
IDE0007
|
2022-03-17 17:55:19 +03:00 |
|
|
89beecde71
|
replaced IOptionsMonitor<ILog> => ILog
|
2022-03-17 13:13:52 +03:00 |
|
|
38d685c4ce
|
Merge branch 'develop' into feature/backup
|
2022-03-17 11:03:09 +03:00 |
|
|
dbb49a2ce3
|
ElasticSearch: updated packages
|
2022-03-16 15:23:50 +03:00 |
|
|
8b07acbd03
|
AuditTrail: fix
|
2022-03-16 13:04:13 +03:00 |
|
|
8759710552
|
AuditTrail: updated packages
|
2022-03-16 13:04:04 +03:00 |
|
|
65db98f65c
|
added new license headers
|
2022-03-15 21:00:53 +03:00 |
|
|
3d50d7977b
|
removed past license headers
|
2022-03-15 19:59:24 +03:00 |
|
|
5c820fdcd5
|
Index: create index only in service
|
2022-03-14 21:47:34 +03:00 |
|
|
af772531ad
|
added extension method for services
|
2022-03-14 12:07:37 +03:00 |
|
|
5e2f575483
|
added builders extensions
|
2022-03-10 20:30:29 +03:00 |
|
|
d45373619d
|
update StackExchange.Redis.*.dll
|
2022-03-10 15:56:30 +03:00 |
|
|
ad68b7dc60
|
Merge branch 'feature/backend-refactor' into feature/files-mapping
|
2022-03-10 14:15:49 +03:00 |
|
|
26066ccb7f
|
Merge branch 'feature/backend-refactor' into feature/files-mapping
|
2022-03-10 12:19:18 +03:00 |
|
|
64dfd61858
|
Merge branch 'develop' into feature/backup
|
2022-03-10 12:15:26 +03:00 |
|
|
d930c91fb1
|
Merge branch 'feature/backend-refactor' into feature/winsw
# Conflicts:
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.UrlShortener.Svc/ASC.UrlShortener.Svc.csproj
# common/services/ASC.UrlShortener.Svc/GlobalUsings.cs
|
2022-03-09 21:08:00 +03:00 |
|
|
2585c22b3b
|
merge from feature/backend-refactor
|
2022-03-09 12:10:30 +03:00 |
|
|
78fafb08ab
|
Microsoft.NET.Sdk.Worker
|
2022-03-05 18:38:42 +03:00 |
|