Commit Graph

41181 Commits

Author SHA1 Message Date
968573ce02 Merge branch 'hotfix/v2.0.1' into develop
# Conflicts:
#	packages/components/toast/styled-toastr.js
2024-01-19 16:20:16 +04:00
1bbb151d7b Fix imports - linux build path issues 2024-01-18 20:24:07 +04:00
e7d37527cc
Merge pull request #188 from ONLYOFFICE/feature/form-room-pdf
Feature/form room pdf
2024-01-18 20:09:28 +04:00
1b40efb140 Update yarn.lock 2024-01-18 19:31:55 +04:00
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
f8e1ac9cd7
Merge pull request #187 from ONLYOFFICE/bugfix/new-files-badge
Bug 65761 - Rooms.ExternalLink. Removed badge new for public users
2024-01-18 18:56:02 +04:00
59a2a5ca6a
Merge pull request #186 from ONLYOFFICE/bugfix/csp-error
Fixed checking CSP settings
2024-01-18 18:46:01 +04:00
4f986bd99b Bug 65761 - Rooms.ExternalLink. Removed badge new for public users 2024-01-18 17:46:00 +03:00
ba7d2e8029 Fixed checking CSP settings and added design for error 2024-01-18 17:38:08 +03:00
b57ae5a872 Translations: Set BETA on EN for any languages 2024-01-18 14:29:01 +04:00
2f940a77cc
Merge pull request #180 from ONLYOFFICE/feature/management-loaders
Web: Management: Spaces: added loaders for API requests for connectin…
2024-01-17 22:50:14 +04:00
2401d72ac9
Merge pull request #184 from ONLYOFFICE/bugfix/webhook-creation
Bugfix/webhook creation
2024-01-17 22:48:36 +04:00
Vladimir Khvan
aeb1be875a Web: Client: Webhooks: injection was corrected 2024-01-17 20:23:09 +05:00
Vladimir Khvan
87be38a9ba Web: Client: Webhooks: refactored onFormSubmit 2024-01-17 20:19:30 +05:00
Vladimir Khvan
a52b4c5f23 Web: Components: font weight of the toast title has been corrected 2024-01-17 19:36:28 +05:00
Vladimir Khvan
4c71b63179 Web: Client: Webhooks: wrapped form submit with try finally / reduced redundant code 2024-01-17 19:28:36 +05:00
Vladimir Khvan
58c235c9af Web: Client: Webhooks: loading state and success toast were added for webhook creation 2024-01-17 18:49:30 +05:00
Vladimir Khvan
fa4ae167c0 Merge branch 'hotfix/v2.0.1' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/webhook-creation 2024-01-17 18:46:14 +05:00
1fdd353498 Merge branch 'develop' into feature/management-loaders 2024-01-17 16:59:26 +05:00
00a8bad715 Web: Management: Spaces: fixed loader reset, added loader when changing domain 2024-01-17 16:58:43 +05:00
6dbb334827
Merge pull request #181 from ONLYOFFICE/feature/shared-section
Feature/shared section
2024-01-17 15:50:23 +04:00
4e10a6baaf Merge branch 'develop' into feature/shared-section 2024-01-17 14:07:10 +04:00
e5fcc368dc
Merge pull request #182 from ONLYOFFICE/bugfix/management-payments
Bugfix/management payments
2024-01-17 13:14:52 +04:00
441a7ba604 Merge branch 'develop' into bugfix/management-payments
# Conflicts:
#	packages/client/src/pages/Profile/Section/Body/sub-components/active-session/index.js
#	packages/shared/utils/convertTime.ts
2024-01-16 19:26:53 +03:00
cbac08a712 Fixed incorrect check for timezone. 2024-01-16 16:57:02 +03:00
c11dca03a8 Web: Added timezone definition. 2024-01-16 16:36:42 +03:00
82ad593fcc Shared:Components:Section: fix import React 2024-01-16 14:39:45 +03:00
83d405680b Merge branch 'develop' into feature/shared-section 2024-01-16 14:33:05 +03:00
ea78572c5d Shared:Components:Section: delete console log 2024-01-16 14:31:39 +03:00
f477ef4d52 Shared:Components:Section: rewrite to typescript, move from common and add wrapper to Client and Managment 2024-01-16 14:31:08 +03:00
6b90bbf7d0 Web: Management: Spaces: added loaders for API requests for connecting and creating portals 2024-01-16 16:24:08 +05:00
5976642b65 Merge branch 'hotfix/v2.0.1' into develop 2024-01-16 12:34:15 +04:00
3253ae3cc7
Merge pull request #179 from ONLYOFFICE/bugfix/fix-editor-language
Fix Bug 65419 - Editor: if the profile language is undefined (there i…
2024-01-16 12:20:34 +04:00
462242ca32 Fix show old tags on creation room 2024-01-16 11:52:32 +04:00
3605282b81 Fix Bug 65419 - Editor: if the profile language is undefined (there is a combination of portal and profile languages) portal language will be displayed 2024-01-15 20:20:40 +05:00
2acbd2f4fd
Merge pull request #176 from ONLYOFFICE/feature/shared-navigation
Feature/shared navigation
2024-01-15 18:09:39 +04:00
a9c9547bf9 Shared:Components:Navigation: fix color of text 2024-01-15 17:03:07 +03:00
2fbc625709 Merge branch 'feature/shared-navigation' of github.com:ONLYOFFICE/DocSpace-client into feature/shared-navigation 2024-01-15 16:57:09 +03:00
9cf264003e Shared:Components:Navigation: fix accounts 2024-01-15 16:57:02 +03:00
2e3fc63ecc Merge branch 'develop' into feature/shared-navigation 2024-01-15 17:29:36 +04:00
4bd4dd4a57
Merge pull request #174 from ONLYOFFICE/feature/common-utils-typescript
Feature/common utils typescript
2024-01-15 17:28:13 +04:00
1b4fcf3252
Merge pull request #178 from ONLYOFFICE/bugfix/security-table
Client:PortalSettings:Security: fix audit trail and login history tab…
2024-01-15 16:53:09 +04:00
1ac27c23e3 Client:PortalSettings:Security: remove console 2024-01-15 15:52:24 +03:00
dc0e0101ab Client:PortalSettings:Security: fix audit trail and login history table view 2024-01-15 15:38:14 +03:00
40ea337a93 Shared:API:Files: fix moveto 2024-01-15 14:47:38 +03:00
f45a9df4b1 Shared:Components:DropDown: fix render 2024-01-15 14:44:49 +03:00
aafe5b3669 Client:FormGallery: fix missing import 2024-01-15 14:44:29 +03:00
cc0471c207
Merge pull request #175 from ONLYOFFICE/bugfix/fixed-unexpected-signout
Fix Bug 65761 - Rooms.ExternalLink. Fixed redirection to login after …
2024-01-15 15:16:40 +04:00
c05b87cd0e Shared:Components:Navigation: export from index file types 2024-01-15 13:16:12 +03:00
1121482730 Merge branch 'feature/common-utils-typescript' of github.com:ONLYOFFICE/DocSpace-client into feature/common-utils-typescript 2024-01-15 13:11:25 +03:00