Commit Graph

419 Commits

Author SHA1 Message Date
6c4d62fe27 Web:Client:Added translations per country with themes. 2022-11-21 15:51:19 +03:00
TimofeyBoyko
0e822663ae Web:Client:EmptyContainer: fix empty screen for archived room 2022-11-18 14:34:43 +03:00
TimofeyBoyko
5694bc0678 Web:Client:EmptyScreen: fix header text 2022-11-17 14:36:01 +03:00
TimofeyBoyko
a95df80f75 Web:Client:Locales: add new translation keys for empty screen 2022-11-17 13:45:05 +03:00
TimofeyBoyko
7fa1fddf79 Web:Client: fix translation keys 2022-11-10 15:54:53 +03:00
TimofeyBoyko
cb9eb34733 Web:Client: add delete room dialog 2022-11-10 15:22:13 +03:00
TimofeyBoyko
a763087b78 Web:Client: add Archive dialog for archive rooms and restore rooms operations 2022-11-10 13:18:55 +03:00
TimofeyBoyko
e84cdf861f Web:Client: add new translation key for restore archive dialog 2022-11-10 12:12:08 +03:00
TimofeyBoyko
48f67493b6 Web:Client: add new translation kets for move to archived dialog 2022-11-10 11:35:08 +03:00
TimofeyBoyko
a0c4b1e111 Web:Client: change 'Archive' translation key 2022-11-10 11:25:28 +03:00
3175554fed Web: Files: added create, delete, move to archive room hotkeys 2022-11-08 17:34:32 +03:00
7073fc2fce Web: Changed translation. 2022-11-07 10:43:32 +03:00
dbd34303f1 Web: Fixed translation key. 2022-11-07 10:41:35 +03:00
mushka
83ecc297b8 Merge branch 'develop' into feature/info-panel-update 2022-11-03 17:09:41 +03:00
mushka
75c8f03149 added SuccessSentMultipleInvitatios translation keys to en/ and ru/ 2022-11-03 17:05:26 +03:00
c24976d7a9 Web: Files: added RoomPinned RoomUnpinned translations 2022-11-03 15:47:35 +03:00
mushka
bb16de4ed9 Merge branch 'develop' into feature/info-panel-update and solved merge conflict 2022-11-03 14:52:11 +03:00
TimofeyBoyko
916104ea01 Merge branch 'develop' into feature/rooms-access-rights 2022-11-01 13:23:46 +05:00
mushka
5ef235bf8c Merge branch 'develop' into feature/info-panel-update 2022-10-31 13:55:44 +03:00
TimofeyBoyko
86af8a8921 Web:Client: add new translation key 2022-10-31 15:29:43 +05:00
Elyor Djalilov
c4ff1d057c Merge branch 'develop' into feature/active-sessions 2022-10-31 11:24:05 +05:00
213df04281 Added empty translations 2022-10-27 11:58:03 +03:00
4636136df2 Update Settings.json 2022-10-27 11:57:21 +03:00
0e868c01ae Merge branch 'develop' into feature/new-docspace-translations 2022-10-27 11:56:46 +03:00
9c5f86b237 Merge branch 'develop' into feature/invite-accounts 2022-10-27 09:47:54 +03:00
f897d9dd95 Web: Client: Locales: Added "InviteUsers" key and remove duplicates of "RoleRoomAdmin" and "RoleDocSpaceAdmin" 2022-10-27 09:37:56 +03:00
25226c701f Web: Files: fixed DNSSettingsTooltip translation 2022-10-26 13:09:04 +03:00
Elyor Djalilov
6e97edb3d0 Merge branch 'develop' into feature/active-sessions
# Conflicts:
#	packages/client/src/components/dialogs/index.js
2022-10-25 17:41:04 +05:00
073aa9943f Fix WrongTranslationVariablesTest issues + added missing files and key sorting 2022-10-25 14:52:15 +03:00
mushka
44caa890bd Merge branch 'develop' into feature/info-panel-update 2022-10-25 14:41:39 +03:00
00e6a174df Web: Files: fixed GracePeriodActivatedInfo translation 2022-10-25 13:17:33 +03:00
8f93c2df54 Web: Files: fixed GracePeriodActivatedInfo translation 2022-10-25 12:52:43 +03:00
f0ce5a9552 Web: Files: fixed Payments translations 2022-10-25 12:48:58 +03:00
fdb67562d6 Web: Files: added invite users dialog warning for startup plan 2022-10-25 12:09:05 +03:00
5753d9722f Web: Files: added invite users dialog warning, fixed GracePeriodActivatedDescription translation 2022-10-25 11:44:30 +03:00
Elyor Djalilov
42471135ba Merge branch 'develop' into feature/active-sessions
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/components/themes/base.js
#	packages/components/themes/dark.js
2022-10-25 13:41:42 +05:00
mushka
bc10920372 Merge branch 'develop' into feature/info-panel-update 2022-10-24 20:52:01 +03:00
Viktor Fomin
bc5458bd21 Merge branch 'develop' into feature/portal-deactivation 2022-10-24 18:38:02 +05:00
TimofeyBoyko
30799fa082 Merge branch 'develop' into bugfix/files-context-menu 2022-10-24 14:09:25 +05:00
Elyor Djalilov
7dac877b75 Web:Client:ActiveSessions: added modals 2022-10-21 18:45:50 +05:00
Viktor Fomin
e98bde1362 Client: add translate 2022-10-21 14:01:14 +05:00
Viktor Fomin
025919588c Client: PortalSettings: DeleteData: fix translate 2022-10-21 13:33:38 +05:00
TimofeyBoyko
8bb825cd5b Web:Client: fix translations for archive operations 2022-10-20 21:33:13 +05:00
TimofeyBoyko
51bca252a4 Web:Client: add new translation key for restore all archive dialog 2022-10-20 19:44:18 +05:00
9e0bc49c6f Merge branch 'develop' into feature/portal-deactivation 2022-10-20 15:04:54 +03:00
0d680dd005 Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-20 11:36:22 +03:00
TimofeyBoyko
a0da3a1735 Web:Client: add new translation key for EmptyArchiveDialog 2022-10-20 13:11:26 +05:00
TimofeyBoyko
a2e6164ffe Web:Client: add new translation key 'ArchiveAction' 2022-10-20 12:53:50 +05:00
9c99f3a53f Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-19 19:41:39 +03:00
mushka
0adb8efd4c added ExpectPeople translation key 2022-10-19 19:33:57 +03:00
42d9a6682c Merge branch 'develop' into feature/company-info-settings 2022-10-19 17:54:58 +03:00
Elyor Djalilov
d819128bdb Web:Client:ActiveSessions: added translations 2022-10-19 18:30:22 +05:00
4115bdc5dd Web: Files: fixed TrustedMailDescription translation 2022-10-19 16:03:59 +03:00
b99bde994e Web: Files: fixed LanguageTimeSettingsTooltip translation 2022-10-19 16:01:32 +03:00
7569a741d8 Merge branch 'develop' into feature/company-info-settings 2022-10-19 15:21:18 +03:00
mushka
2a52c0b251 Merge branch 'develop' into feature/room-thirdparty-update 2022-10-19 13:22:09 +03:00
mushka
9e62fc8e45 added translation for root label 2022-10-18 13:14:06 +03:00
a5165d09cf Merge branch 'develop' into feature/company-info-settings 2022-10-18 10:31:15 +03:00
mushka
3008e549c9 fixed some small translation issues with info panel 2022-10-18 01:55:45 +03:00
TimofeyBoyko
d208b8c726 Web:Client:fix translation key 2022-10-17 16:22:31 +05:00
TimofeyBoyko
54b7f99f8e Merge branch 'develop' into feature/bar-quotas 2022-10-17 16:06:33 +05:00
TimofeyBoyko
e5ab98c0d9 Web:Client: add new translation key for main bar 2022-10-17 16:01:12 +05:00
1fac4168fe Merge branch 'develop' into feature/company-info-settings 2022-10-17 11:02:59 +03:00
TimofeyBoyko
b1d63436cc Merge branch 'develop' into feature/bar-quotas 2022-10-17 11:53:38 +05:00
TimofeyBoyko
b3395efe50 Merge branch 'develop' into feature/portal-access-rights 2022-10-17 11:45:25 +05:00
8146e9aef4
Merge branch 'develop' into feature/portal-deactivation 2022-10-15 13:43:10 +05:00
88e78f6695 Merge branch 'develop' into feature/invite-panel 2022-10-14 17:18:56 +03:00
TimofeyBoyko
470c100e2f Merge branch 'develop' into feature/bar-quotas 2022-10-14 12:26:16 +05:00
e80cc33dfb Merge branch 'feature/room-thirdparty-update' into feature/shared-redesign-third-party 2022-10-13 18:51:45 +03:00
TimofeyBoyko
32994832e4 Web:Client:EmptyContainer: add new translaton key for free user at shared empty page 2022-10-13 19:14:20 +05:00
28d918464f Merge branch 'develop' into feature/company-info-settings 2022-10-13 15:48:31 +03:00
mushka
319d842312 fixed MakeRoomPrivateLimitationsWarningDescription translate key in russian 2022-10-13 15:12:58 +03:00
3bd63b26fe Web: Added new translations. 2022-10-13 15:06:51 +03:00
TimofeyBoyko
e56b10d1e5 Web:Client: move 'Room admin' and 'DocSpace admin' translation keys to common 2022-10-13 15:35:58 +05:00
c51e42f2f4 Web:Client:Delete wrong translation "ThirdPartyResource". 2022-10-12 13:47:43 +03:00
TimofeyBoyko
2605d6f2f5 Web:Client:Locales: add new translation key for 'ChangeUserTypeDialog' 2022-10-12 14:30:15 +05:00
6d78f37729 Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-11 16:05:49 +03:00
TimofeyBoyko
7a1ddd3c20 Merge branch 'develop' into feature/portal-access-rights 2022-10-11 14:04:42 +05:00
a47ce3d8c0 Merge branch 'develop' into feature/invite-panel 2022-10-11 11:58:25 +03:00
TimofeyBoyko
f91604d316 Merge branch 'develop' into feature/bar-quotas 2022-10-11 12:55:55 +05:00
cf2547e030 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/common/constants/index.js
2022-10-11 10:20:42 +03:00
0d7f77a18a
Merge pull request #897 from ONLYOFFICE/bugfix/accounts-filter
Bugfix/accounts filter
2022-10-11 10:12:57 +03:00
TimofeyBoyko
fe8b7ec257 Web:Client: add 'DocSpaceAdmin' translation key 2022-10-11 12:12:38 +05:00
TimofeyBoyko
da14ffd656 Merge branch 'develop' into feature/portal-access-rights 2022-10-11 11:52:34 +05:00
49d6884502 Web:Client:Add translation "SuccessfulConnectionOfAThirdParty". 2022-10-10 19:12:26 +03:00
2414cc030c Web: Client: InvitePanel: Fixes after merge 2022-10-10 12:37:02 +03:00
TimofeyBoyko
09dbd9d088 Web: move translation key 'AdvancedFilter' from Files to Common 2022-10-10 13:53:24 +05:00
8e7bf575ed Web: Fixed translation (ru). 2022-10-06 14:17:52 +03:00
0ba61c940b Web:Client:Add translation "ThirdPartyResource". 2022-10-06 12:44:14 +03:00
409cdd2ebe Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation 2022-10-05 17:17:33 +03:00
d37a6068fc Merge branch 'develop' into feature/invite-panel 2022-10-05 15:04:24 +03:00
d3d4ff6639 Web: Fixed description of grace period. 2022-10-05 13:34:59 +03:00
a2fb5e4b36 Web: Changed translations for grace period. 2022-10-05 13:26:45 +03:00
c3c64d847c Web: removed useless translations. 2022-10-05 11:55:15 +03:00
11479c14ba Web: Added missing translations. 2022-10-05 11:35:40 +03:00
84c8749e4f Web: Changed translations. 2022-10-05 10:58:10 +03:00
ca1cd06fad Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/public/images/plus.react.svg
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/components/PrivateRoute/index.js
2022-10-04 17:13:46 +03:00
a5d3106907 Web: Added translation. 2022-10-04 16:52:43 +03:00
TimofeyBoyko
ae584739e8 Merge branch 'develop' into feature/portal-access-rights 2022-10-04 06:58:16 +03:00
mushka
1b2dae0890 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-02 03:45:40 +03:00