Commit Graph

308 Commits

Author SHA1 Message Date
7d22ea855e Shared: fix eslint errors 2024-03-21 18:04:19 +03:00
c9234fec72 Replaced copyright start year + format 2024-03-21 18:09:55 +04:00
93ab155615 Removed support of "x-forwarded-port" 2024-03-21 13:15:41 +04:00
129d570763 Fix loading campaign (added checkExists by HEAD method) 2024-03-20 14:59:10 +04:00
a98a3e6f22 Web: Added opening a new tab when you click on the middle mouse button. Added general function. 2024-03-20 10:27:28 +03:00
b99ff63631 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/doceditor/src/app/create/page.tsx
2024-03-19 11:37:59 +04:00
f6db2d8bc4 Fix Bug 66972 2024-03-18 17:47:03 +03: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
7141573bd2
Merge pull request #311 from ONLYOFFICE/feature/update-react-toastify
feature/update-react-toastify
2024-03-15 18:32:42 +04:00
050f83f070 Shared: Utils: Fixed redirect after 403 for frame 2024-03-15 16:43:29 +03:00
fbae889580 Merge branch 'release/v2.5.0' into feature/update-react-toastify 2024-03-15 16:18:23 +04:00
59cc588fb1 Merge branch 'release/v2.5.0' into develop 2024-03-15 15:48:39 +04:00
e09ef8326e Shared: Fix when dropdown stucks in display none after window resizing 2024-03-15 11:47:28 +01:00
3e1d547f71 Merge branch 'release/v2.5.0' into feature/update-react-toastify 2024-03-14 18:23:26 +03:00
c15f18ee63 Shared: CrashReport: init sendToastReport 2024-03-14 18:22:44 +03:00
ef0976a589 Shared: Firebase: init sendToastReport 2024-03-14 18:22:02 +03: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
c52600bf75 Web: Files: fixed publicRoomKey 2024-03-14 15:55:12 +03:00
Akmal Isomadinov
bbd173d4a0 Client: Added public preview 2024-03-14 17:54:21 +05:00
ecd7b776da Merge branch 'release/v2.5.0' into feature/language-combobox
# Conflicts:
#	packages/login/src/client/components/Login.tsx
#	packages/shared/utils/common.ts
2024-03-13 19:02:04 +03:00
b0979013d7 Shared:Utils:Socket: delete useless 2024-03-13 16:06:10 +03:00
e18e2899b3 Fixed Bug 66823 - Files.Thumbnails. Thumbnails of uploaded files are displayed only after refreshing the page in thumbnail view mode 2024-03-13 16:04:21 +03: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
9949bf84f2 Socket: extend logging 2024-03-12 11:51:34 +04: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
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
91bf74e5af Merge branch 'develop' into feature/language-combobox
# Conflicts:
#	packages/login/src/client/components/Login.tsx
#	packages/shared/utils/common.ts
2024-03-05 09:54:29 +03:00
c9c1f9e0e4 Merge branch 'develop' into feature/groups 2024-03-04 19:05:50 +04:00
b3d082fbf3 Merge branch 'develop' into bugfix/public-room-media-viewer 2024-03-04 18:58:33 +04:00
6458ed9c26 Merge branch 'develop' into feature/groups
# Conflicts:
#	packages/client/src/pages/Home/Section/AccountsBody/Groups/TableView/GroupsTableItem.js
#	packages/client/src/store/GroupsStore.ts
2024-03-04 18:52:18 +04:00
3ab3ac5c33 Fix doceditor build 2024-03-04 17:39:02 +04:00
77b5986876 Merge branch 'master' into develop
# Conflicts:
#	packages/client/src/routes/client.js
#	packages/client/src/routes/confirm.js
#	packages/client/src/routes/general.js
#	packages/client/src/routes/portalSettings.js
#	packages/common/package.json
#	packages/components/scrollbar/styled-scrollbar.js
#	packages/editor/package.json
#	packages/shared/package.json
#	packages/shared/utils/component-loader.ts
2024-03-04 17:38:42 +04:00
Akmal Isomadinov
1e0d6e89ab Merge branch 'bugfix/rc-2.5.0' into bugfix/public-room-media-viewer
# Conflicts:
#	packages/shared/utils/common.ts
2024-03-04 17:28:50 +05:00
Akmal Isomadinov
2a9fa214dd Client:PublicRoom Fixed preview in the public room 2024-03-04 17:14:33 +05:00
582f95162d Web: Added language support for login page. 2024-03-04 13:33:18 +03: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
Akmal Isomadinov
653ca4fb44 Client:PublicRoom: Fixed a redirection error when reloading a page in the media viewer 2024-03-04 15:18:43 +05:00
39ffe5897d Web: Added language switching on the login page when switching from the invitation page. 2024-03-03 11:21:01 +03:00
98736d1273 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop 2024-03-01 20:18:53 +05:00
305630513f Web: moved parseDomain to shared 2024-03-01 19:43:50 +05:00
1406d3fb87 Added x-forwarded-port (docker on another port issue) 2024-03-01 17:50:31 +04:00
718455ee09 Web: added xlsb icons 2024-03-01 15:37:04 +05: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
8261228759 Merge branch 'develop' into feature/editor-nextjs 2024-02-29 18:08:07 +03:00
40a8db9d4c Merge branch 'develop' into feature/editor-nextjs 2024-02-29 18:00:55 +03:00
6152d587c6
Merge pull request #264 from ONLYOFFICE/feature/ads-banner
feature/ads-banner
2024-02-29 18:24:57 +04:00
namushka
89235ef2d2 refactor EditGroupMembersDialog 2024-02-29 11:48:14 +03: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
f9b0599a07 Merge branch 'bugfix/rc-2.5.0' into develop 2024-02-29 11:04:48 +04:00
daa1f5c95a Merge branch 'develop' into feature/ads-banner 2024-02-29 00:05:12 +03:00
d109696360
Merge pull request #284 from ONLYOFFICE/feature/invite-page-redesign
Feature/invite page redesign
2024-02-28 19:44:18 +04:00
5c6b61d71a
Merge pull request #288 from ONLYOFFICE/feature/portal-name-validation
Feature/portal name validation
2024-02-28 18:23:57 +04:00
6cb13bd589 Web: moved validatePortalName to shared 2024-02-28 19:16:33 +05:00
091cec6f25 Shared: Utils: CrashReport: add error url 2024-02-28 13:28:04 +03:00
7584ba0eae Shared: Utils: CrashReport: add device info 2024-02-28 12:58:21 +03:00
acc19b269c Merge branch 'develop' into feature/groups
# Conflicts:
#	packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/HeadOfGroupParam/index.tsx
2024-02-27 16:32:55 +01: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
06b54a3bf9 Web: Shared: fixed trimSeparator 2024-02-27 12:23:19 +03:00
e5e3c72ac5 Update firebase version 2024-02-27 12:03:13 +03:00
15ddf95e3b Merge branch 'develop' into feature/invite-page-redesign 2024-02-26 20:49:56 +04:00
4a4434b05a Shared:Utils:Firebase: fix SSR 2024-02-26 14:40:54 +03:00
a1aa83ee4a Merge branch 'develop' into feature/ads-banner 2024-02-26 14:29:58 +03:00
b5f706a635 Web: Fixed provider titles. 2024-02-26 11:53:11 +03:00
cd7805b4ca Merge branch 'develop' into feature/editor-nextjs 2024-02-26 11:16:55 +03:00
Akmal Isomadinov
c945e0f7b9 Shared:Utils:Common: fix export 2024-02-23 20:26:32 +05:00
Akmal Isomadinov
04ee2a4116 Shared:Utils:Common: Enabled form filling room 2024-02-23 20:22:46 +05:00
ef9ec57576
Merge pull request #281 from ONLYOFFICE/feature/tag-manager
Feature/tag manager
2024-02-22 22:31:26 +04:00
112fdb1839 Merge branch 'develop' into feature/ads-banner
# Conflicts:
#	packages/shared/components/article/sub-components/SubmitToFormGalleryAlert.tsx
2024-02-22 20:05:26 +04:00
45dfb67961 Web: Shared: Set type for theme interfaceDirection. Move TInterfaceDirection to avoid cycle import. 2024-02-22 15:34:42 +01:00
3aac4cd2fb Merge branch 'develop' into feature/editor-nextjs 2024-02-22 13:17:33 +03:00
3bda83bc41 Merge branch 'develop' into feature/disable-form-room 2024-02-22 14:00:09 +04:00
Akmal Isomadinov
4c11e86c37 Shared:Utils:Common: Disable form filling room 2024-02-22 13:37:23 +05: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
560958351a Merge branch 'develop' into bugfix/selectors 2024-02-21 16:26:10 +03:00
50bb9d0800 Shared: Campaigns: add fallback for translations 2024-02-21 12:12:33 +03:00
3fa4ecfdb7 Merge branch 'develop' into feature/ads-banner 2024-02-20 23:37:40 +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
38394be19c Merge branch 'develop' into feature/ads-banner 2024-02-20 01:35:08 +03:00
1ac6e6e161 Shared: Utils: fix naming 2024-02-19 20:38:47 +03:00
eef27ebdf9 Shared: AuthStore: Added insertDataLayer after login 2024-02-19 13:41:03 +03:00
d21993ac74 Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-19 13:00:10 +03:00
9e5bd64a6c Shared: Store: SettingsStore: Moved insertTagManager method to common utils 2024-02-19 12:57:40 +03:00
Vladimir Khvan
2bb8ef1d49 Merge branch 'develop' into feature/data-migration
Conflicts:
	packages/client/src/components/dialogs/index.js
	packages/client/src/routes/portalSettings.js
