Commit Graph

2647 Commits

Author SHA1 Message Date
c51fb3fe8f Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
#	packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js
#	packages/client/src/pages/PortalSettings/categories/integration/LDAP/styled-components/StyledLdapPage.js
#	packages/client/src/pages/Wizard/index.js
2024-09-02 19:28:07 +04:00
72191e803b Shared:Components:DropDown: fix blinking after switch from 1 item to more 2024-09-02 12:59:02 +03:00
343f2748e4
Merge pull request #582 from ONLYOFFICE/feature/ssr-confirm
Feature/ssr-confirm
2024-09-02 12:50:03 +04:00
789ee53734 Merge branch 'hotfix/v2.6.1' into feature/user-already-invited 2024-09-02 09:28:06 +03:00
9c138332b5 Shared: axiosClient: Fixed SDK frame force redirect 2024-09-02 08:44:42 +03:00
bf5a4d5226 Fixed Bug 69896 - Accounts. When adding a registered email to the list for invitation to the portal, display that it is already registered 2024-09-01 12:36:14 +03:00
0e460bf1f0 Fix Bug 69733 - [LDAP] No option to validate entered data in Password field when configuring LDAP 2024-08-30 18:50:55 +04:00
a9e335921e Merge branch 'develop' into bugfix/new-empty-screen 2024-08-30 17:16:27 +04:00
76f6fa7405 Merge branch 'develop' into feature/ssr-confirm
# Conflicts:
#	packages/client/src/pages/Confirm/sub-components/createUser.js
#	public/locales/en/Common.json
2024-08-30 13:21:08 +04:00
7e0cb53c69 Files: Theme: value of fileExstColor have been replaced with globalColor const 2024-08-30 12:55:46 +04:00
Akmal Isomadinov
839492dd27 Client:EmptyView Added empty screen for public room 2024-08-30 13:43:28 +05:00
c865cae5d9 Merge branch 'develop' into feature/display-file-extension 2024-08-30 11:05:15 +04:00
78cdfc212e Shared:ApI:Settings: change TSettings type 2024-08-29 19:01:53 +04:00
3b2b73802e Merge branch 'develop' into feature/ssr-confirm 2024-08-29 18:01:36 +04:00
ee7fe469b2 Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
#	packages/client/src/pages/Confirm/sub-components/createUser.js
#	packages/client/src/pages/Home/Section/Body/TableView/sub-components/RecentRowData.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledCertificatesTable.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/CertificatesTable.js
#	packages/client/src/pages/Wizard/index.js
#	packages/client/src/store/TableStore.js
#	packages/shared/themes/base.ts
#	packages/shared/themes/dark.ts
2024-08-29 14:27:18 +04:00
698e1c6034 Fix Bug 69920 - Added the ability to display 2 numbers after a dot. 2024-08-29 12:02:06 +03:00
efb66229de
Merge pull request #604 from ONLYOFFICE/feature/terms-condition
Feature/terms condition
2024-08-28 17:40:14 +04:00
853357ccce Merge branch 'hotfix/v2.6.1' into feature/catalog-item-link 2024-08-28 16:54:04 +04:00
82d32263a6 Merge branch 'develop' into feature/display-file-extension 2024-08-28 14:12:10 +02:00
b93907eda3 Parameters were renamed. 2024-08-28 15:04:52 +03:00
d94bfb6ba2 Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1 2024-08-28 14:27:02 +03:00
f7cd23b313 Fix Bug 69870 - Recovery progress is shown with jumps. 2024-08-28 14:26:06 +03:00
14e762581e Client: Shared: Fix filename with extension in RTL 2024-08-28 12:59:48 +02:00
720422c65d Fixed Bug 67513: Client: Added authorized flag for download operation page 2024-08-28 13:33:25 +03:00
dec78c077f Fix Bug 69883
Expired certificate is not highlighted
2024-08-28 12:26:34 +03:00
f2d8534e3d Web: Files: ConflictResolve: fix styles 2024-08-28 11:22:05 +03:00
b7bd584754 Fix Bug 69876 - Files:Copy. Added truncate 2024-08-28 11:10:20 +03:00
f61b262c0d Shared: OperationContainer: Added logo for dark theme 2024-08-28 10:10:53 +03:00
a59a076ffe Shared: ModalDialog: Removed backdrop changes when swiping. 2024-08-27 18:20:03 +03:00
d0806a346b Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1 2024-08-27 17:54:26 +03:00
03881f3892 Shared: AsideHeader: Fixed colors when hovering over dialog icons. 2024-08-27 17:54:17 +03:00
9fcb1baed6 Fix Bug 69733 - [LDAP] No option to validate entered data in Password field when configuring LDAP 2024-08-27 18:46:13 +04:00
c0382bf234 Shared:Components:Aside: fix react not found 2024-08-27 17:11:28 +03:00
387cf3f3f4 Client/Shared: Links have been added. 2024-08-27 11:21:16 +03:00
eb42b89f6f Shared:Selectors:Files: clear file selection after click bread crumbs 2024-08-27 11:13:13 +03:00
94d36be730 Client/Shared: There was a variable replacement. 2024-08-27 11:13:10 +03:00
6709883fe4 Shared:Components:ArticleItem: add link 2024-08-27 09:59:13 +03:00
f0ffbb5651 Merge branch 'develop' into feature/ssr-confirm 2024-08-26 23:16:09 +04:00
1c0c743714 Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
#	packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js
#	packages/client/src/components/panels/StyledPanels.js
#	packages/client/src/pages/Home/InfoPanel/Header/styles/common.js
#	packages/client/src/pages/PortalSettings/categories/data-import/components/Providers.tsx
#	packages/shared/components/aside/Aside.styled.tsx
#	packages/shared/components/filter/Filter.styled.ts
#	packages/shared/components/modal-dialog/sub-components/CloseButton.tsx
#	packages/shared/components/selector/Selector.styled.ts
2024-08-26 23:08:26 +04:00
9df57acd09 Shared: AsideHeader: Fixed cross icon width. 2024-08-26 12:30:41 +03:00
416eecc21b Merge branch 'develop' into feature/ssr-confirm 2024-08-26 11:33:16 +04:00
2ab63a3029 Merge branch 'develop' into feature/display-file-extension 2024-08-23 23:27:30 +04:00
0009864925 Refactoring. 2024-08-23 20:34:34 +03:00
93e4711f04 Shared: AsideHeader: Added icon reversal for rtl view. 2024-08-23 20:32:31 +03:00
30701247c6 Refactoring. 2024-08-23 20:21:35 +03:00
3017d36a76 Client/Shared: Hide close button for Sdk. 2024-08-23 20:14:14 +03:00
11fe4f4942 Merge branch 'develop' into feature/new-empty-screen
# Conflicts:
#	packages/client/src/components/EmptyContainer/index.js
#	public/locales/en/Common.json
2024-08-23 20:48:21 +04:00
7f7882f4ff Shared/Client: InfoPanel: Fixed styles because of an aside header component. 2024-08-23 19:47:15 +03:00
1b6d4fb103 Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
#	packages/client/package.json
#	packages/shared/themes/base.ts
#	yarn.lock
2024-08-23 20:41:35 +04:00
73a5e191f5 Client: AsideHeader: Added removal of border by condition. 2024-08-23 18:47:00 +03:00