|
|
25bc1d9fdc
|
Merge branch 'develop' into feature/user-quota
|
2024-02-16 01:11:33 +04:00 |
|
|
|
a1a5dd5c51
|
Fix Uncaught TypeError: Cannot read properties of undefined (reading 'toUnicode')
|
2024-02-16 01:06:04 +04:00 |
|
|
|
fd86a6ffa4
|
Merge branch 'develop' into feature/user-quota
|
2024-02-15 23:26:24 +04:00 |
|
|
|
3380ea9318
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/helpers/enums.ts
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/TableStore.js
|
2024-02-15 12:08:27 +03:00 |
|
|
|
7e19feebc3
|
Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-02-14 20:09:36 +05:00 |
|
|
|
06fecd59ba
|
Web: fixed display of user types
|
2024-02-14 20:09:08 +05:00 |
|
|
|
3b571030cb
|
Shared: Utils: add getPasswordErrorMessage
|
2024-02-14 16:41:26 +03:00 |
|
|
|
405406d9e5
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/routes/portalSettings.js
# public/locales/en/Common.json
|
2024-02-14 14:19:11 +03:00 |
|
|
|
5b28408a17
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/store/SelectedFolderStore.js
# packages/client/src/store/TableStore.js
# packages/client/src/store/index.js
# packages/shared/store/CurrentQuotaStore.ts
# packages/shared/utils/common.ts
# public/locales/en/Common.json
|
2024-02-14 12:15:32 +03:00 |
|
Akmal Isomadinov
|
3cb31f417a
|
Merge branch 'develop' into feature/rewrite-error-boundary
|
2024-02-13 14:28:52 +05:00 |
|
|
|
d9b026c166
|
Merge branch 'develop' into feature/invite-panel-input
# Conflicts:
# packages/client/src/components/panels/InvitePanel/sub-components/InviteInput.js
# packages/client/src/components/panels/InvitePanel/sub-components/Item.js
|
2024-02-09 17:11:02 +03:00 |
|
Akmal Isomadinov
|
4541d4cdfa
|
Shared:Components:ReportDialog Rewrite to typescript
|
2024-02-09 14:07:14 +05:00 |
|
|
|
ed76251daf
|
Web: Shared: Utils: moved getUserTypeLabel to utilities
|
2024-02-09 13:15:18 +05:00 |
|
Akmal Isomadinov
|
17eec03a84
|
DocspaceLogo Rewrite to typescript
|
2024-02-08 20:35:53 +05:00 |
|
|
|
b92f8251f4
|
Web: Files: InvitePanel: fixed user rights
|
2024-02-08 18:04:46 +03:00 |
|
Akmal Isomadinov
|
f4d89afbf0
|
crashReport moved from client to shared
|
2024-02-08 19:13:57 +05:00 |
|
Akmal Isomadinov
|
16cb669a18
|
Shared:Utils:ClassNames Fixed type
|
2024-02-08 15:47:15 +05:00 |
|
|
|
8409a6cee7
|
Merge branch 'develop' into feature/invite-panel-input
|
2024-02-07 19:33:11 +04:00 |
|
|
|
bf750053d8
|
Web: Files: InviteInput: fix
|
2024-02-07 16:13:35 +03:00 |
|
|
|
e288b8436c
|
Merge branch 'develop' into feature/rewrite-stores
# Conflicts:
# packages/client/src/pages/Home/MediaViewer/index.js
|
2024-02-07 12:13:15 +04:00 |
|
Akmal Isomadinov
|
1b508ba243
|
Shared: fixed cyclic dependency
|
2024-02-06 20:39:15 +05:00 |
|
|
|
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 |
|
|
|
72be9e6da7
|
Merge branch 'develop' into feature/refactoring-media-viewer
# Conflicts:
# packages/shared/package.json
|
2024-02-05 17:21:59 +04:00 |
|
|
|
182caeaaca
|
Shared:Utils:Common: fix convert to language function
|
2024-02-05 14:53:30 +03:00 |
|
Akmal Isomadinov
|
b0a792f3d7
|
MediaViewer: Optimization of tiff decoding
|
2024-02-04 19:08:01 +05:00 |
|
Akmal Isomadinov
|
cb6b4d0a57
|
Merge branch 'develop' into feature/refactoring-media-viewer
# Conflicts:
# packages/common/components/MediaViewer/sub-components/Viewer/index.tsx
|
2024-02-02 12:25:09 +05:00 |
|
Akmal Isomadinov
|
341dd8bbb2
|
Shared:Components:MediaViewer: Fixed style code
|
2024-02-01 14:18:06 +05:00 |
|
Akmal Isomadinov
|
7ff2e88d3d
|
Shared:Components:MediaViewer: Optimization of working with tiff images
|
2024-01-31 21:16:23 +05:00 |
|
|
|
9bae37445d
|
Web: Fixed types.
|
2024-01-31 14:10:52 +03:00 |
|
Akmal Isomadinov
|
547a65be41
|
Shared:Components:MediaViewer:Player Refactoring, optimization and fixed types
|
2024-01-30 14:37:05 +05:00 |
|
Akmal Isomadinov
|
549ee18424
|
Shared: Fixed types
|
2024-01-29 19:34:52 +05:00 |
|
|
|
fae4d476d8
|
Web: Refactoring.
|
2024-01-29 15:16:50 +03:00 |
|
|
|
683c628c28
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/components/dialogs/index.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/store/FilesStore.js
# packages/client/src/store/SelectedFolderStore.js
# packages/common/components/Loaders/index.js
# packages/shared/api/files/index.ts
# public/locales/en/Common.json
|
2024-01-28 20:44:38 +03:00 |
|
|
|
e7205ba278
|
Shared:Utils:Socket: update types
|
2024-01-26 19:36:15 +03:00 |
|
|
|
c17fd93574
|
Shared:Store:AuthStore: rewrite to typescript
|
2024-01-25 16:14:13 +03:00 |
|
|
|
6757092523
|
Shared:Store:SettingsStore: move from common and rewrite to typescript
|
2024-01-25 11:17:19 +03:00 |
|
|
|
f2b1e4d0a0
|
Merge branch 'feature/shared-article' into feature/refactoring-auth-store
|
2024-01-24 14:41:25 +03:00 |
|
|
|
d4756780fc
|
Web: Shared: Utils: removed unnecessary operations in combineUrl
|
2024-01-24 14:49:57 +05:00 |
|
|
|
429044ea05
|
Web: Shared: Utils: extended the combine url function to accept numbers
|
2024-01-24 14:09:50 +05:00 |
|
Akmal Isomadinov
|
b7b3860044
|
Fixed order of the rooms
|
2024-01-23 20:46:33 +05:00 |
|
Akmal Isomadinov
|
9f2ebab438
|
Shared: Added type guard
|
2024-01-23 20:46:17 +05:00 |
|
|
|
094a6421e6
|
Shared:Store:CurrentTariffStatusStore: move from common, rewrite to typescript and update using without auth store
|
2024-01-23 16:45:42 +03:00 |
|
|
|
b9a34f8c4e
|
Shared: fix eslint and ts problems
|
2024-01-23 10:24:57 +03:00 |
|
|
|
6ec3000fa8
|
Merge branch 'develop' into feature/shared-filter
|
2024-01-22 10:03:42 +03:00 |
|
|
|
47ab8b82ab
|
Web: Fixed after merge.
|
2024-01-19 13:53:35 +03:00 |
|
|
|
1e0c383514
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/api/files/index.js
# packages/common/constants/index.js
# packages/common/store/CurrentQuotaStore.js
# packages/components/combobox/index.js
# packages/components/themes/base.js
# packages/components/toggle-button/index.js
# packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
# packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
# packages/shared/api/people/filter.js
# packages/shared/api/rooms/filter.js
# packages/shared/utils/common.ts
# yarn.lock
|
2024-01-19 11:32:34 +03:00 |
|
|
|
eeede19a30
|
Merge branch 'develop' into feature/form-room-pdf
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/FilesSelector/helpers/useFilesHelper.ts
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/SelectedFolderStore.js
# packages/client/src/store/SettingsStore.js
# packages/common/constants/index.js
# packages/common/store/InfoPanelStore.js
# packages/components/room-logo/index.js
# packages/shared/utils/common.ts
|
2024-01-18 19:31:46 +04:00 |
|
|
|
144f673e17
|
Merge branch 'develop' into feature/shared-filter
|
2024-01-17 15:58:33 +03:00 |
|
|
|
fc2e58d701
|
Shared:Selectors:People: rewrite to typescript and move from client
|
2024-01-17 11:53:48 +03:00 |
|
