Commit Graph

80 Commits

Author SHA1 Message Date
e7d651811c Merge branch 'develop' into feature/public-edit
# Conflicts:
#	packages/shared/components/access-right-select/AccessRightSelect.styled.ts
2024-08-01 16:34:06 +03:00
948add3bf4 Merge branch 'hotfix/v2.6.1' into develop 2024-07-30 20:33:27 +04:00
Akmal Isomadinov
181f311781 Web: Removed useless code 2024-07-30 13:15:05 +05:00
4615b68dc1 Merge branch 'develop' into feature/public-edit 2024-07-29 16:57:28 +04:00
d194cfeaa6 Merge branch 'develop' into feature/convert-xml-dialog 2024-07-29 16:25:06 +04:00
1972f6dc15 Merge branch 'develop' into feature/public-edit
# Conflicts:
#	public/locales/en/Common.json
2024-07-25 11:25:59 +03:00
bb31e9a89d Web: Client: Dialogs: ConvertDialog. the values ​​for conversion have been changed 2024-07-19 17:45:43 +05:00
e82fedc10d Bug 69255 - Files.Uploads. Request failed with status code 429 2024-07-19 15:10:45 +03:00
0728dd4ee3 Merge branch 'develop' into feature/convert-xml-dialog 2024-07-18 15:11:16 +05:00
c2fc3eada7 Merge branch 'develop' into feature/public-edit 2024-07-11 13:00:47 +03:00
3a3c4a6d3c Web: Files: added public-room editing 2024-07-10 19:07:53 +03:00
c788cdddae Shared:Api:Files: change method name for duplication 2024-06-24 15:27:46 +07:00
5587c01502 Shared:Api:Files: add a new method for duplication 2024-06-24 03:23:10 +07:00
Akmal Isomadinov
bf4cf3a495 Client: Added the creation of a room from a pdf form 2024-05-29 16:48:03 +05:00
db22ee0060 Merge branch 'develop' into feature/selector-input 2024-05-27 17:32:14 +03:00
410f69e130 Merge branch 'develop' into feature/editor-in-same-tab 2024-05-27 16:31:42 +04:00
8ed897cde2 Merge branch 'develop' into feature/selector-input 2024-05-27 10:21:52 +03:00
594e3eba89 Shared:Selectors:Files: add create folder 2024-05-23 14:44:57 +03:00
d157e93d8a Web: Files: Public: added folder copy link 2024-05-23 14:07:46 +03:00
13a2daf4c0 Shared: add type 2024-05-21 13:01:19 +03:00
816cd9417a Merge branch 'develop' into feature/convert-xml-dialog 2024-05-20 18:21:29 +05:00
c61ecb2b65 Shared: API: add changeOpenEditorInSameTab 2024-05-17 15:55:42 +03:00
e1b3dff05c Merge branch 'hotfix/v2.5.1' into develop
# Conflicts:
#	packages/login/src/components/Login/index.tsx
2024-05-06 20:06:08 +04:00
9dca2aa67d Fix Bug 67840
The message that room is unavailable appears for a second
2024-05-06 13:37:23 +03:00
4e1553d9be Merge branch 'develop' into feature/public-preview 2024-05-03 15:36:07 +04:00
Vladimir Khvan
aa878a4d3c Merge branch 'develop' into feature/connecting-storage
Conflicts:
	packages/shared/api/files/index.ts
2024-04-30 14:38:43 +05:00
Akmal Isomadinov
d8f37f482d Shared:Components:MediaViewer Added error handler 2024-04-30 12:17:52 +05:00
Akmal Isomadinov
165918c051 Merge branch 'develop' into feature/public-preview 2024-04-26 12:18:11 +05:00
Akmal Isomadinov
78ecd38694 Shared:Api:Files: Added request token 2024-04-25 18:43:36 +05:00
Vladimir Khvan
0b349e32d7 Web: Client: Connecting storage: integrated connecting storages data from API 2024-04-25 14:06:20 +05:00
Akmal Isomadinov
68615654b4 Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/client/src/components/Article/MainButton/index.js
2024-04-24 14:09:05 +05:00
434986bb88 Merge branch 'hotfix/v2.5.1' into develop 2024-04-24 11:01:44 +04:00
namushka
fc47412b44 fixed trash tooltips not working with personal files 2024-04-23 14:49:16 +03:00
Akmal Isomadinov
c4e5b3f891 Doceditor:Hooks:useEditorEvents Added api method start filling 2024-04-12 17:12:51 +05: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
Akmal Isomadinov
b7b9b7ea7b Shared:MediaViewer Fixed Bug 67103 2024-04-01 17:08:02 +05:00
f7fd3bc30d Web: Client: the format parameter is added by condition 2024-03-29 15:49:22 +05: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
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
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
Akmal Isomadinov
fe26a57c41 Merge branch 'develop' into feature/redesign-form-filling-room 2024-03-06 16:29:27 +05:00
ee7e795b7f Shared:API:Files: uncomment API method 2024-03-05 13:55:15 +03:00
Akmal Isomadinov
f9472f4d9e Shared:Selectors:Files:FilesSelector Fixed the folder icon and disabling folders 2024-02-27 16:48:07 +05:00
ae1dcebff6 Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-22 10:53:18 +03:00
560958351a Merge branch 'develop' into bugfix/selectors 2024-02-21 16:26:10 +03:00