|
|
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 |
|
|
|
9a12f3f8f5
|
Merge pull request #278 from ONLYOFFICE/feature/create-group-requirements-update
Feature/create group requirements update
|
2024-02-22 00:34:40 +04:00 |
|
|
|
25a416ea4e
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-02-22 00:20:28 +04:00 |
|
|
|
696afd4bef
|
Merge pull request #269 from ONLYOFFICE/feature/rewrite-loaders
Feature/rewrite loaders
|
2024-02-21 20:12:48 +04:00 |
|
|
|
3d981d2ac6
|
Merge branch 'develop' into feature/rewrite-loaders
|
2024-02-21 19:53:33 +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 |
|
|
|
c7e6834bb6
|
Web: Client: Profile: added parameters for saving the room filter
|
2024-02-21 20:27:37 +05:00 |
|
|
|
c9f1a2e42d
|
Web: Client: Article: added parameters for saving the room filter
|
2024-02-21 20:27:21 +05:00 |
|
|
|
818329f31a
|
Web: Client: Store: added parameters for saving the room filter
|
2024-02-21 20:27:00 +05:00 |
|
|
|
0930971cea
|
Web: Client: Home: added parameters for saving the room filter
|
2024-02-21 20:26:21 +05:00 |
|
|
|
4a2d6f3e76
|
Web: Client: Components: EmptyContainer: added parameters for saving the room filter
|
2024-02-21 20:25:37 +05:00 |
|
|
|
ef3b07707a
|
edited fr
|
2024-02-21 18:19:59 +03:00 |
|
|
|
d1c1f810a5
|
Web: Shared: expanded the room filter so that it could be saved
|
2024-02-21 20:17:43 +05:00 |
|
namushka
|
5f64d39250
|
Removed groups restriction for GroupManager when creating and editing
|
2024-02-21 17:05:45 +03: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 |
|
|
|
63006ba2af
|
Client:Components:AddUsersPanel: fix after merge
|
2024-02-21 16:00:09 +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 |
|
namushka
|
5f035ef9c5
|
fix bad merge
|
2024-02-21 15:45:41 +03:00 |
|
|
|
28887e1017
|
Web: Files: fixed dnd
|
2024-02-21 15:41:58 +03:00 |
|
|
|
e45bb7cc6b
|
Merge pull request #276 from ONLYOFFICE/bugfix/empty-screen
bugfix/empty-screen
|
2024-02-21 15:48:25 +04:00 |
|
|
|
d6ea572210
|
Merge branch 'develop' into bugfix/empty-screen
|
2024-02-21 15:33:53 +04:00 |
|
|
|
7b2f01c376
|
Merge branch 'bugfix/rc-2.5.0' into bugfix/safe-area
|
2024-02-21 14:32:25 +03:00 |
|
|
|
a55dee1156
|
Client: Profile: fix styles
|
2024-02-21 14:32:21 +03:00 |
|
|
|
7e2cd63639
|
Common: add profile wrapper styles
|
2024-02-21 14:31:58 +03:00 |
|
|
|
a7ea6fc4e0
|
Shared:API:People: add groups to user types
|
2024-02-21 12:32:50 +03:00 |
|
|
|
b5098c07c9
|
Shared:Components:Filter: fix types
|
2024-02-21 12:32:33 +03:00 |
|
|
|
de84f7c1be
|
Shared:Selectors:Groups: update types
|
2024-02-21 12:27:45 +03:00 |
|
|
|
dd5d5b48c9
|
Shared:API:Groups: rewrite to typescript
|
2024-02-21 12:27:22 +03:00 |
|
|
|
b84557f9da
|
Merge pull request #277 from ONLYOFFICE/bugfix/fixed-sdk-crash
Web: Files: Sdk: fixed settingsTree keys
|
2024-02-21 12:22:50 +04:00 |
|
|
|
fe2c33a9bb
|
Web: Files: Sdk: fixed settingsTree keys
|
2024-02-21 11:20:19 +03:00 |
|
Akmal Isomadinov
|
58b2bc53a5
|
Fix after merge
|
2024-02-21 11:50:44 +05:00 |
|
Akmal Isomadinov
|
c7cf081d86
|
Merge branch 'develop' into feature/rewrite-loaders
# Conflicts:
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/common/components/Loaders/index.js
# packages/shared/skeletons/settings/SettingsStorageManagementLoader.js
|
2024-02-21 11:41:47 +05:00 |
|
Akmal Isomadinov
|
cd18de0373
|
Merge branch 'develop' into bugfix/empty-screen
# Conflicts:
# packages/client/src/store/FilesStore.js
|
2024-02-21 10:39:43 +05:00 |
|
|
|
1449f5ae1e
|
Merge branch 'bugfix/rc-2.5.0' into develop
|
2024-02-20 22:37:37 +04:00 |
|
|
|
0cb334eb11
|
Merge pull request #260 from ONLYOFFICE/feature/user-quota
Feature/user quota
|
2024-02-20 22:29:32 +04:00 |
|
|
|
a835731ae4
|
Web: Fixed after merge.
|
2024-02-20 20:27:56 +03:00 |
|
Akmal Isomadinov
|
c8d65c474d
|
Client:Store:FilesStore: Fixed empty screen flickering
|
2024-02-20 22:26:00 +05:00 |
|
|
|
123326cfc5
|
Web: Fixed after merge.
|
2024-02-20 20:19:24 +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 |
|
|
|
704db21ed4
|
Web: Values updated in accordance with the response from the method API.
|
2024-02-20 19:18:34 +03:00 |
|
|
|
dfe05b707a
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-20 14:36:45 +03:00 |
|
Akmal Isomadinov
|
35cdc8e5e8
|
fix after merge
|
2024-02-20 16:35:52 +05:00 |
|
