|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +03:00 |
|
|
|
b99bde994e
|
Web: Files: fixed LanguageTimeSettingsTooltip translation
|
2022-10-19 16:01:32 +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 |
|
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 |
|
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 |
|
|
|
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 |
|
TimofeyBoyko
|
32994832e4
|
Web:Client:EmptyContainer: add new translaton key for free user at shared empty page
|
2022-10-13 19:14:20 +05: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 |
|
|
|
0ba61c940b
|
Web:Client:Add translation "ThirdPartyResource".
|
2022-10-06 12:44:14 +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 |
|
mushka
|
6ef11ff695
|
fixed spelling in FilesEmptyScreenText translation key
|
2022-10-02 03:20:29 +03:00 |
|
mushka
|
6fbac45198
|
complete overhaul of translation kets in en & ru InfoPanel locales, changed history translations
|
2022-10-02 02:24:49 +03:00 |
|
TimofeyBoyko
|
d1c77c37d0
|
Web:Client:Locales: fix translation key
|
2022-09-29 13:07:27 +03:00 |
|
TimofeyBoyko
|
c3c4316c93
|
Web:Client:Locales: add new translation keys for profile
|
2022-09-28 18:17:39 +03:00 |
|
TimofeyBoyko
|
4626fbf7a7
|
Web:Client:Locales: change translation key 'Manager' to 'Room admin
|
2022-09-27 13:12:39 +03:00 |
|
TimofeyBoyko
|
a8893025ff
|
Web:Client: add new translation keys for Main bar
|
2022-09-27 12:29:17 +03:00 |
|
mushka
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +03:00 |
|
mushka
|
4627ad75a7
|
deleted unused InfoPanelHistory.json
|
2022-09-26 10:43:16 +03:00 |
|
mushka
|
da139d8bbc
|
added new tranaslation keys to InfoPanel.json
|
2022-09-26 10:40:46 +03:00 |
|
|
|
33d0c10eb3
|
Merge branch 'develop' into feature/personal-redesign-empty-screen
|
2022-09-23 16:53:50 +03:00 |
|
|
|
7f1d946269
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
|
2022-09-23 16:11:23 +03:00 |
|
