IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,216 Commits 40 Branches 22 Tags 420 MiB
389219f135
Commit Graph

54 Commits

Author SHA1 Message Date
Alexey Safronov
86e35787fc Merge branch 'hotfix/v2.5.1' into develop 2024-04-23 13:59:33 +04:00
Timofey Boyko
2205065fc0 Fixed Bug 67556 - Files.Hotkeys. Closing the Copy/Move to panels using Esc does not work. 2024-04-23 12:41:11 +03:00
Alexey Safronov
d2733829e5 Merge branch 'release/v2.5.0' into develop 2024-04-19 19:10:43 +04:00
Timofey Boyko
fa2edc960b Bug 67553 - Files.Quota. ‘Something went wrong.’ on the page when trying to create a form template from a gallery or text file if the user quota is exceeded. 2024-04-19 14:17:03 +03:00
Alexey Safronov
ddb9f74d83 Merge branch 'release/v2.5.0' into develop 
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/doceditor/src/app/(root)/create/page.tsx
#	public/locales/en/Common.json
 2024-04-12 19:14:59 +04:00
Tatiana Lopaeva
d47acaeda2 Client/Shared: added a filter for rooms in storage management settings. 2024-04-11 15:32:32 +03:00
Alexey Safronov
76c29e1335 Merge branch 'develop' into feature/form-room-modals 2024-04-08 01:39:14 +04:00
Alexey Safronov
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
Akmal Isomadinov
f25805efcb Client:Dialogs:CreatedPDFFormDialog Added toast 2024-04-02 15:52:56 +05:00
Timofey Boyko
c5d6489d7f Doceditor: show access denied and file not found errors in doceditor 2024-04-02 09:47:50 +03:00
Viktor Fomin
6071f140e8 Fix Bug 67078 2024-03-27 13:28:07 +03:00
Alexey Safronov
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
Alexey Safronov
c9234fec72 Replaced copyright start year + format 2024-03-21 18:09:55 +04:00
Ilya Oleshko
91084ac9f8 Client: PortalSettings: Branding: Added enum types for inputs 2024-03-19 15:55:09 +03:00
Alexey Safronov
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
Timofey Boyko
11b4f67041 Shared: apply yarn eslint:fix 2024-03-18 12:54:09 +03:00
Alexey Safronov
adcc11094d Copyright 2024 2024-03-18 03:13:02 +04:00
Alexey Safronov
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
Akmal Isomadinov
e00f565eec Client:Article:MainButton Fixed parent room type 2024-03-13 15:55:55 +05:00
Akmal Isomadinov
5fad4f34b8 Client:Article:MainButton: Added form file selection actions 2024-03-13 15:24:41 +05:00
Ilya Oleshko
8c3aa58e93 Shared: Enums: Added UrlActionType enum 2024-03-11 21:59:56 +03:00
Viktor Fomin
64f838a027 Fix Bug 66836 2024-03-11 17:59:33 +03:00
Alexey Safronov
176d1c7f16 Merge branch 'develop' into feature/data-migration 2024-03-05 22:09:00 +04:00
Elyor Djalilov
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
DmitrySychugov
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
DmitrySychugov
375cac4488 Web: Shared: Enums: corrected dropbox names 2024-03-05 16:37:12 +05:00
Aleksandr Lushkin
b1d41ff86c Web: Shared: Add MembersSubjectType enum. Fix bad member group view. 2024-03-04 16:46:28 +01:00
Alexey Safronov
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
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
Viktor Fomin
3fa4ecfdb7 Merge branch 'develop' into feature/ads-banner 2024-02-20 23:37:40 +03:00
Tatiana Lopaeva
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
Vladimir Khvan
446be44db4 Merge branch 'develop' into feature/data-migration 
Conflicts:
	public/locales/en/Common.json
 2024-02-20 14:03:51 +05:00
Viktor Fomin
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
Aleksandr Lushkin
904d828732 Web: Client: Add filters to People, Groups, InsideGroup (Accounts) 2024-02-13 21:48:47 +01:00
Aleksandr Lushkin
eaf83a10d4 Web: Client: Add inviting groups to room 2024-02-13 16:53:24 +01: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
Viktor Fomin
ebff35be27 Shared: fix after merge 2024-02-01 23:29:29 +03:00
Tatiana Lopaeva
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
Tatiana Lopaeva
2b48a75d81 Web: Fixed after merge. 2024-01-24 11:53:37 +03:00
Tatiana Lopaeva
dc39ac251b Web: Fixed after merge. 2024-01-23 08:12:08 +03:00
Timofey Boyko
6c47a8be26 Merge branch 'feature/shared-filter' into feature/shared-article 2024-01-22 11:46:29 +03:00
Tatiana Lopaeva
47ab8b82ab Web: Fixed after merge. 2024-01-19 13:53:35 +03:00
Timofey Boyko
798578ff0b Shared:Article: rewrite to typescript 2024-01-19 10:47:05 +03:00
Alexey Safronov
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
Timofey Boyko
1d2cabdc4e Shared:Constants\Enums: move from common 2023-12-29 10:06:37 +03:00
Timofey Boyko
ba8eb86842 Shared:Components:DateTimePicker: rewrite to typescript 2023-12-25 11:49:09 +03:00
Timofey Boyko
e3c0b62078 Shared:Components:SaveCancelButtons: rewrite to typescript 2023-12-21 17:41:01 +03:00