Commit Graph

8003 Commits

Author SHA1 Message Date
63e12f49ab merge from feature/backend-refactor 2022-03-23 14:56:18 +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
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
d3d3d4d7ff fix 2022-03-21 16:16:55 +03:00
a3f85f8e0b Merge branch 'feature/backend-refactor' into feature/update-packages 2022-03-21 14:44:30 +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
d207bcee3a added missing method 2022-03-18 13:38:40 +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
2ede5d8df7 HealthChecksUI: updated packages 2022-03-16 15:12:15 +03:00
58e1ec015b WebCore: updated packages 2022-03-16 15:09:49 +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
07bacab25d fix merge: ThrowIfNull 2022-03-15 14:12:29 +03:00
5dd68fee6c automapper instead of ToSmtpSettings 2022-03-15 14:11:19 +03:00
82daaf4029 rename model to inDto 2022-03-15 13:56:22 +03:00
82aac7c696 rename dtos 2022-03-15 13:00:41 +03:00
0019a8fd3e Merge branch 'feature/backend-refactor' into feature/web.api-refactoring 2022-03-15 12:51:15 +03:00
b9719755be Added ThrowIfNull 2022-03-09 20:15:51 +03:00
78fafb08ab Microsoft.NET.Sdk.Worker 2022-03-05 18:38:42 +03:00
ce57be48c1 Api: fixed usings 2022-03-05 11:43:36 +03:00
ac9c1bf409 Merge branch 'feature/backend-refactor' into feature/web.api-refactoring
# Conflicts:
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/GlobalUsings.cs
2022-03-05 11:41:27 +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
960c6f5449 Merge branch 'feature/backend-refactor' into feature/web.api-refactoring
# Conflicts:
#	web/ASC.Web.Api/Startup.cs
2022-03-03 14:53:23 +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
1b352c76f6 Added using AddControllers method 2022-03-03 14:04:17 +03:00
1ce9b25093 Web: Campaigns: Added more locales 2022-03-02 17:43:10 +03:00
4805ea2178 Api: fix warnings 2022-03-02 11:08:59 +03:00
b48bd37ea6 Merge branch 'feature/backend-refactor' into feature/people-refactor 2022-03-01 15:27:07 +03:00
cfbfe84d11 ImplicitUsings 2022-03-01 14:44:13 +03:00
e2c86852a0 remove whitespace 2022-03-01 14:35:29 +03:00
e18d6b8757 refactoring: asc.web.api 2022-03-01 13:58:02 +03:00
e7259608d1 rename dto 2022-03-01 13:03:56 +03:00
0ff56392f8 rename and replace models 2022-03-01 13:03:56 +03:00
c3742208cc replace controllers 2022-03-01 13:03:25 +03:00
8474cb8d37 refactor 2022-02-28 23:25:25 +03:00
c887362ea3 People: separated people controller 2022-02-28 22:23:39 +03:00
1665fe7bf6 People: refactor 2022-02-28 21:54:08 +03:00
fe15811c8f Core: refactor 2022-02-28 12:06:06 +03:00
e6f111f651 Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor 2022-02-25 20:16:00 +03:00
Dmitry Kulak
92d3a3275f Web: Studio: Homepage: Fixed greeting message styles 2022-02-25 18:57:24 +03:00
5a19f21902
Merge pull request #559 from ONLYOFFICE/feautre/asc-messaging-system-refactor
Feautre/asc messaging system refactor
2022-02-25 17:53:44 +03:00
6495da0d0b Merge branch 'feature/backend-refactor' into feature/asc-messaging-system-refactor 2022-02-25 16:34:15 +03:00
b1e5a6e28b Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor 2022-02-25 16:16:56 +03:00
2eeed99efa Web: Client: Main: Removed --vh parameter from global styles for non IOS devices 2022-02-25 11:28:23 +03:00
d40d73a3a5 GoogleAuth: fix 94 issue 2022-02-24 17:36:44 +03:00