Commit Graph

370 Commits

Author SHA1 Message Date
b40b37018d Merge branch 'develop' into feature/refactoring-auth-store 2024-02-01 12:54:43 +03:00
54ed8d7e1d Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
#	packages/client/src/pages/PublicRoom/sub-components/RoomPassword.js
#	packages/login/src/client/components/CodeLogin.tsx
#	packages/login/src/client/components/Login.tsx
2024-01-31 19:45:25 +04:00
883eb94fc9 Merge branch 'develop' into feature/refactoring-auth-store 2024-01-30 19:11:57 +03:00
e20ae17ab8 Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
#	packages/client/src/pages/Sdk/index.js
#	packages/editor/src/client/components/Editor.js
#	packages/shared/selectors/Room/index.tsx
2024-01-30 18:33:56 +04:00
230b8cdd7a Merge branch 'hotfix/v2.0.2' into feature/js-sdk-loader 2024-01-29 21:46:15 +03:00
8132bfdae9 Merge branch 'develop' into feature/refactoring-auth-store 2024-01-29 19:30:18 +03:00
68f74565bc Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
#	packages/common/store/AuthStore.js
#	packages/shared/components/selector/Selector.tsx
2024-01-29 19:07:27 +04:00
a1fc8864b0 Editor: added new favicon for PDF files 2024-01-29 15:48:57 +04:00
b06cc0a80f Fix Bug 66219 - Rooms. Documents cannot be opened for viewing in an external room 2024-01-29 13:43:52 +04:00
22362fe186 Added missing quotes 2024-01-29 13:42:28 +04:00
120187aab3 Fix using settingsStore, rename auth to authStore in mobx providers 2024-01-26 11:59:01 +03:00
b86924c936 Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
#	packages/components/selector/sub-components/Item/Item.types.ts
#	packages/shared/package.json
#	packages/shared/selectors/Room/index.tsx
2024-01-25 16:32:37 +04:00
f95d96dfec Merge branch 'hotfix/v2.0.2' into feature/js-sdk-loader 2024-01-25 09:58:14 +03:00
ef1140b116 Bump version to v2.0.2 2024-01-24 20:49:25 +04:00
825c765b7d Merge branch 'develop' into feature/my-documents-share 2024-01-18 20:38:44 +03: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
21f343298c Editor: Calling external command on document loaded 2024-01-18 13:59:40 +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
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
68d21efd61 Merge branch 'develop' into feature/my-documents-share 2024-01-15 18:13:12 +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
341d2e3453 Merge branch 'develop' into feature/my-documents-share 2024-01-11 21:59:44 +03:00
c9eb637db9 Shared:Utils: rewrite to typescript 2024-01-11 16:38:53 +03:00
dca3f1b0a2 Shared:Utils:Helpers: rewrite to typescript 2024-01-11 15:49:51 +03:00
e3b760ccf9 Editor: fix crash version history panel 2024-01-11 12:44:10 +03:00
ae23aaf0e2 Shared:Utils:MinifyJson: move from common 2024-01-11 11:28:42 +03:00
c77fda4f91 Client: fix warnings 2024-01-10 15:15:00 +03:00
ffdf08bbe2 Merge branch 'feature/components-typescript' into feature/common-utils-typescript 2024-01-10 14:09:20 +03:00
4433391c23 Client: fix wrong import - export for shared components 2024-01-10 11:01:43 +03:00
1e367ad1aa Merge branch 'develop' into feature/my-documents-share 2024-01-05 15:31:06 +03:00
acca2fb761 Shared:Components:Utils: rewrite to typescript from common 2023-12-29 14:37:04 +03:00
faeba0ae18 Merge branch 'feature/components-typescript' into feature/common-utils-typescript 2023-12-29 10:34:54 +03:00
1d2cabdc4e Shared:Constants\Enums: move from common 2023-12-29 10:06:37 +03:00
343d6dc052 Merge branch 'develop' into feature/components-typescript 2023-12-28 23:38:17 +04:00
1b5a17b216 Skip call API checkfillformdraft if form not in rooms 2023-12-28 16:52:33 +04:00
962b08466b Fix Bug 65243 - Disable opening deepLink view in AndroidWebView 2023-12-28 12:16:02 +01:00
0b3ce31756 Client: fix after rewrite to typescript 2023-12-27 17:45:22 +03:00
1b700299ee Merge branch 'develop' into feature/my-documents-share 2023-12-15 18:22:25 +03:00
a99a9aa505
Merge pull request #128 from ONLYOFFICE/feature/update_langs
Feature/update langs
2023-12-14 17:38:34 +04:00
213afa8974 added translations 2023-12-14 15:13:07 +03:00
14d5ab891f Editor: fix timeout 2023-12-14 13:21:23 +03:00
d4a5e22447 Editor: fix decode deeplink data 2023-12-14 13:19:22 +03:00
cbc4358686 added vi 2023-12-13 19:13:52 +03:00
b52db74bf2 Merge branch 'develop' into feature/my-documents-share 2023-12-13 20:11:22 +04:00
c4ae842226 Editor: fix deeplink 2023-12-13 18:32:35 +03:00
ee63b6b0b8 added sk, az 2023-12-13 15:41:23 +03:00
f849664079 added translations 2023-12-12 12:47:19 +03:00
6862bb529f added/edited translations 2023-12-11 17:54:33 +03:00