Commit Graph

721 Commits

Author SHA1 Message Date
206f429c92 Web: MoreLoginModal: Fixed styles for sso. 2024-02-27 17:06:23 +03:00
eb127578b2 Merge branch 'feature/invite-page-redesign' of https://github.com/ONLYOFFICE/DocSpace-client into feature/invite-page-redesign
# Conflicts:
#	public/locales/en/Common.json
2024-02-27 11:47:46 +03:00
ca22a25f39 Web: Login: Fixed input focus. 2024-02-27 11:45:08 +03:00
8df0a29166 Web: Shared: Added translation. 2024-02-27 09:16:55 +03:00
bda5be229b Web: Fixed display of the number of providers. 2024-02-27 09:13:44 +03:00
15ddf95e3b Merge branch 'develop' into feature/invite-page-redesign 2024-02-26 20:49:56 +04:00
9e8f3caa16 Merge branch 'develop' into bugfix/rc-2.5.0 2024-02-26 20:48:53 +04:00
8ebc0fb6fa Web: Added scroll. 2024-02-26 17:11:33 +03:00
9701f3b85f Web: Removed warnings. 2024-02-26 14:02:01 +03:00
983d773f28 Web: Fixed styles. 2024-02-26 13:49:44 +03:00
dedfdc07b2 Web: Fixed styles. 2024-02-26 13:44:33 +03:00
d812437b4a Web: Shared: added filter reset when there is an error in the storage 2024-02-26 15:39:03 +05:00
5263983b56 Web: Shared: Components: ImageEditor: fixed blur in the preview when the screen is enlarged 2024-02-26 15:15:13 +05:00
412765e3af Web: Icon added, styles corrected. 2024-02-26 12:49:37 +03:00
c9022a07c0 Web: Fixed styles. 2024-02-26 11:58:24 +03:00
b5f706a635 Web: Fixed provider titles. 2024-02-26 11:53:11 +03:00
373ccbdce8 Merge branch 'develop' into feature/saving-room-filter 2024-02-26 11:10:28 +04:00
b4987dfbc3 Shared: ColorTheme: fix submenu color 2024-02-23 14:00:27 +03:00
b149385f92 Merge branch 'bugfix/rc-2.5.0' into develop 2024-02-22 22:33:59 +04:00
ef9ec57576
Merge pull request #281 from ONLYOFFICE/feature/tag-manager
Feature/tag manager
2024-02-22 22:31:26 +04:00
Akmal Isomadinov
934ffe1fdb Merge branch 'develop' into feature/rewrite-hoc
# Conflicts:
#	packages/common/custom.scss
2024-02-22 19:28:20 +05:00
61ee3fbeef Merge branch 'bugfix/rc-2.5.0' into develop 2024-02-22 18:01:19 +04:00
7b851cac74 Web: Files: added HexCode translation 2024-02-22 16:42:00 +03:00
b3d8fe0ffc
Merge pull request #273 from ONLYOFFICE/bugfix/safe-area
bugfix/safe-area
2024-02-22 17:31:27 +04:00
7787407d5d Web:Shared:Fixed page crash when clicking on the cross of the selected tag from the hidden list of tags in the search. 2024-02-22 16:29:20 +03:00
cc27a946fe Web:Shared:Fixed page crash when opening the list of hidden tags and clicking outside the area. 2024-02-22 16:15:59 +03:00
5b5c670d15 Web:Shared:Fixed missing search and adding a tag to search when clicking a tag from a hidden list of tags. 2024-02-22 15:00:38 +03:00
3ca6ceab39 Merge 2024-02-22 14:55:10 +03:00
c5fc7a6144 Web:Fixed lack of search by room type when clicking on a room type tag in tile view. 2024-02-22 14:43:27 +03:00
Akmal Isomadinov
6258cd184d Merge branch 'develop' into feature/rewrite-hoc
# Conflicts:
#	packages/client/src/components/panels/InvitePanel/sub-components/InviteInput.js
2024-02-22 15:53:47 +05:00
Akmal Isomadinov
22fed4780a Merge branch 'develop' into feature/rewrite-routes
# Conflicts:
#	packages/client/src/routes/portalSettings.js
2024-02-22 15:42:05 +05:00
28567fdad9 Merge branch 'bugfix/rc-2.5.0' into bugfix/safe-area 2024-02-22 14:18:47 +04:00
3bda83bc41 Merge branch 'develop' into feature/disable-form-room 2024-02-22 14:00:09 +04:00
Akmal Isomadinov
4c11e86c37 Shared:Utils:Common: Disable form filling room 2024-02-22 13:37:23 +05:00
c4d69493d9 Merge branch 'develop' into bugfix/selectors 2024-02-22 10:05:57 +03:00
75b5716dcc Merge branch 'bugfix/rc-2.5.0' into feature/tag-manager 2024-02-22 10:00:47 +03:00
25a416ea4e Merge branch 'develop' into bugfix/rc-2.5.0 2024-02-22 00:20:28 +04:00
eb0aed4d48 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop
# Conflicts:
#	packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Filter/index.js
#	packages/client/src/store/FilesActionsStore.js
2024-02-21 20:35:05 +05:00
d1c1f810a5 Web: Shared: expanded the room filter so that it could be saved 2024-02-21 20:17:43 +05:00
560958351a Merge branch 'develop' into bugfix/selectors 2024-02-21 16:26:10 +03:00
eacad7f98f Move translation keys from GroupsSelector to Common 2024-02-21 16:12:14 +03:00
260c48962b Shared:Components:Selector: update types 2024-02-21 16:07:40 +03:00
28b9fe7651 Shared:Components:Selector: update useEffect deps 2024-02-21 16:05:38 +03:00
14de1c5150 Web: Files: fixed SelectionArea for third-party folders 2024-02-21 16:05:33 +03:00
db9831dd36 Shared:Components:Selector: update types for work with tabs, add support multiply tabs 2024-02-21 15:59:43 +03:00
c49f9c02a5 Shared:Components:Submenu: update type activeTabId 2024-02-21 15:59:17 +03:00
80d788d5a2 Shared:Selectors:Groups: fix types 2024-02-21 15:58:57 +03:00
89f6a4f319 Shared:API: fix types for selectors 2024-02-21 15:58:40 +03:00
7b2f01c376 Merge branch 'bugfix/rc-2.5.0' into bugfix/safe-area 2024-02-21 14:32:25 +03:00
80645ee784 Web: Added greeting container. 2024-02-21 12:40:19 +03:00