Commit Graph

235 Commits

Author SHA1 Message Date
621b75bb38 Merge branch 'develop' into feature/login-nextjs 2024-04-23 12:51:03 +03:00
Akmal Isomadinov
0623e57d9e Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/doceditor/src/utils/index.ts
2024-04-19 16:42:10 +05:00
8a202e1d79 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/Article/MainButton/index.js
#	packages/shared/utils/common.ts
2024-04-19 13:13:00 +04:00
3990c6d001 Fix Bug 67516 - Rooms.Search.Tag. The tag is broken down character by character on the page when you select a search by tag. 2024-04-18 15:48:18 +04:00
d4f66f20de Merge branch 'release/v2.5.0' into feature/language-combobox
# Conflicts:
#	packages/client/src/components/NavMenu/sub-components/header-unauth.js
#	packages/login/src/client/components/Login.tsx
#	packages/login/src/client/components/sub-components/LoginForm.tsx
#	packages/login/src/server/lib/helpers/index.ts
#	packages/shared/api/user/index.js
#	packages/shared/utils/common.ts
2024-04-18 11:52:48 +03:00
22c73d5bfa Login/Shared: Added support for changing the language when logging in via social networks. 2024-04-17 13:38:59 +03:00
918daa782c Web: Added changing the language without reloading the page. 2024-04-16 16:12:02 +03:00
Akmal Isomadinov
c4e5b3f891 Doceditor:Hooks:useEditorEvents Added api method start filling 2024-04-12 17:12:51 +05:00
e893dd568a Merge branch 'develop' into feature/login-nextjs 2024-04-11 11:27:37 +03:00
7206ee6205 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/store/DialogsStore.js
2024-04-10 20:09:16 +04:00
e998e52e49 Shared: API: add skip logout 2024-04-10 15:01:25 +03:00
f68db1622c Merge branch 'develop' into refactoring/remove-personal
# Conflicts:
#	packages/client/src/components/dialogs/ConnectDialog/index.js
#	packages/client/src/pages/About/AboutContent.js
2024-04-08 01:23:49 +04:00
b1e363fcbf Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/pages/Home/Section/Header/index.js
2024-04-08 01:20:28 +04:00
46fcdfa692 Fixed Bug 67287 - Roms.InviteUsers. Add the inscription Invited to the group invite selector. 2024-04-06 09:12:42 +03:00
820da7bb80 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/Article/MainButton/index.js
#	packages/client/src/components/FilesSelector/index.tsx
#	packages/client/src/components/FilesSelector/utils.ts
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/client/src/store/SelectedFolderStore.ts
#	packages/doceditor/src/app/create/page.tsx
2024-04-04 11:15:24 +04: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
9c6f8d9ca4 Web: Login, Shared: remove personal 2024-03-29 16:30:58 +05:00
55d3dfb3b4 Merge branch 'develop' into feature/login-nextjs 2024-03-29 12:46:18 +03:00
7c550614fd Shared: add support nextjs 2024-03-29 11:45:01 +03:00
09bdc7e382 Merge branch 'release/v2.5.0' into develop 2024-03-26 14:38:57 +04: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
027646f8ea Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/doceditor/src/app/global-error.tsx
#	packages/doceditor/src/components/Root.tsx
#	packages/doceditor/src/hooks/useUpdateSearchParamId.ts
#	packages/doceditor/src/utils/actions.ts
#	packages/doceditor/src/utils/index.ts
2024-03-22 16:20:48 +04:00
c9234fec72 Replaced copyright start year + format 2024-03-21 18:09:55 +04:00
043f584109 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
2024-03-18 14:55:42 +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
83d90ef0f4 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/doceditor/src/app/create/page.tsx
2024-03-15 15:47:11 +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
a9380b879e Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/GlobalEvents/CreateEvent.js
#	public/locales/en/Common.json
2024-03-14 17:47:38 +04:00
Akmal Isomadinov
fe1ace1795 Merge branch 'develop' into feature/redesign-form-filling-room
# Conflicts:
#	public/locales/en/Common.json
2024-03-13 16:38:57 +05: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
Akmal Isomadinov
fe26a57c41 Merge branch 'develop' into feature/redesign-form-filling-room 2024-03-06 16:29:27 +05: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
Akmal Isomadinov
f9472f4d9e Shared:Selectors:Files:FilesSelector Fixed the folder icon and disabling folders 2024-02-27 16:48:07 +05: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
2c5c3c6e99 Shared: Api: Settings: Added tagManagerId for PortalSetting type 2024-02-19 12:25:19 +03:00
58907d0792 Shared: update types 2024-02-19 10:35:57 +03:00
Vladimir Khvan
3ba7f84446 Web: Client: data import: fixed logs request 2024-02-16 16:04:29 +05: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
5b28408a17 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/store/SelectedFolderStore.js
#	packages/client/src/store/TableStore.js
#	packages/client/src/store/index.js
#	packages/shared/store/CurrentQuotaStore.ts
#	packages/shared/utils/common.ts
#	public/locales/en/Common.json
2024-02-14 12:15:32 +03:00
82bc9edd56 Shared: fix eslint errors 2024-02-14 11:04:06 +03:00
904d828732 Web: Client: Add filters to People, Groups, InsideGroup (Accounts) 2024-02-13 21:48:47 +01:00
9b9b20a493 Web: Client: Add showing groups in members panel. Add members search/ 2024-02-13 18:50:56 +01:00
eaf83a10d4 Web: Client: Add inviting groups to room 2024-02-13 16:53:24 +01:00
05739c17b3 Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-13 14:49:46 +03:00
Vladimir Khvan
719ffe2b60 Merge branch 'develop' into feature/data-migration
Conflicts:
	packages/client/src/routes/portalSettings.js
	packages/client/src/store/DialogsStore.js
	packages/client/src/store/index.js
	packages/common/constants/index.js
	packages/components/file-input/index.js
	packages/components/paging/index.js
	packages/components/progress-bar/index.js
	packages/components/row/index.js
	packages/components/table-container/TableGroupMenu.js
	packages/components/themes/base.js
	packages/shared/api/settings/index.ts
	packages/shared/components/paging/Paging.styled.ts
	packages/shared/components/table/sub-components/TableHeaderCell.tsx
	packages/shared/utils/catalogIconHelper.ts
	public/locales/en/Common.json
