Commit Graph

2122 Commits

Author SHA1 Message Date
1b8be6f95c fix 2022-04-07 14:41:37 +03:00
f9da8e4026 iprestrictions
fix Verify
add check enable
add api method
2022-04-07 13:19:30 +03:00
a502c4ee52 IPRestrictionsRepository: fixed saving data 2022-04-07 08:41:58 +03:00
7d1ccbdc15 remove distributed_task_cache.proto from projects 2022-04-05 13:14:44 +03:00
45d2a31d03 Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
#	public/locales/de/Common.json
2022-04-04 19:34:51 +03:00
c6008751b1 removed FactoryProgressItem 2022-04-02 15:34:23 +03:00
ba4984496c remove unused proto file 2022-04-02 14:59:42 +03:00
e4fa21fb83 refactoring using 2022-04-01 23:07:21 +03:00
33eac101fc fixed usings 2022-04-01 22:49:12 +03:00
b41682efaa refactoring 2022-04-01 19:17:21 +03:00
2f06b0a013 EventBus: refactoring 2022-04-01 19:12:53 +03:00
abce571695 backup: refactoring 2022-04-01 17:37:21 +03:00
e04867b315 fix 2022-04-01 17:20:00 +03:00
e524ca03d1 Notify: removed scope class 2022-04-01 17:17:24 +03:00
d0c36facbb DistributedTaskQueue: removed CancelTask method. Add delete orphan cache items feature 2022-04-01 16:54:21 +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
49efbc9780 refactoring: remove IServiceProvider 2022-03-31 20:32:46 +03:00
90623263e9 merge from feature/backend-refactor 2022-03-29 23:29:03 +03:00
d4a8f10891 added comment 2022-03-29 16:52:08 +03:00
df8b7182b6 merge feature/backend-refactor 2022-03-29 16:12:36 +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
cfad6e7ee7 removed IServiceProvider 2022-03-28 19:51:16 +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
067fb96060 DistributedTaskQueue: refactoring 2022-03-25 21:00:43 +03:00
abae61f2db IDE1006 2022-03-25 19:26:06 +03:00
cd1d3058ff DistributedTaskQueue refactoring 2022-03-25 19:15:28 +03:00
100e581f1c IDE1006 2022-03-25 17:54:34 +03:00
6fe2178e3e Notify: refactoring 2022-03-25 17:51:03 +03:00
e94c4b5679 Storage: remove IServiceProvider 2022-03-25 12:23:28 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
c7712fd7dc Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-24 18:01:09 +03:00
1ee814a2ef Merge branch 'feature/backend-refactor' into feature/files-controller-refactoring
# Conflicts:
#	common/ASC.Api.Core/GlobalUsings.cs
#	products/ASC.Files/Server/GlobalUsings.cs
2022-03-24 17:11:33 +03:00
959cac6243 added missed service 2022-03-24 16:00:28 +03:00
b8380c1353 refactoring 2022-03-24 14:57:39 +03:00
66ccce8eb5 Settings: refactoring 2022-03-24 12:35:00 +03:00
cb4d39e427 refactor 2022-03-23 19:23:25 +03:00
c85f5385f9 Api.Core: added hostbuilder extension method 2022-03-23 19:23:12 +03:00
9c5844fb0d Api.Core: removed unnecessary 2022-03-23 19:22:44 +03:00
49d3094dca Api.Core: removed unnecessary 2022-03-23 19:22:25 +03:00
a857089ee6 renamed 2022-03-23 17:33:43 +03:00
079618e4e2 refactor 2022-03-23 16:08:27 +03:00
85eca545b6 Api.Core: added builder methods 2022-03-23 16:07:26 +03:00
63e12f49ab merge from feature/backend-refactor 2022-03-23 14:56:18 +03:00
0c72f8bcb3 AmiPublicDnsSyncService, StorageSettings: remove IServiceProvider 2022-03-23 14:28:52 +03:00
22c6c1d156 Api: remove service locator 2022-03-22 18:44:10 +03:00
244e345ac6 Merge 'feature/backend-refactor' into feature/builder-extensions 2022-03-22 15:57:46 +03:00
f4c75f91f4 refactor 2022-03-22 15:46:13 +03:00
4e78af53f9 refactoring DistributedTaskQueue 2022-03-22 15:10:05 +03:00
65b6bf9141 removed base extenshion 2022-03-22 13:48:50 +03:00
bca173a91c Files: added license header 2022-03-22 13:36:38 +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
b4c44d1b09 Merge branch 'feature/backend-refactor' into feature/files-controller-refactor 2022-03-21 19:03:57 +03:00
cf8c1ba3ff Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-21 18:52:09 +03:00
ae490c3290 System.Linq.Async package moved to share ASC.Core.Common 2022-03-21 18:32:04 +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
8381b3e9c6 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-21 17:15:55 +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
5bcc792132 Merge branch 'feature/license-refactor' of github.com:ONLYOFFICE/AppServer into feature/license-refactor 2022-03-21 10:37:02 +03:00
da31770f18 added deleted license headers 2022-03-21 10:36:07 +03:00
eec0545987 fixed build. 2022-03-20 18:24:26 +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
07c618b23d update packages 2022-03-20 16:44:49 +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
61f4f33990 fixed DistributedTask 2022-03-19 18:48:51 +03:00
1c74b5702b Files:fix notify 2022-03-19 18:05:26 +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
ff79769307 Files: improvements for automapping 2022-03-18 11:51:33 +03:00
88e2f01913 merge from feature/backend-refactor 2022-03-18 11:12:16 +03:00
645607aae5 default IOptionsMonitor<ILog> => ILog 2022-03-18 11:04:29 +03:00
389bb3024f added support ILog<T> interface 2022-03-17 23:09:45 +03:00
568f427957 IDE1006 2022-03-17 19:57:02 +03:00
6b3f9a71ad IDE0065 2022-03-17 18:23:19 +03:00
11004ab61c IDE0161 2022-03-17 18:13:38 +03:00
6a09cf47e9 IDE0044 2022-03-17 18:07:17 +03:00
80eb1c8257 IDE0011 2022-03-17 18:01:39 +03:00
69950c9d8c IDE0007 2022-03-17 17:55:19 +03:00
717456d71d CA1805 2022-03-17 17:33:16 +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
21f85e7260 logger refactoring. added resolver ILog/IOptionsMonitor<ILog> 2022-03-17 09:55:08 +03:00
fb675dd307 updated packages 2022-03-16 16:37:56 +03:00
dbb49a2ce3 ElasticSearch: updated packages 2022-03-16 15:23:50 +03:00
fef9f76ad6 WebhooksCore: updated packages 2022-03-16 15:15:56 +03:00
6ca867f7aa VoipService: updated packages 2022-03-16 15:08:06 +03:00
dc238d96f3 IPSecurity: updated packages 2022-03-16 14:56:32 +03:00
701d6a7a03 FederatedLogin: update packages 2022-03-16 14:45:28 +03:00
2fe617f811 Storage: updated packages 2022-03-16 14:29:24 +03:00