|
6c47a8be26
|
Merge branch 'feature/shared-filter' into feature/shared-article
|
2024-01-22 11:46:29 +03:00 |
|
|
6ec3000fa8
|
Merge branch 'develop' into feature/shared-filter
|
2024-01-22 10:03:42 +03:00 |
|
|
9bb54955c4
|
Shared:Article: rewrite to typescript
|
2024-01-22 09:40:45 +03:00 |
|
|
b599aad308
|
Shared: Components: Selector: fix crash
|
2024-01-19 17:59:36 +03:00 |
|
|
1adf6b3634
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-19 17:04:46 +04:00 |
|
|
968573ce02
|
Merge branch 'hotfix/v2.0.1' into develop
# Conflicts:
# packages/components/toast/styled-toastr.js
|
2024-01-19 16:20:16 +04:00 |
|
|
8b68123fba
|
Merge branch 'feature/shared-filter' into feature/shared-article
|
2024-01-19 10:47:08 +03:00 |
|
|
798578ff0b
|
Shared:Article: rewrite to typescript
|
2024-01-19 10:47:05 +03:00 |
|
|
825c765b7d
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-18 20:38:44 +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 |
|
|
4fd042b998
|
Shared:Selectors: fix infinity use effect
|
2024-01-17 17:14:46 +03:00 |
|
|
5b86d792ac
|
Client: fix section import
|
2024-01-17 16:22:20 +03:00 |
|
|
144f673e17
|
Merge branch 'develop' into feature/shared-filter
|
2024-01-17 15:58:33 +03:00 |
|
|
ab08a20435
|
Shared:Components:Filter: rewrite to typescript and move from common
|
2024-01-17 15:57:11 +03:00 |
|
|
0250d66230
|
Shared: Components: Section: add submenu
|
2024-01-17 15:25:24 +03:00 |
|
|
a170d6e566
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-17 15:55:38 +04:00 |
|
|
e80273f869
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-17 13:15:14 +03:00 |
|
|
387a4dd6be
|
Shared: API: Files: ts fix
|
2024-01-17 13:09:25 +03:00 |
|
|
4e10a6baaf
|
Merge branch 'develop' into feature/shared-section
|
2024-01-17 14:07:10 +04:00 |
|
|
fc2e58d701
|
Shared:Selectors:People: rewrite to typescript and move from client
|
2024-01-17 11:53:48 +03:00 |
|
|
a9a8de4722
|
Shared:Selectors:Room: rewrite to typescript and move from client
|
2024-01-17 10:13:30 +03:00 |
|
|
9181f91dc7
|
Shared: Components: ComboBox: fix type
|
2024-01-17 01:01:39 +03:00 |
|
|
441a7ba604
|
Merge branch 'develop' into bugfix/management-payments
# Conflicts:
# packages/client/src/pages/Profile/Section/Body/sub-components/active-session/index.js
# packages/shared/utils/convertTime.ts
|
2024-01-16 19:26:53 +03:00 |
|
|
82ad593fcc
|
Shared:Components:Section: fix import React
|
2024-01-16 14:39:45 +03:00 |
|
|
83d405680b
|
Merge branch 'develop' into feature/shared-section
|
2024-01-16 14:33:05 +03:00 |
|
|
ea78572c5d
|
Shared:Components:Section: delete console log
|
2024-01-16 14:31:39 +03:00 |
|
|
f477ef4d52
|
Shared:Components:Section: rewrite to typescript, move from common and add wrapper to Client and Managment
|
2024-01-16 14:31:08 +03:00 |
|
|
fd20d07e6b
|
Shared: API: add new method
|
2024-01-16 12:21:42 +03:00 |
|
|
ffcb4f5dea
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-16 12:13:34 +03:00 |
|
|
5976642b65
|
Merge branch 'hotfix/v2.0.1' into develop
|
2024-01-16 12:34:15 +04:00 |
|
|
37398d6932
|
Shared: API: fix after merge
|
2024-01-15 18:20:37 +03:00 |
|
|
68d21efd61
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-15 18:13:12 +03:00 |
|
|
a9c9547bf9
|
Shared:Components:Navigation: fix color of text
|
2024-01-15 17:03:07 +03:00 |
|
|
2fbc625709
|
Merge branch 'feature/shared-navigation' of github.com:ONLYOFFICE/DocSpace-client into feature/shared-navigation
|
2024-01-15 16:57:09 +03:00 |
|
|
9cf264003e
|
Shared:Components:Navigation: fix accounts
|
2024-01-15 16:57:02 +03:00 |
|
|
2e3fc63ecc
|
Merge branch 'develop' into feature/shared-navigation
|
2024-01-15 17:29:36 +04:00 |
|
|
40ea337a93
|
Shared:API:Files: fix moveto
|
2024-01-15 14:47:38 +03:00 |
|
|
f45a9df4b1
|
Shared:Components:DropDown: fix render
|
2024-01-15 14:44:49 +03:00 |
|
|
c05b87cd0e
|
Shared:Components:Navigation: export from index file types
|
2024-01-15 13:16:12 +03:00 |
|
|
1121482730
|
Merge branch 'feature/common-utils-typescript' of github.com:ONLYOFFICE/DocSpace-client into feature/common-utils-typescript
|
2024-01-15 13:11:25 +03:00 |
|
|
5231eb4116
|
Client: fix profile login crash and RoomsTypes values
|
2024-01-15 13:11:15 +03:00 |
|
|
c0db4a43e4
|
SHared:Components:Navigation: move from common and rewrite to typescript
|
2024-01-15 12:42:16 +03:00 |
|
|
d999063291
|
Update .eslintrc.cjs
Fix error Insert `␍` prettier/prettier
|
2024-01-15 13:22:49 +04:00 |
|
|
dc5d6bdcc6
|
Shared:Sw: move from common
|
2024-01-14 09:25:48 +03:00 |
|
|
7a2709b1f6
|
Shared:Utils:Common\Api: move from common and rewrite to typescript
|
2024-01-14 09:13:04 +03:00 |
|
|
7a3115a051
|
Shared:Utils:Firebase: rewrite to typescript and move from common
|
2024-01-12 10:44:46 +03:00 |
|
|
fd1b81bd16
|
Shared:Utils:Encoder: rewrite to typescript
|
2024-01-12 10:33:24 +03:00 |
|
|
341d2e3453
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-11 21:59:44 +03:00 |
|
|
c9eb637db9
|
Shared:Utils: rewrite to typescript
|
2024-01-11 16:38:53 +03:00 |
|
|
dca3f1b0a2
|
Shared:Utils:Helpers: rewrite to typescript
|
2024-01-11 15:49:51 +03:00 |
|