|
44e0d016d2
|
Merge branch 'bugfix/rc-2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-05 18:34:04 +03:00 |
|
|
7d6df049d8
|
Web:Shared:Fixed showing a skeleton instead of a link when quickly adding links. Added waiting for a link to be received before creating a new one, so that the isLoaded state is not saved instead of the link.
|
2024-03-05 18:33:58 +03:00 |
|
|
5eee8667b6
|
Web: Components: Avatar: fixed roleIcon
|
2024-03-05 17:56:05 +03:00 |
|
|
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 |
|
|
375cac4488
|
Web: Shared: Enums: corrected dropbox names
|
2024-03-05 16:37:12 +05:00 |
|
|
58dc881e80
|
Shared: Fix info panel border color in dark theme
|
2024-03-05 12:22:03 +01:00 |
|
|
bcf3b66856
|
Shared: Share: fix
|
2024-03-05 14:19:43 +03:00 |
|
|
ee7e795b7f
|
Shared:API:Files: uncomment API method
|
2024-03-05 13:55:15 +03:00 |
|
|
84fc187a27
|
Merge branch 'develop' into feature/groups
|
2024-03-04 21:55:21 +04:00 |
|
|
a8c0fd36b1
|
Merge branch 'develop' into bugfix/sdk-presets
|
2024-03-04 20:57:09 +04:00 |
|
Vladimir Khvan
|
f5e4f141ae
|
Web: Client: JavascriptSDK: isDocument icon prop was added to FileInput
|
2024-03-04 20:57:50 +05: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 |
|
|
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 |
|
|
c5bad55f97
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-03-04 17:41:55 +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
|
cd0f3c10bf
|
Client:PublicRoom Refactoring
|
2024-03-04 17:22:54 +05:00 |
|
Akmal Isomadinov
|
2a9fa214dd
|
Client:PublicRoom Fixed preview in the public room
|
2024-03-04 17:14:33 +05:00 |
|
|
b6719c3c91
|
Merge branch 'bugfix/rc-2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-04 14:03:38 +03:00 |
|
|
320a7b0061
|
Web:Shared:Added stop of filling the progress of the operation and transition to infinity when the API incorrectly returns progress greater than 100.
|
2024-03-04 14:03:32 +03:00 |
|
|
f9f2105d77
|
Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-04 13:59:16 +03:00 |
|
|
f5c7247587
|
Web: Components: fixed MainButtonMobile
|
2024-03-04 13:59:09 +03:00 |
|
|
3004623307
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into feature/dns-validation
|
2024-03-04 15:27:28 +05: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 |
|
Vladimir Khvan
|
4083b13f76
|
Web: Client: JavascriptSDK: title was added to selected item
|
2024-03-04 12:40:42 +05:00 |
|
|
63540ab04f
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-03-04 11:32:47 +04:00 |
|
|
138c73486b
|
Client:Shared:Article: fix logo styles
|
2024-03-04 10:05:56 +03:00 |
|
Akmal Isomadinov
|
b342219053
|
Client:Routes: Added public route media viewer
|
2024-03-03 18:08:20 +05:00 |
|
|
98736d1273
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop
|
2024-03-01 20:18:53 +05:00 |
|
|
3db9d5de15
|
Merge pull request #293 from ONLYOFFICE/bugfix/table-info-panel
Web: Components: fixed table resizing when info-panel is open
|
2024-03-01 18:01:52 +03: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 |
|
|
55f206700e
|
Web: Components: fixed table resizing when info-panel is open
|
2024-03-01 15:55:08 +03:00 |
|
|
107678b093
|
Shared: Article: Apps: support language in url
|
2024-03-01 14:02:27 +03:00 |
|
|
718455ee09
|
Web: added xlsb icons
|
2024-03-01 15:37:04 +05:00 |
|
|
ab454da48e
|
Merge branch 'develop' into feature/groups
|
2024-03-01 11:31:28 +01:00 |
|
|
3938bd7859
|
Web: Components: Table: fixed crash
|
2024-03-01 13:16:19 +03:00 |
|
namushka
|
63e0f8a6ec
|
updated editGroup api and EditGroupDialog
|
2024-03-01 11:57:03 +03:00 |
|
|
b4c3566e12
|
Shared: CampaignsBanner: add type
|
2024-03-01 02:39:57 +03:00 |
|
|
f960893622
|
Shared: CampaignsBanner: add rtl support
|
2024-03-01 02:35:55 +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 |
|
|
8261228759
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-29 18:08:07 +03:00 |
|
|
321bf06fb4
|
Shared:Components:Share: fix combobox styles after merge
|
2024-02-29 18:03:31 +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 |
|
|
947df5b013
|
Web: Client: Fix group combobox colors
|
2024-02-29 15:14:04 +01:00 |
|