Commit Graph

224 Commits

Author SHA1 Message Date
ee4a47454f Web: Disabled branding settings. 2022-09-16 10:45:10 +03:00
a252a07fd3 Web: fixed after merge. 2022-09-15 17:43:02 +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
eeed96cb32 Web: Fixed bugs. 2022-09-15 15:58:21 +03:00
21fc46b8bc Web: Removed useless translations. 2022-09-15 15:07:26 +03:00
c20e01e351 Web: Added information about storage size, added checks. 2022-09-15 14:59:55 +03:00
20fe2a3763 Web:Added values for the downgrade plan dialog from the stores. 2022-09-15 12:54:00 +03:00
94f6cc8682 Web: Files: Settings: fix padding on tablet 2022-09-15 12:06:22 +03:00
b85484a731 Web: Files: Settings: Fix sticky submenu 2022-09-15 11:59:38 +03:00
e911a9f478
Merge branch 'develop' into feature/redisign-files-settings 2022-09-14 18:40:09 +03:00
40aee9ff02 Web: Files: Settings: Added new loaders 2022-09-14 18:25:46 +03:00
c0244b5400 Web: Added plan title from the store. 2022-09-14 17:17:40 +03:00
9b6b55599f Web: Added getting max users count in room. 2022-09-14 16:07:22 +03:00
d2ce2f4435 Web: Added replacement in returned feature objects. 2022-09-14 16:01:40 +03:00
61fa70c886 Web: Components: Navigation: fixed z-index 2022-09-14 15:42:38 +03:00
b5e08fddf4 Web: Components: Navigation fixed text clipping 2022-09-14 14:48:19 +03:00
ff1a18eb0f Web: Components: fixed Navigation component for IOS devices 2022-09-14 14:41:24 +03:00
5131b49b0b Web: Refactoring. 2022-09-14 14:13:21 +03:00
1f76f8b058 Web: Components: fixed settings-icon color 2022-09-14 14:05:38 +03:00
8e78498856 Wed: Added new stores. 2022-09-14 09:55:22 +03:00
140631c5de
Merge branch 'develop' into feature/additional-resources 2022-09-13 20:10:42 +03:00
32c5c9907d Web: Files: fixed header-container styles 2022-09-13 18:19:23 +03:00
820cc5a9b8 Web: Common: fixed header styles 2022-09-13 18:09:40 +03:00
45bcf68af3 Web: Common: fixed section-header styles 2022-09-13 17:53:45 +03:00
281ec9ec57 Web: Files: fixed skeleton-loaders styles, fixed header styles, removed useless code 2022-09-13 13:01:31 +03:00
0f063b7502 Web:Common:Removed unnecessary fields from the object, added a defaultAdditionalResources entry to localStorage. 2022-09-13 10:38:25 +03:00
478af8492d Web:Common:Add data in methods setAdditionalResources. 2022-09-10 20:44:22 +03:00
377d3be960 Merge branch 'develop' into feature/additional-resources 2022-09-10 19:46:57 +03:00
f0bf37760b Web:Common:Add methods setAdditionalResources, getAdditionalResources, restoreAdditionalResources. 2022-09-09 10:34:45 +03:00
TimofeyBoyko
14052af9b7 Web:Common:Article: fix displaying role for profile avatar 2022-09-09 09:27:36 +03:00
97bd153ec5
Merge branch 'develop' into feature/change-owner-dialog 2022-09-08 16:29:09 +03:00
b5ce007715 Web: Common: fixed SortButton render 2022-09-08 16:05:06 +03:00
TimofeyBoyko
3a3ae4b2c9 Merge branch 'develop' into feature/change-owner-dialog 2022-09-08 15:16:51 +03:00
d7bd44cfb1 Web: Files: fixed hover for row 2022-09-08 11:48:06 +03:00
TimofeyBoyko
5f0f71a2bf Merge branch 'develop' into feature/change-owner-dialog 2022-09-08 11:27:49 +03:00
a94fc40294
Merge branch 'develop' into bugfix/fixed-section-body-padding 2022-09-08 10:57:54 +03:00
TimofeyBoyko
9d0c6c0a97 Merge branch 'develop' into feature/change-owner-dialog 2022-09-08 10:49:30 +03:00
6977534102
Merge branch 'develop' into feature/selector 2022-09-08 10:35:53 +03:00
d8c101f907 Web: Common: fixed section-body padding styles for row view 2022-09-07 18:16:02 +03:00
d0d2313da3 Web: Files: fixed section-body styles 2022-09-07 17:00:17 +03:00
TimofeyBoyko
ac496bfe9e Merge branch 'develop' into feature/selector 2022-09-07 15:06:24 +03:00
41c58de5c7 Web: Common: FilterInput: Fixed PeopleSelector usage 2022-09-07 14:14:09 +03:00
85a2983b3d Web: Refactoring. 2022-09-07 13:28:28 +03:00
TimofeyBoyko
3923d6faec Merge branch 'develop' into feature/change-owner-dialog 2022-09-06 17:43:00 +03:00
cb1da48faf Web: Profile: fix selected language 2022-09-06 12:52:57 +03:00
TimofeyBoyko
adf02df9cf Web:Common:Loaders: add display of user loader for selector row loader 2022-09-06 12:17:52 +03:00
150060faff Web: Refactoring, added downgrade plan button. 2022-09-06 10:52:02 +03:00
TimofeyBoyko
6c632497f9 Merge branch 'develop' into feature/selector 2022-09-05 20:33:29 +03:00
055be3cdbe
Merge branch 'develop' into feature/accounts-scroll 2022-09-05 17:25:28 +03:00
c27a8fc0d3 Web: People: added infinite-loader to accounts 2022-09-05 14:33:55 +03:00