Commit Graph

17769 Commits

Author SHA1 Message Date
5420ceff44 Web: Deleted useless files. 2022-03-21 11:52:26 +03:00
8a7641798b Web: Backup: Added organization name from settings. 2022-03-21 11:15:51 +03:00
73033f996d Web: Files: Added missing translation. 2022-03-21 10:49:32 +03:00
f54b0d0f25 Web: files: Deleted useless code. 2022-03-21 10:45:55 +03:00
4e4bea4d02 Web: Components: Deleted useless classname. 2022-03-21 10:44:52 +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
3f957337b8 WEb: Common: Deleted useless code. 2022-03-21 10:14:26 +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
37e0a4715c fix tests 2022-03-18 18:44:00 +03:00
9ca8191ddd Web: ManualBackup: Added import. 2022-03-18 15:58:30 +03:00
4a959f3667 Web: Backup: Fixed a bug of false disable of third-party resources. 2022-03-18 15:52:25 +03:00
786fdb761d Web: PreparationPortal: Renamed file. 2022-03-18 15:35:58 +03:00
e99b63c443 Web: PreparationPortal: Fixed position of image on mobile. 2022-03-18 15:34:13 +03:00
c61df3290c Web: AutoBackup: Fixed dropdown height for time and count of copies. 2022-03-18 15:18:14 +03:00
c22bc6d809 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2022-03-18 15:08:28 +03:00
a53456691d Web: Backup: Fixed double of toastr when create backup. 2022-03-18 15:08:17 +03:00
d207bcee3a added missing method 2022-03-18 13:38:40 +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
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
fe9962167e CRM: fix build 2022-03-16 17:19:34 +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
2ede5d8df7 HealthChecksUI: updated packages 2022-03-16 15:12:15 +03:00
58e1ec015b WebCore: updated packages 2022-03-16 15:09:49 +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
427c7ea2d5 BackupCore: updated packeges 2022-03-16 14:16:55 +03:00
e6595fdcf5 CoreCommon: updated packages 2022-03-16 14:14:25 +03:00
2d42d75a6a Files: fix 2022-03-16 13:45:03 +03:00
8c9db226ac Common: updated packages 2022-03-16 13:44:47 +03:00
8b07acbd03 AuditTrail: fix 2022-03-16 13:04:13 +03:00
8759710552 AuditTrail: updated packages 2022-03-16 13:04:04 +03:00
cb6b77e216 ApiCore: updated packages 2022-03-16 12:59:04 +03:00
cbbe1dd12b Web: Components: Fixed file icon going beyond input. (for iOS, macOS) 2022-03-16 12:17:04 +03:00