Commit Graph

17 Commits

Author SHA1 Message Date
Viktor Fomin
657ccbb7c8 Common: Article: add support color scheme 2022-11-07 16:58:53 +05:00
Viktor Fomin
28846ea77d Common: Article: fix position with smart banner 2022-11-02 17:13:23 +05:00
TimofeyBoyko
7a1ddd3c20 Merge branch 'develop' into feature/portal-access-rights 2022-10-11 14:04:42 +05:00
ba6b92c7c2 Web: Added the ability to see alert in the article for administrators only. 2022-10-06 14:26:36 +03:00
ca1cd06fad Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/public/images/plus.react.svg
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/components/PrivateRoute/index.js
2022-10-04 17:13:46 +03:00
TimofeyBoyko
ae584739e8 Merge branch 'develop' into feature/portal-access-rights 2022-10-04 06:58:16 +03:00
0c8703a58c Web: Common: added show/hide article button 2022-09-26 11:22:46 +03:00
46370b588c Web: Fixed bugs. 2022-09-26 11:19:10 +03:00
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
TimofeyBoyko
7a2e3fea01 Merge branch 'develop' into feature/portal-access-rights 2022-09-22 16:24:57 +03:00
fa01783cdb Web: Client: fixed Article loader 2022-09-19 16:41:11 +03:00
ce4cacc43c Web: Fixed bugs. 2022-09-19 12:18:37 +03:00
TimofeyBoyko
cfeb72fd9c Web:Common:Article: add new prop 'withMainButton' 2022-09-16 16:36:29 +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
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00