Commit Graph

8881 Commits

Author SHA1 Message Date
1adf6b3634 Merge branch 'develop' into feature/my-documents-share 2024-01-19 17:04:46 +04:00
968573ce02 Merge branch 'hotfix/v2.0.1' into develop
# Conflicts:
#	packages/components/toast/styled-toastr.js
2024-01-19 16:20:16 +04:00
825c765b7d Merge branch 'develop' into feature/my-documents-share 2024-01-18 20:38:44 +03:00
1bbb151d7b Fix imports - linux build path issues 2024-01-18 20:24:07 +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
4f986bd99b Bug 65761 - Rooms.ExternalLink. Removed badge new for public users 2024-01-18 17:46:00 +03:00
b57ae5a872 Translations: Set BETA on EN for any languages 2024-01-18 14:29:01 +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
a7f62085c6 Client: Share: fix calendar 2024-01-17 17:53:18 +03: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
a170d6e566 Merge branch 'develop' into feature/my-documents-share 2024-01-17 15:55:38 +04:00
2611c86028 Client: EmptyContainer: delete useless 2024-01-17 13:38:27 +03:00
e80273f869 Merge branch 'develop' into feature/my-documents-share 2024-01-17 13:15:14 +03:00
4e10a6baaf Merge branch 'develop' into feature/shared-section 2024-01-17 14:07:10 +04:00
0a927318af Client: Share: fix 2024-01-17 12:36:50 +03:00
8535cb6c6b Client: Share: add loader 2024-01-17 01:04:43 +03:00
3f1765763d Client: add delete file from recent 2024-01-16 23:54:54 +03: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
83d405680b Merge branch 'develop' into feature/shared-section 2024-01-16 14:33:05 +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
ffcb4f5dea Merge branch 'develop' into feature/my-documents-share 2024-01-16 12:13:34 +03:00
5976642b65 Merge branch 'hotfix/v2.0.1' into develop 2024-01-16 12:34:15 +04:00
462242ca32 Fix show old tags on creation room 2024-01-16 11:52:32 +04:00
4a3edcf831 Client: fix import 2024-01-15 18:20:24 +03:00
68d21efd61 Merge branch 'develop' into feature/my-documents-share 2024-01-15 18:13:12 +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
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
41117b61d5 Client: QuickButtons: fix import 2024-01-15 15:24:23 +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
5231eb4116 Client: fix profile login crash and RoomsTypes values 2024-01-15 13:11:15 +03:00
7743b4d978 Client:Home:Section: fix trash warning import 2024-01-15 12:49:39 +03:00
c0db4a43e4 SHared:Components:Navigation: move from common and rewrite to typescript 2024-01-15 12:42:16 +03:00
aa9efe0056 Fix Bug 65761 - Rooms.ExternalLink. Fixed redirection to login after moveTo event 2024-01-15 12:28:49 +03:00
fe5ed638c7 Merge branch 'develop' into feature/common-utils-typescript 2024-01-15 09:54:56 +03:00
dc5d6bdcc6 Shared:Sw: move from common 2024-01-14 09:25:48 +03:00
7a2709b1f6 Shared:Utils:Common\Api: move from common and rewrite to typescript 2024-01-14 09:13:04 +03:00
31f0616274 Merge branch 'develop' into feature/my-documents-share 2024-01-12 17:44:29 +03:00
Vladimir Khvan
7ded108f23 Web: Client: Webhooks: handled error in webhook creation 2024-01-12 19:43:10 +05:00
c965ee9119 Merge branch 'hotfix/v2.0.1' into develop 2024-01-12 18:24:10 +04:00
fd1b81bd16 Shared:Utils:Encoder: rewrite to typescript 2024-01-12 10:33:24 +03:00
28d677440c Client: Share: add loader for create link 2024-01-11 22:43:49 +03:00
cbab93bb23 Client: fix import 2024-01-11 22:35:22 +03:00
341d2e3453 Merge branch 'develop' into feature/my-documents-share 2024-01-11 21:59:44 +03:00