|
e998e52e49
|
Shared: API: add skip logout
|
2024-04-10 15:01:25 +03:00 |
|
|
46fcdfa692
|
Fixed Bug 67287 - Roms.InviteUsers. Add the inscription Invited to the group invite selector.
|
2024-04-06 09:12:42 +03:00 |
|
namushka
|
825d8626a8
|
Merge branch 'release/v2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.5.0
|
2024-04-02 13:30:47 +03:00 |
|
namushka
|
a049560a44
|
added locale-dependent guide links
|
2024-04-02 13:28:57 +03:00 |
|
Akmal Isomadinov
|
b7b9b7ea7b
|
Shared:MediaViewer Fixed Bug 67103
|
2024-04-01 17:08:02 +05:00 |
|
|
9795e231d5
|
Merge branch 'release/v2.5.0' into feature/show-disabled-users
|
2024-03-26 13:43:38 +04:00 |
|
|
8666c97257
|
Fix Bug 67092
|
2024-03-26 12:10:09 +03:00 |
|
|
e8aef49cf6
|
Shared:API:People: add 'shared' prop to TUser
|
2024-03-26 11:34:40 +03:00 |
|
|
c9234fec72
|
Replaced copyright start year + format
|
2024-03-21 18:09:55 +04:00 |
|
|
11b4f67041
|
Shared: apply yarn eslint:fix
|
2024-03-18 12:54:09 +03:00 |
|
|
adcc11094d
|
Copyright 2024
|
2024-03-18 03:13:02 +04:00 |
|
|
4a1ed878e9
|
Client: Fix return to groups page after updating group from InsideGroup. Fix when data in info panel is not updated after updating group.
|
2024-03-14 21:48:05 +01:00 |
|
|
d3a9c5e1ba
|
Fix bug 66389 - Rooms.Files.VersionHistory. The date in the version history in the editor is displayed incorrectly after co-editing.
|
2024-03-12 11:32:22 +03:00 |
|
|
1f1f330557
|
Fix Bug 66813
|
2024-03-11 17:39:00 +03:00 |
|
|
59bc5c30a6
|
Merge pull request #303 from ONLYOFFICE/feature/data-migration
feature/data-migration
|
2024-03-06 21:07:37 +04:00 |
|
|
2c5c39114c
|
Shared: fix some typescript errors
|
2024-03-06 12:37:13 +03:00 |
|
|
eb28b234ff
|
Merge branch 'develop' into feature/data-migration
|
2024-03-06 12:55:29 +04:00 |
|
|
b0a94d1629
|
Shared: fix eslint errors and warnings
|
2024-03-06 11:45:42 +03:00 |
|
|
176d1c7f16
|
Merge branch 'develop' into feature/data-migration
|
2024-03-05 22:09:00 +04:00 |
|
|
82f32d8b0b
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/client/src/routes/portalSettings.js
# packages/client/src/store/DialogsStore.js
|
2024-03-05 20:12:08 +05:00 |
|
|
ee7e795b7f
|
Shared:API:Files: uncomment API method
|
2024-03-05 13:55:15 +03:00 |
|
|
b1d41ff86c
|
Web: Shared: Add MembersSubjectType enum. Fix bad member group view.
|
2024-03-04 16:46:28 +01:00 |
|
|
442df9bc65
|
Web: Client: Fix bad view of group without manager
|
2024-03-04 16:22:39 +01:00 |
|
|
f72d8af2b9
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# packages/client/src/store/index.js
# public/locales/en/Common.json
|
2024-03-04 14:30:41 +04:00 |
|
namushka
|
63e0f8a6ec
|
updated editGroup api and EditGroupDialog
|
2024-03-01 11:57:03 +03:00 |
|
namushka
|
d4134fa09b
|
merge develop + merge fix
Conflicts:
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableContainer.js
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
|
2024-03-01 02:18:24 +03:00 |
|
|
40a8db9d4c
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-29 18:00:55 +03:00 |
|
Vladimir Khvan
|
3c5763afab
|
Web: Client: Data import: delay was added / clear request was added
|
2024-02-29 18:00:20 +05:00 |
|
|
95c2928f38
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# packages/shared/components/table/sub-components/TableHeaderCell.tsx
|
2024-02-29 11:41:02 +04:00 |
|
namushka
|
2798591800
|
merge + merge fix
|
2024-02-28 13:22:28 +03:00 |
|
namushka
|
dae3fa60f7
|
added EditGroupMembersDialog
|
2024-02-28 13:11:40 +03:00 |
|
|
8aef7caf62
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-27 12:53:21 +03:00 |
|
Vladimir Khvan
|
abb8ee3464
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/public/locales/en/People.json
packages/client/public/locales/en/Settings.json
packages/client/public/locales/ru/People.json
packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
packages/client/src/pages/PortalSettings/utils/settingsTree.js
packages/client/src/store/index.js
packages/shared/enums/index.ts
packages/shared/themes/base.ts
packages/shared/themes/dark.ts
|
2024-02-27 14:51:49 +05:00 |
|
|
15ddf95e3b
|
Merge branch 'develop' into feature/invite-page-redesign
|
2024-02-26 20:49:56 +04:00 |
|
|
d812437b4a
|
Web: Shared: added filter reset when there is an error in the storage
|
2024-02-26 15:39:03 +05:00 |
|
|
cd7805b4ca
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-26 11:16:55 +03:00 |
|
|
373ccbdce8
|
Merge branch 'develop' into feature/saving-room-filter
|
2024-02-26 11:10:28 +04:00 |
|
|
ef9ec57576
|
Merge pull request #281 from ONLYOFFICE/feature/tag-manager
Feature/tag manager
|
2024-02-22 22:31:26 +04:00 |
|
|
ae1dcebff6
|
Merge branch 'bugfix/selectors' into feature/editor-nextjs
|
2024-02-22 10:53:18 +03:00 |
|
|
75b5716dcc
|
Merge branch 'bugfix/rc-2.5.0' into feature/tag-manager
|
2024-02-22 10:00:47 +03: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 |
|
|
d1c1f810a5
|
Web: Shared: expanded the room filter so that it could be saved
|
2024-02-21 20:17:43 +05:00 |
|
|
560958351a
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-21 16:26:10 +03:00 |
|
|
89f6a4f319
|
Shared:API: fix types for selectors
|
2024-02-21 15:58:40 +03:00 |
|
|
a7ea6fc4e0
|
Shared:API:People: add groups to user types
|
2024-02-21 12:32:50 +03:00 |
|
|
dd5d5b48c9
|
Shared:API:Groups: rewrite to typescript
|
2024-02-21 12:27:22 +03:00 |
|
|
3b9afab76d
|
Web: Added a transition to the login page if the user already exists.
|
2024-02-20 22:00:57 +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 |
|
|
dfe05b707a
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-20 14:36:45 +03:00 |
|
Vladimir Khvan
|
446be44db4
|
Merge branch 'develop' into feature/data-migration
Conflicts:
public/locales/en/Common.json
|
2024-02-20 14:03:51 +05:00 |
|