2024-02-13 16:16:29 +05:00
695c899b32 Shared:Components:Share: move from client and rewrite to typescript 2024-02-13 10:10:31 +03:00
399d4604ea Merge branch 'develop' into feature/editor-nextjs 2024-02-12 12:39:10 +03:00
4743a9b0f2 Merge branch 'develop' into bugfix/selectors 2024-02-09 17:37:53 +03:00
c42cc9587d Merge branch 'develop' into bugfix/selectors 2024-02-09 14:37:25 +03:00
e46207cf8b Shared:Selectors:Files: init, fix usage, rewrite to typescript additional components 2024-02-09 12:28:10 +03:00
b92f8251f4 Web: Files: InvitePanel: fixed user rights 2024-02-08 18:04:46 +03:00
d596b06477 Web: Client: fixed the soapy image in the profile preview 2024-02-08 16:00:40 +05:00
07c1d4372c
Merge pull request #212 from ONLYOFFICE/feature/rewrite-stores
Feature/rewrite stores
2024-02-07 18:29:30 +04:00
0111dd2ebc Doceditor:SelectFileDialog: init 2024-02-07 15:59:08 +03:00
7ca44dd09e Shared: API: delete useless 2024-02-07 15:52:55 +03:00
a7be3428bb Fixed after merge. 2024-02-06 16:13:16 +03:00
c97bb3e4ce Shared:API: fix types 2024-02-06 12:13:21 +03:00
d385474caa Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/components/GlobalEvents/CreateRoomEvent.js
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/components/MainBar/Bar.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/client/src/helpers/constants.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/pages/Home/Section/AccountsBody/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Filter/index.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/UsersStore.js
#	packages/client/src/store/index.js
#	packages/common/store/AuthStore.js
#	packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
#	packages/shared/api/files/index.ts
#	packages/shared/api/files/types.ts
#	packages/shared/store/CurrentQuotaStore.ts
#	packages/shared/store/UserStore.ts
#	public/locales/en/Common.json
2024-02-06 11:52:52 +03:00
50749cb6f5 Web: Fixed api types. 2024-02-06 10:08:12 +03:00
573844d77f Shared:API: fix types 2024-02-01 10:20:27 +03:00
94eaa55676 Merge branch 'feature/rewrite-stores' into feature/refactoring-selectors 2024-01-30 17:53:18 +03:00
79d2861d1a Shared:Selectors:Files: move from client 2024-01-30 17:39:36 +03:00
153ce3749c Shared:Selectors:Room: fix types 2024-01-30 11:09:00 +03:00
c2431cc9f2 Merge branch 'feature/refactoring-auth-store' into feature/rewrite-stores 2024-01-30 09:32:51 +03:00
9a3279c6d7 Merge branch 'develop' into feature/refactoring-auth-store 2024-01-30 09:32:03 +03:00
4abcf1e88c Restore enable third-party switch 2024-01-29 21:07:45 +04:00
d34f1c9e33 Restored third-parties api methods 2024-01-29 21:07:00 +04:00
004818d522 Client:Store:Wizzard: rewrite to typescript 2024-01-29 16:23:37 +03:00
6d61917078 Client:Store:Payment: rewrite to typescript 2024-01-29 14:05:12 +03:00
a67ee43801 Shared:API:Plugins: rewrite to typescript 2024-01-29 13:07:28 +03:00
1a8865e9fb Web: Added quota setting for the portal. 2024-01-29 11:37:14 +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
969d9ccbb5 Merge branch 'develop' into feature/refactoring-auth-store 2024-01-26 12:11:14 +03:00
d17292bc12 Fix after merge 'develop' 2024-01-25 17:54:15 +03:00
c17fd93574 Shared:Store:AuthStore: rewrite to typescript 2024-01-25 16:14:13 +03:00
6757092523 Shared:Store:SettingsStore: move from common and rewrite to typescript 2024-01-25 11:17:19 +03:00
a3c039f731 Shared:Store:PaymentQuotasStore: move from common, rewrite to typescript and update using without auth store 2024-01-24 15:12:59 +03:00
f77842b26f Shared:Store:CurrentQuotaStore: rewrite to typescript 2024-01-23 18:13:44 +03:00
094a6421e6 Shared:Store:CurrentTariffStatusStore: move from common, rewrite to typescript and update using without auth store 2024-01-23 16:45:42 +03:00
772ec79d99 Web: Files: Upload: moved chunkUploadCount to SettingsStore 2024-01-23 16:44:34 +03:00
b3629d1386 Shared:Store:TfaStore: move from common, rewrite to typescript and update using without auth store 2024-01-23 12:55:19 +03:00
541943a9f3 Shared:Store:UserStore: move from common, rewrite to typescript and update using without auth store 2024-01-23 12:19:03 +03:00
b9a34f8c4e Shared: fix eslint and ts problems 2024-01-23 10:24:57 +03:00
6ec3000fa8 Merge branch 'develop' into feature/shared-filter 2024-01-22 10:03:42 +03:00
47ab8b82ab Web: Fixed after merge. 2024-01-19 13:53:35 +03:00
1e0c383514 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
#	packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/api/files/index.js
#	packages/common/constants/index.js
#	packages/common/store/CurrentQuotaStore.js
#	packages/components/combobox/index.js
#	packages/components/themes/base.js
#	packages/components/toggle-button/index.js
#	packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
#	packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
#	packages/shared/api/people/filter.js
#	packages/shared/api/rooms/filter.js
#	packages/shared/utils/common.ts
#	yarn.lock
2024-01-19 11:32:34 +03:00
387a4dd6be Shared: API: Files: ts fix 2024-01-17 13:09:25 +03: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
fd20d07e6b Shared: API: add new method 2024-01-16 12:21:42 +03: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
40ea337a93 Shared:API:Files: fix moveto 2024-01-15 14:47:38 +03:00
7a2709b1f6 Shared:Utils:Common\Api: move from common and rewrite to typescript 2024-01-14 09:13:04 +03:00