Commit Graph

907 Commits

Author SHA1 Message Date
481581e424 Core: private properties replaced by private fields, add braces 2022-02-15 00:02:57 +03:00
b67d3cc11c Merge branch 'feature/backend-refactor' into feature/asc-elasticsearch-refactor 2022-02-14 19:03:56 +03:00
506214710c refactoring: BuildQueueService inheritance BackgroundService 2022-02-14 17:34:04 +03:00
6ea8889549 refactoring: add ConfigureContainer 2022-02-14 16:59:23 +03:00
70ed0d72b7 added IntegrationEventLog from eShopOnContainers template. refactoring. 2022-02-14 14:18:58 +03:00
8288f3c4ca Common: return IEventBust to ICacheNotify 2022-02-14 12:05:05 +03:00
70b3231756 Merge branch 'develop' into feature/backup 2022-02-14 10:51:38 +03:00
Vashchuk Nikita
631dcdc2e8 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
#	common/ASC.Data.Storage/CrossModuleTransferUtility.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Extensions.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	products/ASC.CRM/Server/Api/VoipController.cs
#	products/ASC.CRM/Server/Core/Dao/RelationshipEventDao.cs
#	products/ASC.CRM/Server/Utils/PdfCreator.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/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/SearchHandler.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/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
#	web/ASC.Web.Core/Files/DocumentServiceLicense.cs
#	web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
#	web/ASC.Web.Core/Recaptcha.cs
#	web/ASC.Web.Core/Utility/UrlShortener.cs
2022-02-12 00:51:48 +03:00
6b8304304f fixed starting services 2022-02-11 19:01:38 +03:00
3d4337a1ad FeedAggregator: used file-scoped namespaces 2022-02-11 18:42:50 +03:00
c979d72430 FeedAggregator: refactor 2022-02-11 17:59:18 +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
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
1b53e3f708 Merge branch 'feature/backend-refactor' into feature/refactoring-webhooks.service 2022-02-11 13:39:30 +03:00
54dde2e54c ElasticSearch: refactor 2022-02-11 13:06:30 +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
Vashchuk Nikita
7164c54b44 fix 2022-02-10 21:25:40 +03:00
ef7c77b669 Feed: add mapping 2022-02-10 20:48:08 +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
0a1c864c4e ClearEvents: fix dispose 2022-02-10 18:10:43 +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
6ec6eb3ce1 refactoring 2022-02-10 17:03:44 +03:00
8488ff0022 Merge branch 'feature/backend-refactor' into feature/refactoring-webhooks.service 2022-02-10 17:03:27 +03:00
9ed14811cf ElasticSearch: IServiceProvider replaced by IServiceScopeFactory 2022-02-10 17:00:06 +03:00
53237d8c6f ElasticSearch: used file-scoped namespaces 2022-02-10 16:45:41 +03:00
cd879ed2a7 ElasticSearch: used TimedHostedService template 2022-02-10 16:34:47 +03:00
20bb3fb8ff ElasticSearch: add braces 2022-02-10 16:24:25 +03:00
a5268d3d8f ElasticSearch: reordered methods according to access modifier, cosmetic changes 2022-02-10 16:14:03 +03:00
45d7c1d44e ElasticSearch: removed 's' prefix 2022-02-10 15:42:49 +03:00
402dedb49b ElasticSearch: private properties replaced by private fileds, used keyword readonly 2022-02-10 14:56:13 +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
1acf512f87 backup: add in startup backupFileUpload.ashx 2022-02-10 11:01:51 +03:00
6510927b20 backup: add api method enableAutoBackup 2022-02-09 17:39:02 +03:00
d429bcc731 Merge branch 'develop' into feature/backup 2022-02-09 12:40:16 +03:00
c62d42de80 Socket.IO: Move pingInterval and reconnectAttempts to config 2022-02-09 12:11:39 +03:00
93506010b8 ASC.AuditTrail: refactoring 2022-02-08 15:00:07 +03:00
e3e43669ee ClearEvents: add braces 2022-02-08 12:59:22 +03:00
60a4f7c9ab ClearEvents: fix 2022-02-08 12:07:07 +03:00
45b6e59350 AuditTrail: add braces 2022-02-08 03:11:22 +03:00
d591a6e129 AuditTrail: add using 2022-02-08 03:08:46 +03:00
f094094abf AuditTrail: change mapping, change select 2022-02-08 03:08:35 +03:00
797208c5e7 AuditTrail: model simplification 2022-02-08 03:07:55 +03:00
9fcf703c76 AuditTrail: change mapping 2022-02-08 03:07:34 +03:00
4e497e4764 AuditTrail: add events type converter 2022-02-08 03:05:45 +03:00
f7eda83bb0 AuditTrail: delete unnecessary 2022-02-08 03:05:25 +03:00
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
bcb7005ce6 ClearEvents: add using 2022-02-07 17:07:48 +03:00
69c20291cc ClearEvents: add service 2022-02-07 17:07:36 +03:00
da19146381 ClearEvents: rename TimedClearEventsService to ClearEventsService 2022-02-07 17:07:22 +03:00
e00657439d ClearEvents: add events context 2022-02-07 17:06:00 +03:00
fd7528879d backup: bugfix 2022-02-07 13:57:00 +03:00
40d56075f1 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/EF/BackupsContext.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Controllers/BackupController.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	products/ASC.Files/Client/public/locales/en/OperationsPanel.json
#	products/ASC.Files/Client/public/locales/en/Settings.json
#	products/ASC.Files/Client/public/locales/ru/Settings.json
#	products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/webpack.config.js
2022-02-07 12:40:50 +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
c67c5e80e2 Merge branch 'feature/backend-refactor' into feature/asc-audit-trail-refactor 2022-02-04 23:20:49 +03:00
8a90ccc30b
Merge pull request #504 from ONLYOFFICE/feature/refactoring
Feature/refactoring
2022-02-04 22:42:16 +03:00
9395c23081 Merge branch 'develop' into feature/cluster-services-backup 2022-02-04 21:00:27 +03:00
f3b3b08af1 add support rabbitmq. split ASC.Data.Backup service on two services 2022-02-04 20:44:03 +03:00
Vashchuk Nikita
5aa99ec811 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
2022-02-04 16:04:52 +03:00
8c203b07c2 rename intermediate model 2022-02-04 12:18:22 +03:00
014e344bb6 Socket.svc: Restored kill process on node died 2022-02-03 19:12:29 +03:00
00bb2821bc Socket.svc: Restored logPath Environment 2022-02-03 18:57:26 +03:00
973624c30b Merge branch 'feature/refactoring' into feature/asc-common-refactor 2022-02-03 17:30:13 +03:00
3ad4ba6c08 fix after merge 2022-02-03 16:53:34 +03:00
e6665bb8c9 Merge branch 'feature/refactoring' into feature/asc-audit-trail-refactor 2022-02-03 16:46:17 +03:00
a04f7824fc refactoring: webhooks.service: file-scope namespace 2022-02-03 16:41:09 +03:00
62c8f69f25 Merge branch 'feature/refactoring' into 'feature/asc-clear-events-refactor' 2022-02-03 15:16:05 +03:00
b5e4d68550 ClearEvents: used file-scope namespaces 2022-02-03 14:54:31 +03:00
9f670d2b25 ClearEvents: add waiting for the end of the timer 2022-02-03 14:53:23 +03:00
fdc4652edb AuditTrail: used file-scope namespaces 2022-02-03 14:16:34 +03:00
0a17af12eb AuditTrail: add mapping actions 2022-02-03 14:02:49 +03:00
342daa3d18 AuditTrail: rename to Dto, change mapping 2022-02-03 14:02:27 +03:00
81e50c856e AuditTrail: remove unnecessary 2022-02-03 14:01:34 +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
2ff2e64f4d refactoring: asc.webhooks.service 2022-02-02 17:23:15 +03:00
f6620e34ae Merge branch 'develop' into feature/refactoring 2022-02-02 13:09:25 +03:00
498045e071 ClearEvents: IServiceProvider replaced by IServiceScopeFactory 2022-02-01 18:27:37 +03:00
e7df033899 AuditTrail: fix 2022-02-01 18:19:09 +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
29a2ec96b5 ClearEvents: change log level 2022-02-01 14:27:40 +03:00
7f74aa544c ClearEvents: CreateHostBuilder replcaed with WebApplicationBuilder 2022-02-01 14:16:48 +03:00
1b32b993b6 ClearEvents: used TimedHostedService template 2022-02-01 14:10:50 +03:00
6cb8f0a0ec AuditTrail: add mapping 2022-02-01 13:21:26 +03:00
200b8a0212 AuditTrail: project reconstruction 2022-02-01 12:11:19 +03:00
724065389f AuditTrail: private properties replaced with fields, used single line expressions, cosmetic 2022-02-01 11:35:28 +03:00
2584fc4042 refactoring: remove waste 2022-01-31 18:15:43 +03:00
c3c3068d6a refactoring: add globalusings: clearEvents 2022-01-31 18:14:29 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
6f93f3c6cb refactoring:add globalusings: webhooks.service 2022-01-31 11:37:25 +03:00
5e2c2fc2e0 refactoring: add globalusings: urlShortener 2022-01-30 01:40:50 +03:00
3068883ec8 refactoring: add globalusing: telegramService 2022-01-30 01:24:30 +03:00
74bf6bf7a0 refactoring: add globalusings: studio.notify 2022-01-30 01:17:12 +03:00
5c14db512a refactoring: add globalusings: notify 2022-01-30 00:53:20 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
0ee3ed2dd7 refactoring: add globalUsings: feed.Aggregator 2022-01-26 15:39:59 +03:00
ca0e8a83ad refactoring: refactoring globalUsings 2022-01-26 14:42:03 +03:00
2ddb37dedf refactoring: add globalUsing: elasticSeach 2022-01-26 14:41:26 +03:00
f19d2ab138 refactoring: add globalUsing: auditTrail 2022-01-26 11:08:59 +03:00
8ca5d96a3d refactoring: add globalUsing: apiSystem 2022-01-26 11:08:13 +03:00
b25f339c3e Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-24 15:43:04 +03:00
fce8d26cef analizators/ca1507 2022-01-24 13:49:00 +03:00
0fcac47686 analizators/s3604 2022-01-24 13:01:19 +03:00
fb3a61d0d2 analizators/s3442 2022-01-24 12:57:01 +03:00
667697f933 analizators/s2259 2022-01-21 16:46:30 +03:00
4be25479fd used one dbcontext per service (per DAO). fixed error: System.InvalidOperationException: 'Cannot use multiple context instances within a single query execution. Ensure the query uses a single context instance.' 2022-01-21 16:45:50 +03:00
afb1f56641 backup: fixed startup backup as WindowsService https://github.com/dotnet/AspNetCore.Docs/issues/23387 2022-01-21 16:40:55 +03:00
f3d8b8d17a analizators/s1854 2022-01-21 16:36:36 +03:00
143f0a5dda Analizators/s1854 2022-01-21 16:22:56 +03:00
c05d9fe6bc analizators/s1450 2022-01-21 16:15:29 +03:00
fb65d3a09d analizators/1481 2022-01-21 16:15:15 +03:00
2029c34f9c analizators/s1121 2022-01-21 14:02:17 +03:00
8863e41487 Elastic: fix ping 2022-01-21 13:56:23 +03:00
a0a1a1c50c Elastic: fix ping 2022-01-21 13:54:09 +03:00
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
dd2c54ed86 Elastic: fix ping 2022-01-21 11:42:48 +03:00
fa10791720 Elastic: fix ping 2022-01-21 11:40:59 +03:00
0630a43b58 Elastic: fix ping 2022-01-21 11:26:25 +03:00
bf3b0395a5 analizators/s1116 2022-01-21 11:04:08 +03:00
bd8c47ff5d Web: Socket.IO: Update SocketIOClient 2022-01-20 10:44:20 +03:00
7e13b3a031 backup: refactoring 2022-01-19 19:25:10 +03:00
f0dbdded9f analizators/s2692 2022-01-19 18:29:04 +03:00
f2e33fa4aa analizators/s2365 2022-01-19 18:16:59 +03:00
cbab9c4524 analizators/s2178 2022-01-19 17:16:34 +03:00
547b78b72f analizators/2178 2022-01-19 16:36:03 +03:00
a30b276711 analizators/U2U1015 2022-01-19 13:00:16 +03:00
fbb50e676e analizators/U2U1202 2022-01-19 12:51:30 +03:00
1403afbc16 analizators/U2U1209 2022-01-19 11:59:14 +03:00
07ebea5db8 backup: refactoring 2022-01-18 19:04:35 +03:00
6c5792583a analizators/U2U1209 2022-01-18 17:43: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
d3c1dfde9f backup: refactoring 2022-01-18 09:59:49 +03:00
1a8d88345a Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
#	yarn.lock
2022-01-17 19:02:40 +03:00
ee8cb969bf backup: refactoring 2022-01-17 18:03:28 +03:00
a9da66f2b5 backup: refactoring 2022-01-17 14:15:46 +03:00
e63684774f analizators/U2U1115 2022-01-17 11:28:39 +03:00
cec441c996 analizators/U2U1113 2022-01-17 11:23:40 +03:00
0ee1a35424 analizators/U2U1115 2022-01-17 11:22:52 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
a66272af1a Elastic: fix ping 2022-01-14 15:20:44 +03:00
0796169d76 refactoring 2022-01-14 10:42:43 +03:00
48897308d7 refactoring 2022-01-13 22:17:56 +03:00
6b883bcd60 Merge branch 'develop' into feature/support-elasticache 2022-01-13 18:16:43 +03:00
9bc8584184 analizators/U2U1103 2022-01-13 15:53:57 +03:00
986d1d49e6 refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null 2022-01-13 14:24:14 +03:00
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +03:00
Vashchuk Nikita
c74da79ba2 Merge branch 'develop' into feature/async
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-01-12 22:07:21 +03:00
3ff7aeca3b analizators/U2U1015 2022-01-12 13:27:06 +03:00
610c45fed3 analizators/U2U1009 2022-01-12 12:56:00 +03:00
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
078e870f71 Web: Socket.IO: Fix reboot, logging, + refactoring (replaced WebSocketSharp to SocketIOClient) 2022-01-11 19:09:44 +03:00
50c0596eff analizators/U2U1009 2022-01-11 18:37:19 +03:00
c85c2e6f26 analizators/U2U1007 2022-01-11 18:37:10 +03:00
d9619e1151 analizators/U2U1006 2022-01-10 18:13:54 +03:00
6cbd02b71c Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/webpack.config.js
#	products/ASC.Files/Server/DocStore
#	yarn.lock
2022-01-10 11:06:32 +03:00
6273539207 analizators/s2583 2021-12-30 14:03:50 +03:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
Vashchuk Nikita
0876c22f6f spreading async in Files 2021-12-28 18:15:29 +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
99e37d960d Web: Socket.IO: Refactoring work with socket.io 2021-12-20 15:38:08 +03:00
7b0707ba16 Merge branch 'develop' into feature/async
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
2021-12-17 10:48:44 +03:00
c87a831b89 Files: optimization 2021-12-08 13:14:44 +03:00
d181d43b36 Merge branch 'develop' into feature/async
# Conflicts:
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/ASC.Files.csproj
2021-12-02 12:02:50 +03:00
Vashchuk Nikita
0d4af58ada fix 2021-11-30 16:03:23 +03:00
fbdb776d69 fix 2021-11-29 14:34:35 +03:00
85316c9d63 Moved from 45122194 2021-11-29 14:11:03 +03:00
384e012c5f net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
58d84912dd fix 2021-11-25 11:23:35 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +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
Vashchuk Nikita
35ceaf7997 Merge branch 'develop' into feature/async 2021-11-22 11:30:38 +03:00
2cba76f838 backup: add "backupFileUpload.ashx" 2021-11-19 12:43:54 +03:00
cc35174d16 moved from 043e301 2021-11-16 20:40:15 +03:00
Vashchuk Nikita
43e2a65081 Spreading async in Files 2021-11-15 14:31:47 +03:00
Vashchuk Nikita
999f50f4ae added Linq.Async to ASC.Files.Core 2021-11-02 15:12:28 +03:00
8cc08045b7 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
2021-11-01 13:54:40 +03:00
1882f9db43 Fixed settings issue 2021-10-29 17:21:51 +03:00
b15bc7b5cf WebHook: fix service 2021-10-29 13:23:37 +03:00
26511d9fb7 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Tests.sln
2021-10-29 13:18:57 +03:00
08205c2780 setup Kestrel for ApiSystem 2021-10-27 20:03:59 +03:00
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
957aa8bd81 fixed started services 2021-10-26 20:09:19 +03:00
b1134d239c Merge branch 'develop' into feature/auto-migrations
# Conflicts:
#	common/ASC.Core.Common/EF/Context/UserDbContext.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/MySqlAccountLinkContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/MySqlDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/MySqlFeedDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/MySqlMailDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20210803212546_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/MySqlMessagesContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/MySqlNotifyDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/MySqlResourceDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/MySqlTelegramDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/MySqlTenantDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210309095256_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210803213502_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/MySqlWebstudioDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
2021-10-25 20:52:13 +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
c02e5867d7 Storage: fix conflict namespace 2021-10-22 19:51:51 +03:00
30277d4fb3 net6: bugfix 2021-10-22 17:20:40 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
dd8f77f827 Merge branch 'develop' into feature/wizard/migration 2021-10-22 11:44:21 +03:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
f6f317ec42 net6: refactoring and bugfix 2021-10-21 16:23:26 +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
9f12c95828 Merge branch 'feature/webhooks' of github.com:ONLYOFFICE/AppServer into feature/webhooks 2021-10-19 15:25:53 +03:00
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
01879779cd Merge branch 'develop' into feature/backup 2021-10-04 15:21:45 +03:00
0f833ae1de net6: warning SYSLIB0020 2021-10-01 13:26:36 +03:00
1bc64ce5ae Files: check state before get stream 2021-09-30 09:51:38 +03:00
315665e87a BuildAndDeploy 2021-09-23 20:58:39 +03:00
f4feb48d2c fix dependencies 2021-09-22 19:51:06 +03:00
aa6c02b190 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Controllers/BackupController.cs
#	packages/asc-web-common/api/settings/index.js
#	packages/asc-web-common/components/PrivateRoute/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/ru/SelectFile.json
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Client/src/Shell.jsx
2021-09-20 16:26:34 +03:00
ea4fa97838 Merge branch 'develop' into feature/wizard/migration
# Conflicts:
#	ASC.Tests.sln
#	common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj
#	common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj
#	common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj
2021-09-15 15:52:13 +03:00
d099326e7f Merge branch 'develop' into feature/backup.core
# Conflicts:
#	common/services/ASC.Data.Backup/Program.cs
2021-09-05 12:50:05 +03:00
9cb01be544 Elastic: removed unused isInit 2021-09-03 18:05:05 +03:00
d78195aa5a Added notify 2021-09-03 18:04:06 +03:00
Vashchuk Nikita
3b4cb1dfc6 Added GlobalFilter, fix 2021-09-03 17:02:52 +03:00
c5b135afbe backup.core: remove waste 2021-09-02 16:11:41 +03:00
8171563965 backup.core: move backup.core 2021-09-02 15:41:54 +03:00
d8654444c6 backup.core: fix 2021-08-31 16:59:32 +03:00
115d752582 backup.core: fix 2021-08-31 15:43:40 +03:00
a812971c07 Merge branch 'develop' into feature/backup.core 2021-08-31 13:55:47 +03:00
4b3cb1b4fb backup.core: first version 2021-08-31 12:40:28 +03:00
f62209d88e Merge branch 'develop' into feature/webhooks 2021-08-30 19:18:18 +03:00
a84bddad3c fix 2021-08-30 19:17:57 +03:00
Vashchuk Nikita
5e6bd9ee5f fix 2021-08-27 18:33:21 +03:00
Vashchuk Nikita
0521d8af09 fix 2021-08-27 17:50:49 +03:00
Vashchuk Nikita
35caf0dc4a fix 2021-08-27 12:29:45 +03:00
Vashchuk Nikita
d66600b6c7 fix 2021-08-27 10:50:52 +03:00
Vashchuk Nikita
45d221a109 Split webhooks into service and core 2021-08-26 21:43:41 +03:00
Vashchuk Nikita
1896457adb added asynchrony to FileDao 2021-08-26 15:32:44 +03:00
b791586252 net6 2021-08-25 18:26:13 +03:00
Vashchuk Nikita
9f0e41b880 Merge branch 'develop' into feature/webhooks 2021-08-23 12:36:01 +03:00
e5faa90adb removed nuget warnings 2021-08-20 16:53:27 +03:00
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
diana-vahomskaya
5e22019a28 fix context delete models: dbtenant, dbtariff from BackupsContext 2021-08-12 18:18:01 +03:00
9aafaa21ea
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
2021-08-12 15:00:53 +03:00
87b7e171de ApiSystem: fix 2021-08-11 21:32:43 +03:00
643b7b66dc Optimization: removed autofac ILifetimeScope 2021-08-10 17:56:38 +03:00
39f77c5352 Backup: fix 2021-08-10 11:36:07 +03:00
546c1872a3 Added asp logging 2021-08-08 16:19:54 +03:00
672de09a90 NLog: up to 4.7.10 2021-08-08 15:55:27 +03:00
44847c1e8f backend: change TargetFramework from netstandard2.1 to net5.0 2021-08-06 18:37:22 +03:00
e86124cbdd Elastic: fixed search by content 2021-08-04 13:08:12 +03:00
diana-vahomskaya
af84cd6532 fix Context 2021-08-03 17:11:53 +03:00
diana-vahomskaya
bcfddd88d7 fix context 2021-08-02 17:49:36 +03:00
a0b34c5cc9 Webhook: fix 2021-07-31 20:12:41 +03:00
6fbdaf0d31 Calendar: post-merge fixes 2021-07-27 16:09:30 +03:00
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
913c67a818 Elastic: fixed create scope 2021-07-22 12:11:39 +03:00
8c78fa4a17 Feed: fix TenantManager 2021-07-22 11:56:52 +03:00
2d75554b0d DbContext: optimization 2021-07-15 13:07:47 +03:00
b184ad7898 Log: fix configuring 2021-07-14 11:00:59 +03:00
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
d04484a2eb backup: add api "enablerestore" 2021-06-30 16:33:49 +03:00
db7954ee31 Merge branch 'develop' into feature/backup 2021-06-30 15:54:45 +03:00
d59f9a2aa2 fixed urls 2021-06-23 20:12:50 +03:00
0e6078f9e2 Merge branch 'develop' into feature/ClearEvents
# Conflicts:
#	ASC.Web.sln
2021-06-23 17:15:56 +03:00
20d1f9a738 merge from develop 2021-06-23 16:10:46 +03:00
c18adc50dc ClearEvents: fixed log and launch 2021-06-23 15:25:17 +03:00
d8abde6d88 SSoAuth: fix buid and run 2021-06-22 19:44:09 +03:00
912501a2f4 Healthcheck: fix apisystem 2021-06-22 19:09:24 +03:00
f340924612 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2021-06-18 20:19:56 +03:00
ae17671043 Merge branch 'develop' into feature/backup
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/store/SettingsSetupStore.js
2021-06-18 18:08:38 +03:00
00cc15fbf5 Merge branch 'develop' into feature/ClearEvents 2021-06-18 12:21:54 +03:00
b6b88b2506 bug fix: exception when call "getbackuphistory" 2021-06-17 16:48:20 +03:00
01639a56cc RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +03:00
53ee0ef484 fixed warnings 2021-06-16 18:00:27 +03:00
5fcbdbd7dd added health checks 2021-06-16 16:54:36 +03:00
fc9d626bcc UrlShortenerService: fix log 2021-06-11 11:44:10 +03:00
0663ed7f16 Merge branch 'develop' into feature/backup
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2021-06-10 11:56:32 +03:00
8d80955686 Thumbnail: fix 2021-06-09 15:04:29 +03:00
6db87a3907 Backup: Fixed after merge. 2021-06-08 15:32:28 +03:00
3ef16948fc Merge branch 'develop' into feature/backup
# Conflicts:
#	common/services/ASC.Data.Backup/Core/NotifyHelper.cs
#	products/ASC.Files/Client/public/locales/en/OperationsPanel.json
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
2021-06-08 15:03:49 +03:00
c5fe4a9989 Merge branch 'develop' into feature/ClearEvents 2021-06-08 12:17:36 +03:00
SuhorukovAnton
860b682594 replace "DeleteOldEvents" in new service 2021-06-04 14:10:37 +03:00
944966b67b WebSocker: repair service 2021-06-03 16:13:22 +03:00
43de25b62a Merge branch 'develop' into feature/remove-unused-dep
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
ceb19659f3
Merge pull request #264 from ONLYOFFICE/feature/thirdparty_for_two_frameworks
Feature/thirdparty for two frameworks
2021-06-03 12:19:27 +03:00
3635905167 Backup: fixed link 2021-06-02 17:02:19 +03:00
d741e91e96 Backup: fixed notify 2021-06-02 15:00:36 +03:00
36bc5a4172 Backup: fix 2021-06-02 12:58:46 +03:00
e9c5ca41ae fix 2021-06-02 11:26:58 +03:00
SuhorukovAnton
7fd550dfe8 Merge branch 'develop' into feature/thirdparty_for_two_frameworks 2021-06-01 17:49:10 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
d3fb9f8384 fix 2021-05-31 14:08:13 +03:00
570ede7bba Merge branch 'develop' into feature/11.5.2
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
0be4e07865 SsoAuth: 2e37dcd0 2021-05-31 11:35:42 +03:00
527a650601 WebStudio: resources 2021-05-27 21:30:15 +03:00
bda786f844 WebStudio: moved from 08a01422 2021-05-27 20:13:24 +03:00
f6fbe33814 Web.Core: moved from 08a01422 2021-05-24 20:41:31 +03:00
90c67cac13 ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422 2021-05-24 13:26:13 +03:00
1b730233c9 ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
c1b7ea5a9a Storage: moved from 08a01422 2021-05-21 16:26:42 +03:00
SuhorukovAnton
02da2a15d1 websocket for only net standart 2021-05-21 13:31:28 +03:00
5d94113e23 Backup: fix 2021-05-19 11:31:50 +03:00