Commit Graph

5611 Commits

Author SHA1 Message Date
9fbb192fd3 Test: fix packages 2022-03-24 17:00:02 +03:00
cb4d39e427 refactor 2022-03-23 19:23:25 +03:00
a13d1ccf3b Merge branch 'develop' into feature/backup 2022-03-23 18:12:01 +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
cee4ca3a4e Files: fix recent 2022-03-23 14:53:49 +03:00
64cd23a7bf Files: fix download as 2022-03-22 16:54:54 +03:00
244e345ac6 Merge 'feature/backend-refactor' into feature/builder-extensions 2022-03-22 15:57:46 +03:00
2be8ecfb22 Files: added license header 2022-03-22 13:34:46 +03:00
ee8b6eafc1 Web: Files: deleted useless folders after merge. 2022-03-22 13:22:51 +03:00
251f149eb6 Web: Revert withoutBodyScroll after merge. 2022-03-22 13:19:35 +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
a6f111463b refactor 2022-03-21 18:11:26 +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
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
a72106dfae Web: Files: Deleted useless file after merge. 2022-03-21 11:55:38 +03:00
5420ceff44 Web: Deleted useless files. 2022-03-21 11:52:26 +03:00
73033f996d Web: Files: Added missing translation. 2022-03-21 10:49:32 +03:00
679aecbc76 Merge branch 'feature/backend-refactor' into feature/license-refactor
# Conflicts:
#	common/services/ASC.Webhooks.Service/WebhookSender.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
2022-03-20 16:47:31 +03:00
868492b562 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Billing/BillingClient.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Notify/Context.cs
#	common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
#	common/ASC.FederatedLogin/Helpers/RequestHelper.cs
#	common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/WebhookSender.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Helpers/DocuSignHelper.cs
#	products/ASC.Files/Core/Helpers/EasyBibHelper.cs
#	products/ASC.Files/Core/Helpers/WordpressHelper.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
2022-03-19 22:16:03 +03:00
1c74b5702b Files:fix notify 2022-03-19 18:05:26 +03:00
21a8c0e0fc removed httpclient ctor 2022-03-18 22:34:01 +03:00
37e0a4715c fix tests 2022-03-18 18:44:00 +03:00
ff79769307 Files: improvements for automapping 2022-03-18 11:51:33 +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
38d685c4ce
Merge branch 'develop' into feature/backup 2022-03-17 11:03:09 +03:00
fb675dd307 updated packages 2022-03-16 16:37:56 +03:00
2d42d75a6a Files: fix 2022-03-16 13:45:03 +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
7bb1f0c755 Files: added DownloadModelBinder 2022-03-15 16:47:37 +03:00
209d7bd750 Web: Files: Deleted unused code. 2022-03-15 12:29:09 +03:00
5c820fdcd5 Index: create index only in service 2022-03-14 21:47:34 +03:00
882507496d added new routing mechanism 2022-03-14 13:57:59 +03:00
af772531ad added extension method for services 2022-03-14 12:07:37 +03:00
5e2f575483 added builders extensions 2022-03-10 20:30:29 +03:00
dc273d4a21 Web: Files: Changed translations keys. 2022-03-10 17:52:26 +03:00
d793b099ff WEb: Files: Changed translation keys. 2022-03-10 17:45:13 +03:00
afb0510fd6 Web: Moved translations to Common file (az). 2022-03-10 17:30:30 +03:00
1cb0345483 Web: Moved translations to Common file (bg). 2022-03-10 17:26:47 +03:00
ca45ca77d7 Web: Moved translations to Common file (cs). 2022-03-10 17:25:20 +03:00
685e7e0193 Web: Moved translations to Common file (de). 2022-03-10 17:18:26 +03:00
9a4715fad7 Web: Moved translations to Common file (el). 2022-03-10 17:10:09 +03:00
5d4a54e1ce Web: Moved translations to Common file (en). 2022-03-10 16:57:56 +03:00
a403bdbf03 Web: Moved translations to Common file (es). 2022-03-10 16:56:15 +03:00
7b5f653ead Web: Moved translations to Common file (fi). 2022-03-10 16:54:21 +03:00
a94be67b16 Web: Moved translations to Common file (fr). 2022-03-10 16:52:35 +03:00
84f1a05ba3 Web: Moved translations to Common file (it). 2022-03-10 16:50:04 +03:00
9467226e09 Web: Moved translations to Common file (ja). 2022-03-10 16:48:45 +03:00
05da08892d Web: Moved translations to Common file (ko). 2022-03-10 16:47:13 +03:00
e15108a62c Web: Moved translations to Common file (lo). 2022-03-10 16:45:08 +03:00
0efd8d1126 Web: Moved translations to Common file (lv). 2022-03-10 16:43:34 +03:00
d2e1f04d8a Web: Moved translations to Common file (nl). 2022-03-10 16:41:37 +03:00
56b4eece3d Web: Moved translations to Common file (pl). 2022-03-10 16:39:54 +03:00
4eae2cdb3c Web: Moved translations to Common file (pt). 2022-03-10 16:38:25 +03:00
34e1f835fe Web: Moved translations to Common file (pt-BR). 2022-03-10 16:36:25 +03:00
8ba131d52d Web: Moved translations to Common file (ro). 2022-03-10 16:33:31 +03:00
0c9713c65b Web: Moved translations to Common file (sk). 2022-03-10 16:31:02 +03:00
bff2518bf9 Web: Moved translations to Common file (sl). 2022-03-10 16:28:38 +03:00
500945a6da Web: Moved translations to Common file (tr). 2022-03-10 16:26:11 +03:00
e663d59aeb Web: Moved translations to Common file (vi). 2022-03-10 16:25:27 +03:00
297394f359 Web: Moved translations to Common file (uk). 2022-03-10 16:24:18 +03:00
8080e416df Web: Moved translations to Common file (zh-CN). 2022-03-10 16:23:06 +03:00
7bca87c34d Web: Moved translations to the Common (ru). 2022-03-10 16:21:24 +03:00
ad68b7dc60 Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-10 14:15:49 +03:00
c9f8064224 Merge branch 'feature/backend-refactor' into feature/files-refactor 2022-03-10 12:31:05 +03:00
26066ccb7f Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-10 12:19:18 +03:00
64dfd61858 Merge branch 'develop' into feature/backup 2022-03-10 12:15:26 +03:00
b9719755be Added ThrowIfNull 2022-03-09 20:15:51 +03:00
061a2f7365 Files: added mapping 2022-03-09 18:12:23 +03:00
13ff29413d FIles: added mapping 2022-03-09 15:07:57 +03:00
6dc335f10b Files: added file mapping 2022-03-09 12:18:33 +03:00
b1664fd2e5 Files: renamed helper 2022-03-08 20:43:47 +03:00
358ea18086 Files: divided files controller helper 2022-03-08 20:37:23 +03:00
78fafb08ab Microsoft.NET.Sdk.Worker 2022-03-05 18:38:42 +03:00
e58d3324f2 Files: renamed api parameters 2022-03-05 17:41:47 +03:00
1a9ced4901 Web: Files: fixed context menu opening 2022-03-05 17:36:04 +03:00
d035deba31 Merge branch 'feature/backend-refactor' into feature/files-refactor
# Conflicts:
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Server/GlobalUsings.cs
2022-03-05 11:50:42 +03:00
475269ee84 Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
#	products/ASC.Files/Core/Model/FileEntryWrapper.cs
#	products/ASC.Files/Core/Model/FileShareWrapper.cs
#	products/ASC.Files/Core/Model/FileWrapper.cs
#	products/ASC.Files/Core/Model/FolderWrapper.cs
#	products/ASC.People/Server/GlobalUsings.cs
2022-03-05 11:27:58 +03:00
99378a027e Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00
77144d6f3c added mapping 2022-03-05 10:28:50 +03:00
da73ff523c Files: resolve names for mapping, add mapping 2022-03-04 16:40:28 +03:00
1d398d47f6 Merge branch 'feature/backend-refactor' into feature/files-refactor 2022-03-04 13:25:12 +03:00
a4891f136a
Merge pull request #570 from ONLYOFFICE/feature/asc-files-core-refactor
Feature/asc files core refactor
2022-03-03 23:12:19 +03:00
3d2d6b12e6 Files: removed unnecessary usings 2022-03-03 21:19:52 +03:00
f82d9ffaf8 Files: used WebApplicationBuilder, implicit usings 2022-03-03 21:15:48 +03:00
99f0f702f8 Files: refactor 2022-03-03 21:01:34 +03:00
ee027f8508 Files: rremoved unnecessary 2022-03-03 20:55:16 +03:00
c827c628c5 Files: separated controllers 2022-03-03 20:33:11 +03:00
418ca246c8 Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
#	products/ASC.People/Server/Startup.cs
2022-03-03 14:35:22 +03:00
4e08a6f2cf Files: fix 2022-03-03 14:25:09 +03:00