|
a7be3428bb
|
Fixed after merge.
|
2024-02-06 16:13:16 +03:00 |
|
|
d385474caa
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/components/GlobalEvents/CreateRoomEvent.js
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/components/MainBar/Bar.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/UsersStore.js
# packages/client/src/store/index.js
# packages/common/store/AuthStore.js
# packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
# packages/shared/api/files/index.ts
# packages/shared/api/files/types.ts
# packages/shared/store/CurrentQuotaStore.ts
# packages/shared/store/UserStore.ts
# public/locales/en/Common.json
|
2024-02-06 11:52:52 +03:00 |
|
|
740cab563b
|
Web: PortalSettings: StorageManagement: Refactoring.
|
2024-02-06 10:40:44 +03:00 |
|
|
b3c5bdd7ff
|
Web: Loaders: Refactoring.
|
2024-02-06 10:29:13 +03:00 |
|
|
50749cb6f5
|
Web: Fixed api types.
|
2024-02-06 10:08:12 +03:00 |
|
|
edc39fa071
|
Web: PortalSettings: StorageManagement: Refactoring.
|
2024-02-05 19:21:30 +03:00 |
|
|
83f705fc0c
|
Web: Deleted useless code.
|
2024-02-05 17:49:33 +03:00 |
|
|
ee10a11549
|
Web: Fixed updating info.
|
2024-02-05 17:21:21 +03:00 |
|
|
708835adf9
|
Web: StorageManagement: Added link to help center.
|
2024-02-05 17:05:51 +03:00 |
|
|
c65902a9ad
|
Merge branch 'develop' into bugfix/sdk-table
# Conflicts:
# packages/client/src/store/TableStore.js
|
2024-02-05 13:41:01 +03:00 |
|
|
c31693f7dc
|
Web: Fixed socket update.
|
2024-02-05 12:51:50 +03:00 |
|
|
7bb1a4edb7
|
Merge branch 'develop' into bugfix/editor-dialog
|
2024-02-02 19:26:48 +04:00 |
|
|
97cdf17362
|
Shared: Navigation: fix
|
2024-02-02 18:22:42 +03:00 |
|
|
da37e06aaf
|
Merge branch 'develop' into bugfix/trash-warning
|
2024-02-02 19:10:24 +04:00 |
|
|
0d9f675c82
|
Merge branch 'develop' into bugfix/rows-jump-styles
# Conflicts:
# packages/client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
|
2024-02-02 18:33:51 +04:00 |
|
|
7487d0d94b
|
Merge branch 'hotfix/v2.0.2' into develop
|
2024-02-02 18:13:01 +04:00 |
|
|
b2023331e3
|
FilesSelector: Fixed stopping requests for embedded mode
|
2024-02-02 16:34:20 +03:00 |
|
|
e885c0485d
|
Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
# packages/client/src/pages/Home/Hooks/usePublic.js
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
# public/locales/ja-JP/Common.json
# public/locales/pt-BR/Common.json
# public/locales/pt/Common.json
# public/locales/ro/Common.json
# public/locales/ru/Common.json
# public/locales/uk-UA/Common.json
# public/locales/zh-CN/Common.json
|
2024-02-02 16:15:04 +04:00 |
|
|
5823c18b73
|
Shared: Navigation: fix trash warning position
|
2024-02-02 14:35:43 +03:00 |
|
|
92f770998e
|
Web: FilesSelector: Fixed display of translation for dialogue in the editor.
|
2024-02-02 14:06:47 +03:00 |
|
|
b7ed472dae
|
Web: Files: Navigation: fixed header-menu width
|
2024-02-02 13:49:28 +03:00 |
|
|
7a87bc295c
|
Web: Files: fixed public room socket, requests after rewriting to typescript
|
2024-02-02 13:44:28 +03:00 |
|
|
338b3eca62
|
Web: Files: Fixed navigation styles for public room
|
2024-02-02 13:27:28 +03:00 |
|
|
cf9f65b21f
|
Web: Files: fixed empty-screen for public room
|
2024-02-02 13:11:17 +03:00 |
|
|
76c1556c9e
|
Fix Bug 65386 - Rooms. Fixed header menu for public room
|
2024-02-02 13:10:40 +03:00 |
|
|
c164d0ccc1
|
Fix Minified React error #130
|
2024-02-02 01:34:34 +04:00 |
|
|
a8f5f8b261
|
Client: fix import util
|
2024-02-01 18:02:05 +03:00 |
|
|
1774685438
|
Merge pull request #219 from ONLYOFFICE/feature/edit-oform_keys
Feature/edit oform keys
|
2024-02-01 18:18:32 +04:00 |
|
|
70b8c66f24
|
Client:InfoPanel: fix setIsMobileHidden
|
2024-02-01 16:32:53 +03:00 |
|
|
ee2f010de3
|
edited oform -> PDF form
|
2024-02-01 16:06:21 +03:00 |
|
|
684951f0ae
|
Hooks: Added loaded command for public room fetch data
|
2024-02-01 15:15:28 +03:00 |
|
|
ba92a464e0
|
Web: TableView: Removed display of borders for Safari.
|
2024-02-01 14:32:04 +03:00 |
|
|
767376c37c
|
Merge branch 'develop' into feature/refactoring-auth-store
|
2024-02-01 13:53:52 +03:00 |
|
|
82a720b16b
|
Merge branch 'develop' into feature/public-room
|
2024-02-01 13:59:48 +04:00 |
|
|
b40b37018d
|
Merge branch 'develop' into feature/refactoring-auth-store
|
2024-02-01 12:54:43 +03:00 |
|
|
d1e88bab0c
|
Common:Store:InfoPanelStore: fix warning
|
2024-02-01 12:43:38 +03:00 |
|
|
41aec3368c
|
Web: Files: fixed planet icon
|
2024-02-01 12:06:21 +03:00 |
|
|
2f3a60205c
|
Web: changed from firstLetterToUppercase to capitalize
|
2024-02-01 13:56:40 +05:00 |
|
|
6c357ea855
|
Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace-client into feature/public-room
|
2024-02-01 11:36:42 +03:00 |
|
|
04a31c61d0
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/pages/Home/Section/Header/index.js
# packages/shared/components/navigation/Navigation.tsx
# packages/shared/components/navigation/Navigation.types.ts
# packages/shared/components/navigation/sub-components/ControlBtn.tsx
|
2024-02-01 11:36:29 +03:00 |
|
|
20e11df520
|
Web: Client: InfoPanel: Members: commented on showing the tooltip there are no online statuses yet
|
2024-02-01 12:59:44 +05:00 |
|
|
e4339f721f
|
Merge branch 'develop' into feature/list-accounts-additional-info
|
2024-02-01 12:50:35 +05:00 |
|
|
69f21fc3ce
|
Web: Added socket for personal quota.
|
2024-02-01 10:12:09 +03:00 |
|
|
91165250d6
|
Merge branch 'develop' into feature/new-tariff-bar
|
2024-01-31 21:01:07 +04:00 |
|
|
ce696a19f2
|
Fix display badge inside Room InfoiPanel
|
2024-01-31 20:57:14 +04:00 |
|
|
b187939065
|
Merge branch 'develop' into feature/public-room
|
2024-01-31 20:07:01 +04:00 |
|
|
2c91c5ec1e
|
Merge branch 'develop' into bugfix/textarea
|
2024-01-31 19:46:53 +04:00 |
|
|
54ed8d7e1d
|
Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
# packages/client/src/pages/PublicRoom/sub-components/RoomPassword.js
# packages/login/src/client/components/CodeLogin.tsx
# packages/login/src/client/components/Login.tsx
|
2024-01-31 19:45:25 +04:00 |
|
|
fd0a30d057
|
Merge branch 'develop' into feature/list-accounts-additional-info
# Conflicts:
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js
|
2024-01-31 19:59:18 +05:00 |
|
|
0343b95435
|
Web: Client: InfoPanel: Members: added a tooltip when hovering over a user
|
2024-01-31 19:30:08 +05:00 |
|