Commit Graph

1684 Commits

Author SHA1 Message Date
1eb54ab218 Fixed translations. 2024-06-08 22:01:35 +03:00
c8df2d9703 Merge branch 'develop' into feature/branding-correction
# Conflicts:
#	packages/client/public/locales/ar-SA/CreateEditRoomDialog.json
#	packages/client/public/locales/az/CreateEditRoomDialog.json
#	packages/client/public/locales/bg/CreateEditRoomDialog.json
#	packages/client/public/locales/cs/CreateEditRoomDialog.json
#	packages/client/public/locales/de/CreateEditRoomDialog.json
#	packages/client/public/locales/el-GR/CreateEditRoomDialog.json
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/client/public/locales/es/CreateEditRoomDialog.json
#	packages/client/public/locales/fi/CreateEditRoomDialog.json
#	packages/client/public/locales/fr/CreateEditRoomDialog.json
#	packages/client/public/locales/hy-AM/CreateEditRoomDialog.json
#	packages/client/public/locales/it/CreateEditRoomDialog.json
#	packages/client/public/locales/ja-JP/CreateEditRoomDialog.json
#	packages/client/public/locales/ko-KR/CreateEditRoomDialog.json
#	packages/client/public/locales/lo-LA/CreateEditRoomDialog.json
#	packages/client/public/locales/lv/CreateEditRoomDialog.json
#	packages/client/public/locales/nl/CreateEditRoomDialog.json
#	packages/client/public/locales/pl/CreateEditRoomDialog.json
#	packages/client/public/locales/pt-BR/CreateEditRoomDialog.json
#	packages/client/public/locales/pt/CreateEditRoomDialog.json
#	packages/client/public/locales/ro/CreateEditRoomDialog.json
#	packages/client/public/locales/ru/CreateEditRoomDialog.json
#	packages/client/public/locales/si/CreateEditRoomDialog.json
#	packages/client/public/locales/sk/CreateEditRoomDialog.json
#	packages/client/public/locales/sl/CreateEditRoomDialog.json
#	packages/client/public/locales/sr-Latn-RS/CreateEditRoomDialog.json
#	packages/client/public/locales/tr/CreateEditRoomDialog.json
#	packages/client/public/locales/uk-UA/CreateEditRoomDialog.json
#	packages/client/public/locales/vi/CreateEditRoomDialog.json
#	packages/client/public/locales/zh-CN/CreateEditRoomDialog.json
2024-06-07 15:49:36 +03:00
03d313606f Deleted zh-CN translations. 2024-06-07 15:26:45 +03:00
31e2dc32fd Merge branch 'develop' into feature/create-room-selector 2024-06-05 16:20:51 +03:00
43a2d37596 Web: Files: fixed palm cursor 2024-06-05 13:22:21 +03:00
ce9da8e898 Client: move translation key to 'Common' 2024-06-05 11:13:23 +03:00
c58d44e55e Move some translation keys to Common.json 2024-06-03 19:22:44 +03:00
7f8b7ddc4f Fixed translations. 2024-05-30 17:42:40 +03:00
3e942791be Added interpolation for 'SpaceUsersOnly' key. 2024-05-30 17:40:29 +03:00
f238741429 Fixed translation. 2024-05-30 17:37:21 +03:00
4d3e61b703 Added interpolation for 'SelectFromDocspace' key. 2024-05-30 16:40:55 +03:00
7fd2cad5ee Added interpolation for 'FromDocspace' key. 2024-05-30 16:39:22 +03:00
364c25a813 Added interpolation for 'BetaBadgeDescription' key. 2024-05-30 16:36:00 +03:00
1809b8cd92 Added interpolation for 'TurnOffDiskSpaceLimit key. 2024-05-30 14:57:14 +03:00
3313d4f020 Added interpolation for 'SetDiskSpaceQuota' key. 2024-05-30 14:54:02 +03:00
c02cc44108 Added interpolation for 'PortalRestriction' key. 2024-05-30 14:48:46 +03:00
ab7d326315 Added interpolation for 'InvitationToPortal' key. 2024-05-30 14:39:57 +03:00
706d28344b Added interpolation for 'ErrorDeactivatedText' key. 2024-05-30 14:30:22 +03:00
53529ce19a Added interpolation for 'EmptyDescription' key. 2024-05-30 14:04:56 +03:00
8c7bd1a241 Added interpolation for 'DocspaceOwner' key. 2024-05-30 13:27:15 +03:00
c0ee32f303 Added interpolation for 'DocspaceAdmin' key. 2024-05-30 13:13:43 +03:00
4b81764d18 Merge branch 'develop' into feature/selector-input 2024-05-28 11:39:09 +04:00
db22ee0060 Merge branch 'develop' into feature/selector-input 2024-05-27 17:32:14 +03:00
1bf71d5ee2 Merge branch 'develop' into feature/new-room-icons 2024-05-27 17:12:43 +04:00
410f69e130 Merge branch 'develop' into feature/editor-in-same-tab 2024-05-27 16:31:42 +04:00
namushka
6cec1d0111
Merge branch 'develop' into feature/new-room-icons 2024-05-27 12:04:49 +03:00
4177c53d5c Merge branch 'develop' into feature/selector-input 2024-05-27 10:57:57 +03:00
8ed897cde2 Merge branch 'develop' into feature/selector-input 2024-05-27 10:21:52 +03:00
namushka
9af68dbd94
updated icons for RoomIcon component 2024-05-24 14:02:49 +03:00
ee24512bdd Merge branch 'develop' into feature/editor-in-same-tab 2024-05-24 12:33:20 +03:00
d1061bb3ae renaming resource keys 2024-05-23 18:14:33 +03:00
d90ad9d951
Merge pull request #425 from ONLYOFFICE/feature/resources-correction
Feature/resource correction
2024-05-23 18:13:30 +04:00
c440260f71 resource correction 2024-05-22 22:54:57 +03:00
e77b80f227 Add images for selector input item 2024-05-22 17:03:58 +03:00
db58a3fee9 Web: delete openOnNewPage from config 2024-05-21 13:09:17 +03:00
881b7bad4b Translations: fix UselessTranslationKeysTest issues 2024-05-15 19:37:37 +04:00
f900585de5 Merge branch 'hotfix/v2.5.1' into develop 2024-05-15 18:36:42 +04:00
139c4e6c5f Client: SDK: Fixed open editor error if file id not set 2024-05-14 16:25:14 +03:00
69203c2c1e Fixed Bug 67961: Client: SDK: Added flexible host check for csp settings inside modal frame 2024-05-14 13:42:37 +03:00
467f53220f Merge branch 'hotfix/v2.5.1' into develop 2024-05-13 19:10:03 +04:00
1f9bc33150 Merge branch 'hotfix/v2.5.1' into feature/langs-updates_0524 2024-05-13 19:04:49 +04:00
5aee9c9982 Merge branch 'hotfix/v2.5.1' into develop 2024-05-13 18:23:45 +04:00
bb7b865498 Web: Added si flag 2024-05-13 18:05:48 +04:00
981afb7fa2 updated si 2024-05-13 16:18:53 +03:00
b4acdd2b2f Merge branch 'hotfix/v2.5.1' into develop 2024-05-13 11:23:36 +04:00
Akmal Isomadinov
403d8bc558 Client:Components:QuickButtons Fixed bug 67799 added lock icon 2024-05-08 16:21:10 +05:00
df9ced222f Merge branch 'develop' into bugfix/form-room 2024-05-07 20:26:54 +04:00
Akmal Isomadinov
0ed0fc2e18 Client:Components:Badges Fixed translation 2024-05-07 18:39:54 +05:00
Vladimir Khvan
6c7e8caa8d Merge branch 'develop' into feature/sdk-presets 2024-05-07 15:30:30 +05:00
4f2295c2d8 Merge branch 'hotfix/v2.5.1' into develop 2024-05-03 14:51:27 +04:00