Commit Graph

42562 Commits

Author SHA1 Message Date
160d504b07 Web: PortalSettings: fixed MobileCategoryWrapper 2024-02-22 12:38:58 +03:00
0ed164294c Web: Files: removed the creation of a room with a third-party connection for all rooms except the public 2024-02-22 12:23:52 +03: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
ef3b07707a edited fr 2024-02-21 18:19:59 +03:00
14de1c5150 Web: Files: fixed SelectionArea for third-party folders 2024-02-21 16:05:33 +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
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
Akmal Isomadinov
35cdc8e5e8 fix after merge 2024-02-20 16:35:52 +05:00
Akmal Isomadinov
07d3824a8c Merge branch 'develop' into feature/rewrite-loaders
# Conflicts:
#	packages/client/src/components/panels/AddUsersPanel/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/NoItem/index.js
#	packages/client/src/pages/Home/Section/Submenu/index.js
#	packages/common/components/Loaders/InfoPanelBodyLoader/views/DetailsLoader.js
2024-02-20 16:25:18 +05:00
8c8900b580 Web: Files: fixed folderInfo for third-party folders 2024-02-20 13:40:33 +03:00
cc5f75aa7f Web: Files: fixed third-party folder id 2024-02-20 13:36:59 +03:00
Akmal Isomadinov
8661c352c9 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop 2024-02-20 15:00:40 +05:00
1ac244437a Merge branch 'develop' into bugfix/rc-2.5.0
# Conflicts:
#	packages/client/src/components/panels/InvitePanel/sub-components/ItemsList.js
2024-02-20 12:15:26 +04:00
cde5c71b6c
Merge pull request #268 from ONLYOFFICE/feature/groups
Feature/groups
2024-02-20 00:32:19 +04:00
5752c6a0b6 Fix groups translations 2024-02-20 00:30:49 +04:00
namushka
51bb88fecf removed SelectedGroup store 2 2024-02-19 18:57:40 +03:00
namushka
a8adc81e2b Merge branch 'feature/groups' of https://github.com/ONLYOFFICE/DocSpace-client into feature/groups 2024-02-19 18:52:13 +03:00
namushka
2344606eed fixed bad api warning 2024-02-19 18:52:11 +03:00
44606c2813 Fix bad translations 2024-02-19 19:46:53 +04:00
namushka
19a64a4a96 update on GroupMemberRow in CreateEditGroupDialog 2024-02-19 17:51:29 +03:00
namushka
b442bf555e Merge branch 'feature/groups' of https://github.com/ONLYOFFICE/DocSpace-client into feature/groups 2024-02-19 17:41:47 +03:00
namushka
b672c0579c translations update 2 + fixed insideGroup Department column 2024-02-19 17:41:44 +03:00
095aecc883 Web: Client: Fix members infinite loading after inside group selection 2024-02-19 15:08:56 +01:00
namushka
d796213a67 Translations update 2024-02-19 16:05:06 +03:00
namushka
9b3fa2f53c fixed AddUsersPanel translations 2024-02-19 15:30:56 +03:00
namushka
b54467bf34 removed SelectedGroup store 2024-02-19 15:28:57 +03:00
namushka
ae725495c5 fixed gap between InvitePanel RoleSelector and group max role warning 2024-02-19 14:59:13 +03:00
c17109bf66 Merge remote-tracking branch 'origin/feature/groups' into feature/groups 2024-02-19 12:47:49 +01:00
eb8fccce6e Web: Client: Fix members infinite loading 2024-02-19 12:47:38 +01:00
namushka
fe8ecd4b65 fix InsideGroup Navigation styling bug 2024-02-19 14:43:38 +03:00
namushka
16de35ce3d added loader to accounts section submenu 2024-02-19 14:02:37 +03:00
069afd4c76 Web: Files: fixed InfoPanel header menu 2024-02-19 13:37:58 +03:00
659b06e9a3 Web: Added recalculation of disk space if it did not already exist. 2024-02-19 13:21:05 +03:00
2bafc7de01 Web: Fixed time conversion. 2024-02-19 12:18:07 +03:00
e22d2503aa Web: Fixed data conversion. 2024-02-19 12:10:12 +03:00