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
..
i18next-http-backend	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
axiosClient.js	Web: Added functionality for the expired period.	2022-09-01 17:28:08 +03:00
combineUrl.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
dataUrlToFile.js	Common: Utils: init data url to file	2022-09-21 03:39:38 +03:00
encoder.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
firebase.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
index.ts	Merge branch 'develop' into feature/stripe	2022-09-15 17:16:04 +03:00
loginUtils.ts	Web: Common: utils: added types for login func	2022-08-22 15:07:11 +03:00
minifyJson.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
socket.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
tryRedirectTo.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
wdyr.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
withLayoutSize.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00