Commit Graph

114 Commits

Author SHA1 Message Date
476ed95664 Web: Information from the new api was used. 2022-09-05 13:17:44 +03:00
7b623c4e30 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/common/store/AuthStore.js
#	packages/components/slider/index.js
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-09-05 10:19:52 +03:00
TimofeyBoyko
8bda52c489 Merge branch 'develop' into feature/accounts-list 2022-08-31 11:38:34 +03:00
5829654183 Web:Common:Fix. 2022-08-30 10:35:24 +03:00
bc14356351 Web: Added currencies. 2022-08-29 17:46:43 +03:00
efafaf51d8 Web:Common:Fix styles ArticleHeader. 2022-08-29 16:15:33 +03:00
1c660c75e8 Web:Client:Fix loader ArticleHeader. 2022-08-29 13:49:15 +03:00
6c331a3074 Web: Added functionality for the grace period. 2022-08-24 10:25:08 +03:00
4b35f02578 Web: Common: Added that if the sidebar is removed, then remove the alert, the loader is added. 2022-08-22 13:19:54 +03:00
3854d484a4 Web: Added an alert about a free tariff. 2022-08-22 11:59:18 +03:00
TimofeyBoyko
ebcc8bc1da Web:Common:Article: increase height of portal logo container 2022-08-18 10:11:10 +03:00
4c097607f9 Web: Fix position of MainButton with logo and display logo 2022-07-29 10:17:41 +03:00
280f702cf9 Merge branch 'develop' into refactoring/client
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/components/NavMenu/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	yarn.lock
2022-07-25 21:29:04 +03:00
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00