2024-02-19 14:28:07 +05:00
80684f33fa Merge branch 'develop' into bugfix/selectors 2024-02-19 11:52:55 +03:00
58907d0792 Shared: update types 2024-02-19 10:35:57 +03:00
10aaa19817 Merge branch 'develop' into feature/ads-banner 2024-02-18 06:08:02 +03:00
Vladimir Khvan
3ba7f84446 Web: Client: data import: fixed logs request 2024-02-16 16:04:29 +05:00
namushka
f39f000d01 Merge branch 'develop' into feature/groups
# Conflicts:
# packages/client/src/components/panels/AddUsersPanel/index.js
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/Home/Section/Submenu/index.js
# packages/client/src/routes/client.js
2024-02-16 13:40:01 +03:00
25bc1d9fdc Merge branch 'develop' into feature/user-quota 2024-02-16 01:11:33 +04:00
a1a5dd5c51 Fix Uncaught TypeError: Cannot read properties of undefined (reading 'toUnicode') 2024-02-16 01:06:04 +04:00
fd86a6ffa4 Merge branch 'develop' into feature/user-quota 2024-02-15 23:26:24 +04:00
3380ea9318 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/helpers/enums.ts
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/TableStore.js
2024-02-15 12:08:27 +03:00
7e19feebc3 Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0 2024-02-14 20:09:36 +05:00
06fecd59ba Web: fixed display of user types 2024-02-14 20:09:08 +05:00
3b571030cb Shared: Utils: add getPasswordErrorMessage 2024-02-14 16:41:26 +03:00
482cf79466 Merge branch 'develop' into feature/ads-banner 2024-02-14 14:29:59 +03:00
1f43c6de33 Shared: Utils: fix 2024-02-14 14:28:56 +03:00
405406d9e5 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/routes/portalSettings.js
#	public/locales/en/Common.json
2024-02-14 14:19:11 +03:00
41711d21dd Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-14 13:59:55 +03:00
d47aa36c85 Merge branch 'develop' into bugfix/selectors 2024-02-14 13:57:36 +03:00
4a4da98aab Shared: use firebase fetch intervals from config 2024-02-14 13:36:21 +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
904d828732 Web: Client: Add filters to People, Groups, InsideGroup (Accounts) 2024-02-13 21:48:47 +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
Akmal Isomadinov
3cb31f417a Merge branch 'develop' into feature/rewrite-error-boundary 2024-02-13 14:28:52 +05:00
f3ef4ce95c Shared: Utils: add isHideBannerForUser 2024-02-12 19:00:22 +03:00
6465508729 Shared: init campaigns utils 2024-02-12 15:26:56 +03:00
ed3ec48e2a Merge branch 'develop' into feature/ads-banner 2024-02-12 13:38:41 +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
d9b026c166 Merge branch 'develop' into feature/invite-panel-input
# Conflicts:
#	packages/client/src/components/panels/InvitePanel/sub-components/InviteInput.js
#	packages/client/src/components/panels/InvitePanel/sub-components/Item.js
2024-02-09 17:11:02 +03:00
e46207cf8b Shared:Selectors:Files: init, fix usage, rewrite to typescript additional components 2024-02-09 12:28:10 +03:00
Akmal Isomadinov
4541d4cdfa Shared:Components:ReportDialog Rewrite to typescript 2024-02-09 14:07:14 +05:00
ed76251daf Web: Shared: Utils: moved getUserTypeLabel to utilities 2024-02-09 13:15:18 +05:00
Akmal Isomadinov
17eec03a84 DocspaceLogo Rewrite to typescript 2024-02-08 20:35:53 +05:00
b92f8251f4 Web: Files: InvitePanel: fixed user rights 2024-02-08 18:04:46 +03:00
Akmal Isomadinov
f4d89afbf0 crashReport moved from client to shared 2024-02-08 19:13:57 +05:00
Akmal Isomadinov
16cb669a18 Shared:Utils:ClassNames Fixed type 2024-02-08 15:47:15 +05:00
8409a6cee7 Merge branch 'develop' into feature/invite-panel-input 2024-02-07 19:33:11 +04:00
bf750053d8 Web: Files: InviteInput: fix 2024-02-07 16:13:35 +03:00
e288b8436c Merge branch 'develop' into feature/rewrite-stores
# Conflicts:
#	packages/client/src/pages/Home/MediaViewer/index.js
2024-02-07 12:13:15 +04:00
92e2adaa2f Merge branch 'develop' into feature/ads-banner 2024-02-06 21:55:59 +03:00
Akmal Isomadinov
1b508ba243 Shared: fixed cyclic dependency 2024-02-06 20:39:15 +05:00
a7be3428bb Fixed after merge. 2024-02-06 16:13:16 +03:00
429d9545ab Shared:Utils: delete console log 2024-02-06 12:14:25 +03:00
358a0904fc Shared:Utils: fix axios client 2024-02-06 12:13:01 +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
aba82040b9 Shared:Selector:Files: fix bugs 2024-02-05 17:43:22 +03:00
72be9e6da7 Merge branch 'develop' into feature/refactoring-media-viewer
# Conflicts:
#	packages/shared/package.json
2024-02-05 17:21:59 +04:00
182caeaaca Shared:Utils:Common: fix convert to language function 2024-02-05 14:53:30 +03:00
Akmal Isomadinov
b0a792f3d7 MediaViewer: Optimization of tiff decoding 2024-02-04 19:08:01 +05:00
c9515e8fed Doceditor: add support i18next 2024-02-02 18:41:50 +03:00
Akmal Isomadinov
cb6b4d0a57 Merge branch 'develop' into feature/refactoring-media-viewer
# Conflicts:
#	packages/common/components/MediaViewer/sub-components/Viewer/index.tsx
2024-02-02 12:25:09 +05:00
ebff35be27 Shared: fix after merge 2024-02-01 23:29:29 +03:00
6cec06c4c3 Merge branch 'develop' into feature/ads-banner 2024-02-01 23:24:34 +03:00
Akmal Isomadinov
341dd8bbb2 Shared:Components:MediaViewer: Fixed style code 2024-02-01 14:18:06 +05:00
adbfd55004 Shared:Selectors:Files: add getIcon inside selector 2024-01-31 20:14:09 +03:00
Akmal Isomadinov
7ff2e88d3d Shared:Components:MediaViewer: Optimization of working with tiff images 2024-01-31 21:16:23 +05:00
9bae37445d Web: Fixed types. 2024-01-31 14:10:52 +03:00
ed91c37da3 Shared: Utils: rename 2024-01-31 01:48:25 +03:00