Commit Graph

36 Commits

Author SHA1 Message Date
073aa9943f Fix WrongTranslationVariablesTest issues + added missing files and key sorting 2022-10-25 14:52:15 +03:00
c3c64d847c Web: removed useless translations. 2022-10-05 11:55:15 +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
019745b090 Web:Common:Article: open profile on avatar click 2022-10-04 07:31:06 +03:00
58def6cbb2 Web: Common: HideArticleMenuButton: fixed z-index 2022-09-26 16:11:22 +03:00
d59bd852d2 Web: Common: fixed HideArticleMenuButton styles for table view 2022-09-26 14:57:27 +03:00
1f5384dc0c Web: Common: added hide menu translation 2022-09-26 12:37:21 +03:00
db047d72a9 Web: Common: removed log 2022-09-26 11:24:28 +03:00
0c8703a58c Web: Common: added show/hide article button 2022-09-26 11:22:46 +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
389298dfd6 Web: Client: added theme to logo 2022-09-23 13:32:43 +03:00
723a5709a6 Web: Common: fixed logo loader 2022-09-21 16:24:57 +03:00
c61d11024c Web: Common: fixed burger loader 2022-09-20 11:26:14 +03:00
f36b38cbe5 Merge branch 'bugfix/fixed-settings-loaders' of github.com:ONLYOFFICE/AppServer into bugfix/fixed-settings-loaders 2022-09-20 10:59:41 +03:00
f607382b3a Web:Common:Delete isLoadedSetting, setIsLoadedArticleHeader. 2022-09-20 10:59:31 +03:00
6448b63318 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/constants/index.js
#	web/ASC.Web.Api/Program.cs
2022-09-19 18:16:34 +03:00
7c06bc8e8e Web: Common: Article: fixed loader width 2022-09-19 17:42:34 +03:00
7844c5bd23 Web: Common: added ArticleHeader loader 2022-09-19 17:31:22 +03:00
fa01783cdb Web: Client: fixed Article loader 2022-09-19 16:41:11 +03:00
9b60a73c21 Web: Common: fixed logo click 2022-09-16 18:17:28 +03:00
150072b885 Web: Common: fixed logo click, fixed burger styles 2022-09-16 15:53:19 +03:00
bec4f11dcd Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
2022-09-15 17:16:04 +03:00
c0244b5400 Web: Added plan title from the store. 2022-09-14 17:17:40 +03:00
8e78498856 Wed: Added new stores. 2022-09-14 09:55:22 +03:00
TimofeyBoyko
14052af9b7 Web:Common:Article: fix displaying role for profile avatar 2022-09-09 09:27:36 +03:00
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
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
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