Commit Graph

429 Commits

Author SHA1 Message Date
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
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
mushka
7ad6d99c0f updated key name for InfoPanel translations 2022-10-02 02:24:00 +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
3e7661899e Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation 2022-09-24 01:51:56 +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
57f9f8420f Merge branch 'develop' into feature/invite-panel 2022-09-22 18:13:42 +03:00
a778e10d58 Web:Client:Delete old translation "MyEmptyContainerDescription". 2022-09-22 15:30:55 +03:00
295c39b050 Web:Client:Change translation "MyEmptyContainerDescription" in "PersonalEmptyContainerDescription". 2022-09-22 15:30:22 +03:00
2ed2f68cb6 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-22 12:48:46 +03:00
058d3acbd3 Merge branch 'develop' into feature/favorites-redesign-empty-screen 2022-09-21 18:15:08 +03:00
7133d20a69 Web:Client:Delete translation "SubheadingEmptyText". 2022-09-21 18:09:35 +03:00
ee42f4be3a Merge branch 'develop' into bugfix/trash-context-menu
# Conflicts:
#	packages/client/public/locales/en/Files.json
2022-09-21 17:18:42 +03:00
a642d42bcc Client: fix translations 2022-09-21 16:16:19 +03:00
TimofeyBoyko
f1e6d9c8f4 Web:Client:Locales: add new translation keys for trash context menu 2022-09-21 15:58:52 +03:00
79fa7815c4 Merge branch 'develop' into feature/company-info-settings 2022-09-21 14:48:28 +03:00
16feeaf988 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
#	packages/client/src/Shell.jsx
2022-09-21 14:00:17 +03:00
64fd6d387e Merge branch 'develop' into feature/invite-panel 2022-09-21 13:13:08 +03:00
2b2aeea246 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-21 12:48:03 +03:00
mushka
c835f2960c Merge branch 'develop' into feature/doc-space-info-panel 2022-09-20 14:21:44 +03:00
mushka
82471a5d2c created new InfoPanelHistory json file for feed translation and added new keys 2022-09-20 14:09:04 +03:00
mushka
19cbf4bc40 updated russian InfoPanel translation keys 2022-09-20 14:08:32 +03:00
mushka
c42b743835 deleted old feed translations 2022-09-20 14:08:03 +03:00
2e44136820 Merge branch 'feature/archived-redesign-empty-screen' into feature/recent-redesign-empty-screen 2022-09-20 11:06:06 +03:00
ead5485288 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-19 23:30:28 +03:00
6448b63318 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/constants/index.js
#	web/ASC.Web.Api/Program.cs
2022-09-19 18:16:34 +03:00
8f1a8deda9
Merge branch 'develop' into feature/archived-redesign-empty-screen 2022-09-19 13:48:26 +03:00
6b3ebed8b9 Web: Fixed bugs. 2022-09-19 11:59:47 +03:00
13e47e8c40 Web:Client:Add translation "RoomEmptyContainerDescription". 2022-09-19 11:32:57 +03:00
7dec07dc69 Web:Client:Delete old translation. 2022-09-19 11:28:05 +03:00
a4919f43c8 Web:Client:Add translation "GoToPersonal", "NoFilesHereYet", change "RecentEmptyContainerDescription". 2022-09-19 11:25:11 +03:00
TimofeyBoyko
39366b49ab Web:Client:Components: add new tranlsation key for rooms emptyFilterContainer 2022-09-19 11:23:32 +03:00
ae0eb0a143 Merge branch 'develop' into feature/archived-redesign-empty-screen 2022-09-19 09:55:07 +03:00
e8531daac8 Merge branch 'develop' into feature/invite-panel 2022-09-19 09:46:21 +03:00
mushka
9c8fa64983 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-16 15:33:29 +03:00
mushka
fb0e23b2cf added some translations for history 2022-09-16 15:12:03 +03:00
0f45e83a41 Web:Client:Add translation "GoToShared". 2022-09-16 11:11:05 +03:00
de122f813e Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-15 21:17:28 +03:00
6438bca15d Web: Files: Fix translation 2022-09-15 20:47:04 +03:00
30618e3e22 Web: Files: Fix translation 2022-09-15 20:43:35 +03:00
bec4f11dcd Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
2022-09-15 17:16:04 +03:00
21fc46b8bc Web: Removed useless translations. 2022-09-15 15:07:26 +03:00
aa195fe76b
Merge branch 'develop' into feature/company-info-settings 2022-09-15 14:40:00 +03:00
TimofeyBoyko
0dba384037 Merge branch 'develop' into feature/redesign-personal-filter 2022-09-15 14:29:57 +03:00
TimofeyBoyko
8480a1f525 Web:Client:Home: add new translation key 'ByLastModifiedDate' for filter sort 2022-09-15 14:08:18 +03:00
TimofeyBoyko
fe98362066 Web:Client: change translation key 'ByLastModifiedDate' to 'ByLastModified' 2022-09-15 14:07:02 +03:00
TimofeyBoyko
1ca5819e0f Web:Client:Home: add new translation key 'ByCreationDate' for filter sort 2022-09-15 14:05:51 +03:00
TimofeyBoyko
977dc1f7ed Web:Client: change translation key 'ByCreationDate' to 'ByCreation' 2022-09-15 14:02:53 +03:00
20fe2a3763 Web:Added values for the downgrade plan dialog from the stores. 2022-09-15 12:54:00 +03:00
95de5a66c8 Merge branch 'develop' into feature/archived-redesign-empty-screen 2022-09-15 10:26:56 +03:00
9071278cfe Web:Client:Fix translation "BreakpointWarningTextPrompt", "CompanyInfoSettingsDescription". 2022-09-14 18:11:00 +03:00
c0244b5400 Web: Added plan title from the store. 2022-09-14 17:17:40 +03:00
TimofeyBoyko
11ba9f379c Merge branch 'develop' into feature/redesign-personal-filter 2022-09-14 16:35:18 +03:00
TimofeyBoyko
d65255f47d Web:Client:Home: chage translation key 'MasterForms' to 'FormsTemplates' 2022-09-14 16:31:20 +03:00
28a3096a25 Web: Files: Settings: styling + new translations 2022-09-14 12:37:33 +03:00
f3412fa2f8 Merge branch 'develop' into feature/redisign-files-settings 2022-09-14 11:20:37 +03:00
b546a367e1 Merge branch 'develop' into feature/invite-panel 2022-09-14 10:18:41 +03:00
7decafcdc0 Merge branch 'develop' into feature/company-info-settings 2022-09-14 10:18:22 +03:00
8e78498856 Wed: Added new stores. 2022-09-14 09:55:22 +03:00
ed18968601 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
#	packages/client/public/locales/en/Errors.json
#	packages/client/public/locales/en/Settings.json
2022-09-14 01:45:01 +03:00
033259116f Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/common/settingsAppearance/preview.js
2022-09-14 01:15:03 +03:00
6acca331b4 Merge branch 'develop' into feature/company-info-settings 2022-09-13 17:56:02 +03:00
8030f66036 Web: Fix translations 2022-09-13 17:23:52 +03:00
795e76f9d5 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-13 16:42:09 +03:00
9614fcab32 Web:Client:Add "TheBrandingSettings" translation. 2022-09-13 14:08:32 +03:00
TimofeyBoyko
42d6b3e7d3 Web: add new translation keys 2022-09-13 13:47:40 +03:00
bcf6fbb358 Merge branch 'develop' into feature/invite-panel 2022-09-13 12:12:48 +03:00
TimofeyBoyko
2f940452ad Merge branch 'develop' into feature/redesign-personal-filter 2022-09-13 11:08:51 +03:00
d94918a1de Merge branch 'develop' into feature/additional-resources 2022-09-13 10:52:26 +03:00
9fcccfaa42 Web: Client: Locales: Added translations for roles 2022-09-12 18:47:50 +03:00
16a9dc020d Web: Files: fixed catalog-header translation, moved "Other" translation to Translations.json, added "Rooms" translation 2022-09-12 14:32:54 +03:00
88e8218bf4 Web:Client:Delete ModalDialog. 2022-09-12 12:50:53 +03:00
7540d85405 Web:Client:Add "WhiteLabelSubtitle", "WhiteLabelHelper", "WhiteLabelTooltip". 2022-09-12 12:29:17 +03:00
TimofeyBoyko
939b3651df Web:Client:Locales: fix translation key for filter header 2022-09-12 11:52:32 +03:00
866e7d616f Merge branch 'develop' into feature/archived-redesign-empty-screen 2022-09-12 11:44:47 +03:00
4bbef5fd6d Merge branch 'develop' into feature/company-info-settings 2022-09-12 11:38:18 +03:00
e476b26601 Web:Client:Change name locales "RestoreDefaultButton". 2022-09-12 11:29:10 +03:00
d19caa298d Merge branch 'develop' into feature/invite-panel 2022-09-12 10:50:43 +03:00
8db56ce0ad Web:Client:Add locales "ShowFeedbackAndSupport","ShowSampleDocuments","ShowVideoGuides","ShowHelpCenter". 2022-09-10 20:45:03 +03:00
377d3be960 Merge branch 'develop' into feature/additional-resources 2022-09-10 19:46:57 +03:00
741378d08f Web:Client:Add locales "Site", change "AboutCompanyEmailTitle", "AboutCompanyAddressTitle". 2022-09-10 19:10:40 +03:00
8df94b6af1 i18n: Translations: fix project files + sorting 2022-09-09 18:02:39 +03:00
4b3f9f7e29 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/components/dialogs/index.js
2022-09-09 17:34:19 +03:00