Commit Graph

1542 Commits

Author SHA1 Message Date
Akmal Isomadinov
8b5af26b3b Merge branch 'develop' into bugfix/form-room 2024-05-07 16:44:40 +05:00
4f2295c2d8 Merge branch 'hotfix/v2.5.1' into develop 2024-05-03 14:51:27 +04:00
b52e7af32c Fix Bug 67813
No translation of Share panel in editor
2024-05-03 12:32:58 +03:00
e06a0ee594 Merge branch 'develop' into feature/connecting-storage 2024-05-02 18:18:24 +04:00
Akmal Isomadinov
e818c0389f Merge branch 'develop' into bugfix/form-room 2024-05-02 16:11:58 +05:00
ee84c16335 Merge branch 'hotfix/v2.5.1' into develop 2024-05-02 15:05:36 +04:00
c1269a6a60 edited zh 2024-05-02 13:45:15 +03:00
Akmal Isomadinov
662e0bef18 Client:Public:Locales:EmptyView Fixed translation 2024-05-01 14:05:21 +05:00
Vladimir Khvan
aa878a4d3c Merge branch 'develop' into feature/connecting-storage
Conflicts:
	packages/shared/api/files/index.ts
2024-04-30 14:38:43 +05:00
846617aacc Merge branch 'develop' into feature/profile-active-sessions 2024-04-26 18:05:58 +04:00
fcc50d6dfc Merge branch 'hotfix/v2.5.1' into develop 2024-04-26 18:05:43 +04:00
fede13cd74 Translations: Moved "Errors:InvalidLink" to Common 2024-04-26 17:41:30 +04:00
f9c2426fcd Merge branch 'develop' into feature/profile-active-sessions 2024-04-26 16:06:31 +04:00
Vladimir Khvan
bd5d8810f4 Merge branch 'develop' into feature/connecting-storage
Conflicts:
	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ThirdPartyStorage/ThirdPartyComboBox.js
2024-04-24 16:14:43 +05:00
9705f93ab9 Merge branch 'develop' into feature/profile-active-sessions
# Conflicts:
#	packages/shared/components/empty-view/EmptyView.styled.ts
2024-04-24 15:15:56 +05:00
Akmal Isomadinov
41e70017a0 Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/shared/components/empty-view/EmptyView.styled.ts
2024-04-22 19:22:51 +05:00
d2733829e5 Merge branch 'release/v2.5.0' into develop 2024-04-19 19:10:43 +04:00
3568091e0f Merge branch 'develop' into feature/profile-active-sessions
# Conflicts:
#	packages/client/src/pages/Profile/Section/Body/sub-components/active-session/styled-active-sessions.js
2024-04-19 18:42:23 +05:00
Akmal Isomadinov
0623e57d9e Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/doceditor/src/utils/index.ts
2024-04-19 16:42:10 +05:00
af7ea9116e Translations: Moved 'Reconnect' key to Common 2024-04-19 14:54:40 +04:00
8a202e1d79 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/Article/MainButton/index.js
#	packages/shared/utils/common.ts
2024-04-19 13:13:00 +04:00
Akmal Isomadinov
4027d69236 Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/doceditor/src/utils/actions.ts
#	public/locales/en/Common.json
2024-04-18 12:23:54 +05:00
Akmal Isomadinov
081eb3c32c Client:Components:EmptyContainer Added empty screen for form filler 2024-04-17 17:18:52 +05:00
Akmal Isomadinov
abea7a8655 Client:Components:EmptyContainer Added upload action 2024-04-17 16:55:18 +05:00
6888b5c2c6 updated translations 2024-04-17 14:45:17 +03:00
3cc95ccc5c updated translations 2024-04-17 13:45:47 +03:00
d9e19065d2 Merge branch 'feature/new-translations_v.2.5' of https://github.com/ONLYOFFICE/DocSpace-client into feature/new-translations_v.2.5 2024-04-16 14:13:28 +03:00
6010e7d72a updated translations 2024-04-16 14:13:01 +03:00
Akmal Isomadinov
bb39e5a233 Client:Components:Dialogs Added PDFFormEditingDialog 2024-04-16 14:21:10 +05:00
a0db3390f8 Merge branch 'release/v2.5.0' into feature/new-translations_v.2.5 2024-04-16 13:03:08 +04:00
89e29076e5 Web: Client: Profile. rewrited table view active sessions 2024-04-15 22:13:59 +05:00
e698b3cb00 updated it 2024-04-15 18:43:32 +03:00
7b823b65f4 Merge branch 'feature/new-translations_v.2.5' into release/v2.5.0 2024-04-15 18:38:35 +04:00
c68f22e22d updated de 2024-04-15 16:46:10 +03:00
a9cba735c1 updated translations 2024-04-15 15:33:01 +03:00
3705f67b5c Merge branch 'release/v2.5.0' into develop 2024-04-15 10:19:38 +04:00
12a82f3b04 Fix Bug 67319 - Settings: Data Import. When the migration is completed, you receive an invite letter, not a welcome letter. 2024-04-13 13:54:48 +05:00
f0d84c0e81 removed useless translations 2024-04-13 13:53:21 +05:00
e27bad8eae Merge branch 'release/v2.5.0' into develop 2024-04-12 20:13:01 +04:00
ee70f1cbc3 Translations: Removed wrong value (it's value of key JavascriptSdk:CSPInfoBarDescription) 2024-04-12 20:09:13 +04:00
16b93c82c6 Translations: fix WrongTranslationVariablesTest (BreakpointMobileWarningTextPrompt key) 2024-04-12 19:56:52 +04:00
ddb9f74d83 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/doceditor/src/app/(root)/create/page.tsx
#	public/locales/en/Common.json
2024-04-12 19:14:59 +04:00
9afb296b5d updated hy 2024-04-12 16:59:47 +03:00
e89aca1cda added sr-latn-RS client 2024-04-12 16:45:17 +03:00
59c3cd4b2f updated translations 2024-04-12 13:47:30 +03:00
Akmal Isomadinov
7c4adde668 Merge branch 'develop' into feature/form-room 2024-04-12 11:36:53 +05:00
5752bb3a2d updated translations 2024-04-11 16:21:30 +03:00
7b44084797 Translations: Fix EnDublicatesByContentTest issue (Moved "Editor" key to Common and replaced "RoleEditor") 2024-04-11 13:34:53 +04:00
b5a38f3434 Translations: Fix UselessTranslationKeysTest issues 2024-04-11 12:46:19 +04:00
55ddfabf9c Translations: Fix WrongTranslationTagsTest issues (TypesAndPrivileges key) 2024-04-11 10:59:12 +04:00