Commit Graph

2019 Commits

Author SHA1 Message Date
68da688519 refactroring: web.hooks.service: WebApplication 2022-02-11 14:22:14 +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
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
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
9081371e4a FederatedLogin: property and fields refactor 2022-02-10 18:50:15 +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
053da2933d added EventBus and EventBusRabbitMQ from eShoponContainers template 2022-02-10 17:42:21 +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
9025dcc0a3 Merge branch 'develop' into feature/backend-refactor 2022-02-10 16:55:19 +03:00
47eabc2610 Merge branch 'feature/backend-refactor' into feature/refactoring-webhooks.core 2022-02-10 16:46:26 +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
77e14da218 fixed tests 2022-02-10 16:24:55 +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
359d5efe8d Storage: removed 's' prefix 2022-02-10 15:34:26 +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
402dedb49b ElasticSearch: private properties replaced by private fileds, used keyword readonly 2022-02-10 14:56:13 +03:00
4fa4411bf5 Reassings: IServiceProvider replaced by IServiceScopeFactory 2022-02-10 14:28:03 +03:00
cc8b1ca7c5 Storage: used file-scoped namespaces 2022-02-10 14:24:16 +03:00
41832fbd73 Storage: IServiceProvider replaced by IServiceScopeFactory 2022-02-10 14:19:51 +03:00
e1116276eb backup: fix GetTasks 2022-02-10 14:12:28 +03:00
9156b40eb0 Storage: private properties replaced by private fields 2022-02-10 14:08:44 +03:00
7a12c6cb13 Storage: add braces 2022-02-10 14:06:37 +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
460d054156 Storage: reordered methods according to access modifier, cosmetic changes 2022-02-10 13:43:28 +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
73f82b1f2a backup: bugfix: link = null 2022-02-10 13:05:36 +03:00
feb147590f Storage: privare properties replaced by private fields, used keyword readonly 2022-02-10 12:36:42 +03:00
8866ec8496 Reassigns: cosmetic changes 2022-02-10 11:44:59 +03:00
48ca316b56 Reassigns: add braces 2022-02-10 11:42:03 +03:00
dfce1fea42 Reassigns: private property replaced by private fields, used readoonly keyword 2022-02-10 11:38:35 +03:00
920d999052 backup: add "completed" in end restore and transfer 2022-02-10 11:02:28 +03:00
1acf512f87 backup: add in startup backupFileUpload.ashx 2022-02-10 11:01:51 +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
b3acf9ac9a BackupCore: private properties replaced by with private fields, used keyword readonly 2022-02-09 19:29:19 +03:00
6f9d9e4617 backup: bugfix 2022-02-09 18:39:44 +03:00
dd51f8ac36 BackupCore: removed empty lines 2022-02-09 18:27:14 +03:00
6510927b20 backup: add api method enableAutoBackup 2022-02-09 17:39:02 +03:00
f354775332 Merge branch 'develop' into feature/backup 2022-02-09 13:42:11 +03:00
147377ab65 bugfix: crash when string == null 2022-02-09 13:32:01 +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
9131e0c5d5 Socket.IO: Downgrade axios version (issue: Provided config url is not valid) 2022-02-09 11:08:57 +03:00
5528159f13 SocketIO: Added axios 2022-02-08 17:19:06 +03:00
93506010b8 ASC.AuditTrail: refactoring 2022-02-08 15:00:07 +03:00
6314251a59 Common: add braces 2022-02-08 14:20:50 +03:00
3bf8c338f6 Common: delete unnecessary scopefactory 2022-02-08 14:20:37 +03:00
2e3837fc7d Common: add braces 2022-02-08 14:07:28 +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
3c4cf0f62e resolve property name for mapping 2022-02-08 03:04:49 +03:00
09e46f52d5 resolve property name for mapping 2022-02-08 03:04:33 +03:00
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
9f5a1f3ba7 Merge branch 'develop' into feature/analizators 2022-02-07 19:28:23 +03:00
179c8ddb84 ApiCore: single line expressions replaced by expressions with braces 2022-02-07 19:03:16 +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
9e583e60cb add AuditEvents dbset and model configuration 2022-02-07 17:06:25 +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
a913fa4589 Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor 2022-02-04 23:16:18 +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
e16d75839a Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop 2022-02-04 21:00:05 +03:00
eed733b83c fixed user photo thumbnail generator 2022-02-04 20:59:58 +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
6d841257f1 Common: add IServiceScopeFactory 2022-02-04 12:56:15 +03:00
9f561702df Coomon: static private fields renamed as per microsoft convention 2022-02-04 12:46:24 +03:00
8c203b07c2 rename intermediate model 2022-02-04 12:18:22 +03:00
07bb12ac43 rename db model 2022-02-04 12:16:04 +03:00
1858db9132 rename db model 2022-02-04 12:15:54 +03:00
7fddbbcd93 ApiCore: rename private static fileds by microsoft convention 2022-02-04 11:34:32 +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
4097f72e94 Common: used file-scope namespaces, remove unnecessary 2022-02-03 18:26:44 +03:00
973624c30b Merge branch 'feature/refactoring' into feature/asc-common-refactor 2022-02-03 17:30:13 +03:00
2f0fce66de cosmetic 2022-02-03 17:18:58 +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
687c2235fb refactoring: webhooks.core: file-scope namespace 2022-02-03 16:43:37 +03:00
a04f7824fc refactoring: webhooks.service: file-scope namespace 2022-02-03 16:41:09 +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
655ae73a65 Web: Files: Fix refresh last page on delete all items (+ socket refactoring) 2022-02-03 14:57:23 +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
0cc387a4b8 rename LoginEvents to LoginEvent 2022-02-03 14:15:42 +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
0d478e43d0 Web: Files: Rewrite socket.io upload files process to client side 2022-02-03 10:44:03 +03:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
df26903973 refactoring: webhooks.core 2022-02-02 17:47:35 +03:00
2ff2e64f4d refactoring: asc.webhooks.service 2022-02-02 17:23:15 +03:00
c2d3d10ec5 refactoring : bugfix 2022-02-02 13:09:37 +03:00
f6620e34ae Merge branch 'develop' into feature/refactoring 2022-02-02 13:09:25 +03:00
084e3a8d30 ApiCore: IServiceProvider replaced by IServiceScopeFactory 2022-02-01 20:07:26 +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
98ca84b1dc Web: Socket: Removed support of "create/delete folders" operations (too many issues on client side) 2022-02-01 18:07:23 +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
ad78c46495 Api: priveate properties replaced with fields, used single line expressions, cosmetic 2022-01-31 19:36:51 +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
Vashchuk Nikita
2901d837a1 async methods for httpClient in ASC.Web 2022-01-31 17:35:36 +03:00
4f0de0b643 refactoring: bugfix 2022-01-31 16:59:38 +03:00
5b22e2c7bd refactoring: bugfix 2022-01-31 16:57:41 +03:00
7ab885b2e2 refactoring: bugfix 2022-01-31 16:56:30 +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
655c70948d refactoring: add globalusings: webhooks.core 2022-01-31 11:35:57 +03:00
8795f5b7f0 refactoring: add globalusings: voipService 2022-01-30 01:47:06 +03:00
5e2c2fc2e0 refactoring: add globalusings: urlShortener 2022-01-30 01:40:50 +03:00
c3086a4d54 refactoring: add globalusings: textile 2022-01-30 01:34:56 +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
646356fed5 refactoring: add globalusings: notify.textile 2022-01-30 01:00:02 +03:00
5c14db512a refactoring: add globalusings: notify 2022-01-30 00:53:20 +03:00
8ea4833858 refactoring: add globalusings: messagingSystem 2022-01-30 00:48:12 +03:00
45ed0db3f7 refactoring: add globalusings: IPSecurity 2022-01-30 00:41:43 +03:00
b7f0ffc9d2 cache: fixed memory cache notify 2022-01-27 15:35:11 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
36b4b64f3a Web: Socket: Added new methods CreateFolder, DeleteFolder 2022-01-27 11:42:57 +03:00
0628f4044a refactoring: bugfix: apiCore 2022-01-26 16:04:22 +03:00
0ee3ed2dd7 refactoring: add globalUsings: feed.Aggregator 2022-01-26 15:39:59 +03:00
cac7680343 refactoring: add globalUsings: feed 2022-01-26 15:38:14 +03:00
e6389ebd5e refactoring: add globalUsings: FederatedLogin 2022-01-26 15:34:57 +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
7dfdde380d refactoring: add globalUsing: data.storage 2022-01-26 14:33:32 +03:00
41eae8ac7a refactoring: add globalUsing: reassings 2022-01-26 14:19:45 +03:00
e4eaf5c522 refactoring: add globalUsing: backup.core 2022-01-26 14:17:12 +03:00
9bccfa3ade refactoring: add globalUsing: core.common 2022-01-26 13:43:08 +03:00
aed1bf7e56 refactoring: add globalUsing: common 2022-01-26 13:42:30 +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
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
Vashchuk Nikita
3e03f820bb async IDataStore 2022-01-25 12:29:11 +03:00
403704c9c1 Web: Files: Socket: Added new data parameter for "s:modify-folder" 2022-01-25 12:03:15 +03:00
7f31d3f19f
Merge pull request #494 from ONLYOFFICE/feature/refactoring-one-dbcontext-in-dao
used one dbcontext per service (per DAO). fixed error: System.Invalid…
2022-01-25 11:14:23 +03:00
445f03097d Fix content-type header 2022-01-24 22:44:18 +03:00
eb75b0b32a Web: Files: Added opportunity to react on modify-folder with socket 2022-01-24 20:43:24 +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
339614f1ee kafka: used only legal chars in topic name 2022-01-24 13:34:44 +03:00
0fcac47686 analizators/s3604 2022-01-24 13:01:19 +03:00
fb3a61d0d2 analizators/s3442 2022-01-24 12:57:01 +03:00
9292ba4eee analizators/s2589 2022-01-24 12:28:00 +03:00
9ad899e72a analizators/s1264 2022-01-24 12:27:43 +03:00
f3cc581047 analizators/bugfix 2022-01-24 11:41:44 +03:00
8d0324ee2a analizators/s2326 2022-01-21 16:59:17 +03:00
d86085d9f5 analizators/s2292 2022-01-21 16:57:22 +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
510bd4d731 analizators/s2219 2022-01-21 16:42:02 +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
cc53cd53e8 Analizators/s1939 2022-01-21 16:40:08 +03:00
f3d8b8d17a analizators/s1854 2022-01-21 16:36:36 +03:00
ca658e4b02 analizators/s1905 2022-01-21 16:23:25 +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
7c60d02bb4 analizators/s1643 2022-01-21 16:12:53 +03:00
3d635a4824 analizators/1643 2022-01-21 16:12:05 +03:00
2029c34f9c analizators/s1121 2022-01-21 14:02:17 +03:00
cd12b41cc6 analizators/s1125 2022-01-21 14:01:52 +03:00
df6fdd76cf
Merge branch 'develop' into component-tooltips 2022-01-21 13:57:21 +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
775f05b32c
Merge branch 'develop' into component-tooltips 2022-01-21 12:56:08 +03:00
32c398c044 Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
ae53ed0d62 analizators/s1117 2022-01-21 12:27:39 +03:00
728c1b896e analizators/s1104 2022-01-21 12:19:57 +03:00
34441d6335 Web: Moved some translations from Files to COMMON for asc-web-components 2022-01-21 11:49:16 +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
7e919c9f83 Web: Tests: Fix translations test issues 2022-01-20 22:06:33 +03:00
4fdbef8781 Web: Tests: Fix UselessTranslationKeysTest issues on asc-web-components js-files 2022-01-20 18:22:20 +03:00
5f78b37e25 analizators/U2U1000 2022-01-20 12:28:48 +03:00
f956ad22fa analizators/s2223 2022-01-20 11:53:38 +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
edd627ee23 analizators/s2696 2022-01-19 18:33:27 +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
25050cb5fd analizators/s2223 2022-01-19 17:16:15 +03:00
547b78b72f analizators/2178 2022-01-19 16:36:03 +03:00
e046f6f8df analizators/s1006 2022-01-19 16:14:51 +03:00
85f1660b39 analizators/U2U1203 2022-01-19 13:46:21 +03:00
20b60958a8 analizators/U2U1022 2022-01-19 13:24:11 +03:00
a30b276711 analizators/U2U1015 2022-01-19 13:00:16 +03:00
fbb50e676e analizators/U2U1202 2022-01-19 12:51:30 +03:00
4b211c0b80 analizators/U2U1203 2022-01-19 12:14:50 +03:00
1403afbc16 analizators/U2U1209 2022-01-19 11:59:14 +03:00
Vashchuk Nikita
5b9668c14f ILinkDao, fix 2022-01-18 19:50:31 +03:00
07ebea5db8 backup: refactoring 2022-01-18 19:04:35 +03:00
78047d3b93 analizators/U2U1210 2022-01-18 18:29:46 +03:00
6c5792583a analizators/U2U1209 2022-01-18 17:43:46 +03:00
f1f7a82b39 analizators/U2U1208 2022-01-18 17:00:48 +03:00
acd5b83026 analiztators/U2U1206 2022-01-18 17:00:28 +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
b9884e6b81 Analizators/U2U1107 2022-01-14 16:32:06 +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
1464d54283 fixed tests 2022-01-13 18:42:58 +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
cacb889ee2 analizators/U2U1100 2022-01-13 15:04:28 +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
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +03:00
6961f38593 analizators/U2U1023 2022-01-12 15:34:58 +03:00
3ff7aeca3b analizators/U2U1015 2022-01-12 13:27:06 +03:00
5bd347a775 refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null 2022-01-12 12:58:07 +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
c43f244282 analizators/U2U1003 2022-01-10 18:13:30 +03:00
a671732da5 analizators/SCS0005 2022-01-10 12:24:21 +03:00
d7a1f73c48 analizators/s4035 2022-01-10 11:45:40 +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
a7dc8c7dfd sync CommunityServer and AppServer cache via redis 2021-12-30 18:09:20 +03:00
5c97e7ed63 Web: Socket.IO: Changed logger settings 2021-12-30 15:55:00 +03:00
f8035967b5 Web: Socket: Changed room settings 2021-12-30 15:54:23 +03:00
6273539207 analizators/s2583 2021-12-30 14:03:50 +03:00
8f53895e3d analizators/s2201 2021-12-30 14:03:05 +03:00
3d33fecf77 analizators/s2259 2021-12-30 14:00:03 +03:00
555ca30c99 analizators/s2259 2021-12-30 13:23:01 +03:00
e2857e87f5 analizators/s2997 2021-12-30 12:52:44 +03:00
2a82bc884e analizators/s2583 2021-12-30 12:44:25 +03:00
abd72b9e0d analizators/s3903 2021-12-29 18:49:02 +03:00
973f8a41b9 analizators/s2259 2021-12-29 18:47:35 +03:00
632783b130 analizators/s4275 2021-12-29 18:12:39 +03:00
facc97b01c analizators/s4423 2021-12-29 17:41:02 +03:00
a40b06648a analizators/s3963 2021-12-28 19:01:12 +03:00
5e91416c53 analizators/s4035 2021-12-28 18:44:54 +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
6cd3a7bfe1 analizators/s4201 2021-12-28 17:03:05 +03:00
28e1c652d9 analizators/s4456 2021-12-28 16:39:44 +03:00
c3321206bd analizators/s4487 2021-12-28 16:08:11 +03:00
0a786bbfa3 analizators/s4830 2021-12-28 15:00:48 +03:00
febf172875 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/avatar-editor/index.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/main-button/index.js
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Server/DocStore
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Login/package.json
2021-12-28 13:35:02 +03:00
657961c334 Web: Socket: Implemented "stop editing" + refactoring 2021-12-24 20:58:38 +03:00
eb02c96697 microsoft recomended store the System.Guid type as string type in protobuf format 2021-12-23 18:29:35 +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
Vashchuk Nikita
c85bd19cf7 removed sync methods from Dao 2021-12-23 14:46:21 +03:00
33026385e2 Web: Tests: Added new excludes to spellcheck-excludes.json 2021-12-23 11:36:59 +03:00
a785eb2692 Web: Tests: Added spellcheck-excludes.json and opportunity to skip some spell check issues 2021-12-22 18:17:22 +03:00
05f5358fb9 Web: Tests: Fix some false alarms on SpellCheckTest 2021-12-21 20:18:37 +03:00
33f9485230 Web: Tests: Skip some hashes for DublicatesFilesByMD5HashTest 2021-12-21 17:05:24 +03:00
4274e3a581 Web: Tests:
+ Added new SpellCheckTest() and submodule (common/Tests/Frontend.Translations.Tests/dictionaries)
+ Split tests on categories FastRunning|LongRunning
+ Added new build/run.translations.spellcheck.test.bat
2021-12-21 16:59:04 +03:00
649e1b420a Web: Tests: Added Md5Hash property 2021-12-21 16:12:37 +03:00
cb14095a51 Web: Socket.IO: Update yarn.lock 2021-12-21 13:37:03 +03:00
dfb8f79374 Web: Socket.IO: Added support of "authorization" header 2021-12-21 13:36:37 +03:00
62ffa5889b Web: Socket.IO: added winston logger, remover unused code, updated packages 2021-12-20 17:49:15 +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
70bfe70563 Merge branch 'develop' into feature/optimization 2021-12-16 18:14:54 +03:00
b2cb05b983 Web: Socket: updated redis packages 2021-12-16 17:18:09 +03:00
46386a6f6c Web: Tests: Added new DublicatesFilesByMD5HashTest() test 2021-12-16 15:53:58 +03:00
fb3bfba1bd Files: optimization 2021-12-16 15:49:35 +03:00
9736c9ded8 Web: Socket: added redis, fixed editorCreateCopy 2021-12-16 15:28:01 +03:00
bb31f7d574 Web: Files: refactoring socket code 2021-12-15 12:32:38 +03:00
04ccfb2caa Webhooks: fix empty result 2021-12-14 15:51:03 +03:00
62e4dbbb40 Web: Socket: removed request, co libs, added axios 2021-12-14 12:56:01 +03:00
17d2c04533 fix Bug 53455 2021-12-13 19:23:05 +03:00
b42fd9c03f Merge branch 'develop' into feature/reworked-user-service 2021-12-13 17:40:40 +03:00
7bab795feb Web: Tests: Added new TranslationsEncodingTest() 2021-12-13 13:18:13 +03:00
d230a40e8e Web: Socket: fixed cookies 2021-12-10 14:20:51 +03:00
0771a54c47 Optimization 2021-12-09 20:23:06 +03:00
9aff9d8f30 Web: Socket: added tests, added getting port from config 2021-12-09 17:38:57 +03:00
ed41326acc Web: socket-io, first version 2021-12-09 15:50:50 +03:00