|
|
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 |
|
|
|
c52600bf75
|
Web: Files: fixed publicRoomKey
|
2024-03-14 15:55:12 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
