pavelbannov 7f1d946269 Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/src/Shell.jsx # packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js # packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js # packages/client/src/pages/PortalSettings/index.js # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.People/Server/Api/UserController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Core/HttpHandlers/SsoHandler.cs		2022-09-23 16:11:23 +03:00
..
Auth	refactoring	2022-08-18 19:00:22 +03:00
Convention	added new license headers	2022-03-15 21:00:53 +03:00
Core	Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe	2022-09-19 22:59:12 +03:00
Extensions	Merge branch 'develop' into feature/stripe	2022-09-19 18:16:34 +03:00
Log	refactoring	2022-08-09 19:13:07 +03:00
Middleware	Api: payments check	2022-09-19 17:56:45 +03:00
Model	refactoring	2022-09-14 14:21:25 +03:00
Routing	Api: added payment/request	2022-09-04 18:30:32 +03:00
Security	Merge branch 'develop' into feature/room-security	2022-09-21 12:22:45 +03:00
ASC.Api.Core.csproj	nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property	2022-09-15 17:44:04 +03:00
GlobalUsings.cs	Api: payments check	2022-09-19 17:56:45 +03:00