Commit Graph

261 Commits

Author SHA1 Message Date
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
e2ccab3c97 ApiSystem: fix 2022-10-14 17:52:00 +03:00
d5d78e7550
Merge pull request #892 from ONLYOFFICE/feature/local-restore
fix local restore
2022-10-13 16:22:59 +03:00
62c6f366df fix local restore 2022-10-06 15:51:15 +03:00
6448b63318 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/constants/index.js
#	web/ASC.Web.Api/Program.cs
2022-09-19 18:16:34 +03:00
6563d4b633 nlog: refactoring service name 2022-09-16 16:41:51 +03:00
7f7d7e5200 merge from develop 2022-09-16 00:03:52 +03:00
ee27ad4437 nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property 2022-09-15 17:44:04 +03:00
bec4f11dcd Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
2022-09-15 17:16:04 +03:00
519afffa58 Merge branch 'develop' into feature/backup_remove_waste_modules 2022-09-07 11:35:40 +03:00
1a1b2c68b0 backend: refactoring start application 2022-09-06 11:29:01 +03:00
36714b4130 Api: added payment/request 2022-09-04 18:30:32 +03:00
eccca5ea5f remove waste modules 2022-08-30 14:16:41 +03:00
655cccb5c1 add "AddBaseDbContextPool" 2022-08-12 15:06:49 +03:00
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
13ad4381f7 Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
2022-05-23 18:48:23 +03:00
36855d656f remove application/x-www-form-urlencoded 2022-05-17 12:29:24 +03:00
f138ff7c79 fixed warnings 2022-04-14 22:23:57 +03:00
86456159b9 Backup: fix registration 2022-04-13 19:28:58 +03:00
e4fa21fb83 refactoring using 2022-04-01 23:07:21 +03:00
90623263e9 merge from feature/backend-refactor 2022-03-29 23:29:03 +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
cd1d3058ff DistributedTaskQueue refactoring 2022-03-25 19:15:28 +03:00
cb4d39e427 refactor 2022-03-23 19:23:25 +03:00
a857089ee6 renamed 2022-03-23 17:33:43 +03:00
079618e4e2 refactor 2022-03-23 16:08:27 +03:00
63e12f49ab merge from feature/backend-refactor 2022-03-23 14:56:18 +03:00
244e345ac6 Merge 'feature/backend-refactor' into feature/builder-extensions 2022-03-22 15:57:46 +03:00
172eaa8985
Merge pull request #589 from ONLYOFFICE/feature/update-packages
Feature/update packages
2022-03-21 22:24:11 +04:00
e9671701cb Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core 2022-03-21 17:39:01 +03:00
6e4761b8c2 Systemd package moved to shared ASC.Api.Core 2022-03-21 16:40:09 +03:00
645607aae5 default IOptionsMonitor<ILog> => ILog 2022-03-18 11:04:29 +03:00
89beecde71 replaced IOptionsMonitor<ILog> => ILog 2022-03-17 13:13:52 +03:00
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
3d50d7977b removed past license headers 2022-03-15 19:59:24 +03:00
5e2f575483 added builders extensions 2022-03-10 20:30:29 +03:00
2585c22b3b merge from feature/backend-refactor 2022-03-09 12:10:30 +03:00
99378a027e Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00
1b352c76f6 Added using AddControllers method 2022-03-03 14:04:17 +03:00
a976b69fc8 backup: refacroting. added new Integration event. 2022-03-02 18:25:28 +03:00
609427bf20 merge from feature/backend-refactor 2022-03-01 15:57:49 +03:00
f07aa0a183 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	config/nginx/onlyoffice.conf
#	packages/asc-web-common/constants/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2022-02-25 16:05:43 +03:00
b5b8b1edf0 added support scheduler backup request handling 2022-02-24 19:53:49 +03:00
7e67e9a41c merge from develop 2022-02-24 17:33:02 +03:00