Commit Graph

10938 Commits

Author SHA1 Message Date
7265e67240 Web:Common:Fixed showing a long room name when the name of the current folder is not visible in advanced navigation. 2023-06-05 17:31:49 +03:00
83a66f7169 Web:Common:Fixed showing the previous folder in the name to always show the name of the room in the navigation. 2023-06-05 14:57:00 +03:00
e23551e552 Web:Fixed incorrect definition of showRootFolderTitle value inside a folder in a room. 2023-06-05 13:38:39 +03:00
8ebc361258 Web:Add showRootFolderTitle props is true for navigation in rooms. 2023-06-02 13:31:46 +03:00
585f5cb239 Web:Rename rootFolderTitle to rootFolderTitleColor. Added truncation of the long folder name in the room. 2023-06-02 13:30:27 +03:00
578c3dab3a Web:Common:Delete showRootFolderNavigation. 2023-06-01 18:46:37 +03:00
0f100615c1 Merge branch 'develop' into feature/navigation 2023-06-01 18:35:37 +03:00
bfd6432c0f Web:Fix styles navigation. 2023-06-01 18:34:19 +03:00
3c55ace6fe Web:Common:Add isMobileOnly check. 2023-06-01 18:33:37 +03:00
bc8a9ca637 Merge branch 'develop' into feature/history-timeout 2023-06-01 15:56:03 +04:00
8bba856ec4 Merge branch 'develop' into feature/redirect-after-access-denied
# Conflicts:
#	packages/client/src/pages/Home/index.js
#	packages/client/src/routes/client.js
2023-06-01 14:41:43 +03:00
Mushka Nikita
faba786447 added room name text ellipsis 2023-06-01 14:25:10 +03:00
Mushka Nikita
931b7619ae added folder label text ellipsis 2023-06-01 14:21:00 +03:00
4549abad2f Merge branch 'develop' into feature/filling-status-line 2023-05-30 15:18:14 +04:00
44d21119b1 Web:Client:Fix warning currentColorScheme. 2023-05-30 12:40:38 +03:00
4214470b2c Merge branch 'develop' into feature/filling-status-line 2023-05-30 13:16:26 +04:00
55da841b74 Merge branch 'develop' into feature/navigation 2023-05-30 12:30:02 +04:00
Mushka Nikita
5e201b4414 Merge branch 'develop' into feature/history-timeout 2023-05-30 11:29:48 +03:00
Mushka Nikita
98039c2da3 fixed after-rebase bugs 2023-05-30 11:23:54 +03:00
fdcac6f4da Merge branch 'develop' into feature/trash-filter-by-room 2023-05-30 11:56:18 +04:00
20a4343e7c
Merge pull request #1444 from ONLYOFFICE/bugfix/fix-floating-button
bugfix/fix-floating-button
2023-05-30 11:52:35 +04:00
eafba31391 Web:Common:Expanded Navigation to show the root folder. 2023-05-30 08:48:27 +03:00
73e707a3f6 Web: Added check for filter instead of "instanceof". 2023-05-29 17:14:50 +03:00
1df9df59d6 Web:Common:Add showTwoProgress props. 2023-05-29 16:32:58 +03:00
a22dbea67f Web: Client: Filter: Restored SSO filter after merge master 2023-05-29 14:49:08 +03:00
19e8b2210a Merge branch 'master' into develop
# Conflicts:
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/Home/index.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/common/components/Section/index.js
#	packages/components/floating-button/styled-floating-button.js
#	packages/login/src/client/App.tsx
#	packages/login/src/client/components/Invalid/index.tsx
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	yarn.lock
2023-05-29 14:36:12 +03:00
2e76723f1f Merge branch 'develop' into feature/trash-filter-by-room 2023-05-26 18:58:33 +04:00
80a8a983aa Fix undefined selectedItemTag 2023-05-26 18:58:11 +04:00
9599a68e2b Merge branch 'develop' into feature/trash-filter-by-room 2023-05-26 18:39:55 +04:00
Vlada Gazizova
e4d5442f76
Merge branch 'develop' into bugfix/fix-color-theme-import-cycle 2023-05-26 16:44:12 +03:00
d0eae2dac2 Web:Components:Add currentColorScheme in readme. 2023-05-26 16:42:32 +03:00
c5b2a6ed47 Web:Fix name. 2023-05-26 16:40:38 +03:00
d37f9f7d16 Web:Added an example of a color theme for the story. 2023-05-26 16:38:41 +03:00
8e5b341dc3 web: fix margin in third-party modal 2023-05-26 16:59:38 +04:00
Subhonbek
f996a162ac fix badge 2023-05-26 15:42:30 +03:00
Subhonbek
f33cf6015d fix bg 2023-05-26 15:26:31 +03:00
Subhonbek
0ee45ec52f fix line-height 2023-05-26 14:59:22 +03:00
1a2d5f3d5a Web:Adding history for FloatingButton in the Components module. 2023-05-26 14:39:19 +03:00
Mushka Nikita
92f94e38af Merge branch 'hotfix/v1.0.1' into feature/history-timeout 2023-05-26 14:29:28 +03:00
Mushka Nikita
7f80990818 update startTransition 2023-05-26 14:29:08 +03:00
Mushka Nikita
19d5f0db38 removed suspense, update file/folder flicking fix 2023-05-26 14:29:07 +03:00
Mushka Nikita
6b2943da07 moved history instance to infoPanelStore, moved parseHistory to HistoryHelper, implemented useTransition, fixed file/folder flicking bug, removed timers 2023-05-26 14:28:53 +03:00
Subhonbek
0d61a10a8d fix border 2023-05-26 14:28:50 +03:00
Mushka Nikita
c0417dd390 logging tweaks 2023-05-26 14:28:24 +03:00
Mushka Nikita
96b3be2ac0 added AbortController to history 2023-05-26 14:28:23 +03:00
Mushka Nikita
144a419ebd fixed memory leak 2023-05-26 14:27:31 +03:00
Mushka Nikita
ee75f70798 added switch to members tab 2023-05-26 14:26:26 +03:00
Mushka Nikita
74389e849f change load time 2023-05-26 14:26:26 +03:00
Mushka Nikita
d79b661b54 added timeout error toast to history load 2023-05-26 14:26:25 +03:00
Mushka Nikita
dfccf6526e Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-26 13:57:58 +03:00