|
|
3f6ed2e68e
|
Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-05 16:37:24 +05:00 |
|
|
|
375cac4488
|
Web: Shared: Enums: corrected dropbox names
|
2024-03-05 16:37:12 +05:00 |
|
|
|
b1d41ff86c
|
Web: Shared: Add MembersSubjectType enum. Fix bad member group view.
|
2024-03-04 16:46:28 +01:00 |
|
|
|
3fa4ecfdb7
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-20 23:37:40 +03:00 |
|
|
|
1749f5a9d0
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/components/GlobalEvents/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
# packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/PeopleStore.js
# packages/client/src/store/index.js
# packages/shared/api/people/filter.js
# packages/shared/enums/index.ts
|
2024-02-20 19:43:27 +03:00 |
|
|
|
38394be19c
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-20 01:35:08 +03:00 |
|
namushka
|
eadba5e683
|
merge origin + merge fix
|
2024-02-14 15:38:20 +03:00 |
|
namushka
|
b7a711c358
|
moved basic feats from feature/account-groups (groups table, inside groups table, api, stores, etc.)
|
2024-02-14 15:35:17 +03:00 |
|
|
|
904d828732
|
Web: Client: Add filters to People, Groups, InsideGroup (Accounts)
|
2024-02-13 21:48:47 +01:00 |
|
|
|
eaf83a10d4
|
Web: Client: Add inviting groups to room
|
2024-02-13 16:53:24 +01:00 |
|
|
|
ebff35be27
|
Shared: fix after merge
|
2024-02-01 23:29:29 +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 |
|
|
|
2b48a75d81
|
Web: Fixed after merge.
|
2024-01-24 11:53:37 +03:00 |
|
|
|
dc39ac251b
|
Web: Fixed after merge.
|
2024-01-23 08:12:08 +03:00 |
|
|
|
6c47a8be26
|
Merge branch 'feature/shared-filter' into feature/shared-article
|
2024-01-22 11:46:29 +03:00 |
|
|
|
47ab8b82ab
|
Web: Fixed after merge.
|
2024-01-19 13:53:35 +03:00 |
|
|
|
798578ff0b
|
Shared:Article: rewrite to typescript
|
2024-01-19 10:47:05 +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 |
|
|
|
1d2cabdc4e
|
Shared:Constants\Enums: move from common
|
2023-12-29 10:06:37 +03:00 |
|
|
|
ba8eb86842
|
Shared:Components:DateTimePicker: rewrite to typescript
|
2023-12-25 11:49:09 +03:00 |
|
|
|
e3c0b62078
|
Shared:Components:SaveCancelButtons: rewrite to typescript
|
2023-12-21 17:41:01 +03:00 |
|
|
|
a6903a78f5
|
Shared:Components:RoomLogo: rewrite to typescript
|
2023-12-15 11:31:10 +03:00 |
|
|
|
38d19eb0b4
|
Shared: refactoring and apply code guide style
|
2023-12-05 19:52:30 +03:00 |
|
|
|
7b5df6161e
|
Shared: fix eslint warnings
|
2023-11-24 10:43:45 +03:00 |
|
|
|
5be7801fb9
|
Shared: init workspace, fix storybook, fix jest, add react-testing-library
|
2023-11-23 18:25:24 +03:00 |
|
