|
|
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 |
|
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
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +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 |
|
|
|
a778e10d58
|
Web:Client:Delete old translation "MyEmptyContainerDescription".
|
2022-09-22 15:30:55 +03:00 |
|
|
|
7133d20a69
|
Web:Client:Delete translation "SubheadingEmptyText".
|
2022-09-21 18:09:35 +03:00 |
|
mushka
|
19cbf4bc40
|
updated russian InfoPanel translation keys
|
2022-09-20 14:08:32 +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 |
|
|
|
6b3ebed8b9
|
Web: Fixed bugs.
|
2022-09-19 11:59:47 +03:00 |
|
|
|
7dec07dc69
|
Web:Client:Delete old translation.
|
2022-09-19 11:28:05 +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 |
|
|
|
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 |
|
TimofeyBoyko
|
0dba384037
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-15 14:29:57 +03:00 |
|
TimofeyBoyko
|
fe98362066
|
Web:Client: change translation key 'ByLastModifiedDate' to 'ByLastModified'
|
2022-09-15 14:07:02 +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 |
|
|
|
c0244b5400
|
Web: Added plan title from the store.
|
2022-09-14 17:17:40 +03:00 |
|
|
|
28a3096a25
|
Web: Files: Settings: styling + new translations
|
2022-09-14 12:37:33 +03:00 |
|
|
|
8e78498856
|
Wed: Added new stores.
|
2022-09-14 09:55:22 +03:00 |
|
|
|
d94918a1de
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-13 10:52:26 +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 |
|
|
|
377d3be960
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-10 19:46:57 +03:00 |
|
|
|
8df94b6af1
|
i18n: Translations: fix project files + sorting
|
2022-09-09 18:02:39 +03:00 |
|
mushka
|
ab7ace5af6
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-09 13:22:36 +03:00 |
|
|
|
05c01d85e6
|
Web: Fix toast translations (Remove room(s) issue)
|
2022-09-09 11:22:04 +03:00 |
|
|
|
d016efea48
|
Web: Moved translations to the common.
|
2022-09-09 11:12:02 +03:00 |
|
TimofeyBoyko
|
ec0e91ee99
|
Merge branch 'feature/change-owner-dialog' of github.com:ONLYOFFICE/DocSpace into feature/change-owner-dialog
|
2022-09-08 18:36:04 +03:00 |
|
TimofeyBoyko
|
07c7352604
|
Web:Client:Locales: clone translation for ChangePortalOwner
|
2022-09-08 18:19:46 +03:00 |
|
|
|
5954c20c37
|
Web: Translations: Moved all toasts title translations to Common.json
|
2022-09-08 12:10:33 +03:00 |
|
|
|
e4c47bd230
|
Web: Added the number of days of delay in translations.
|
2022-09-06 18:25:53 +03:00 |
|
|
|
a9b7facd9a
|
Web: Added information if the user is not found.
|
2022-09-06 14:13:00 +03:00 |
|
|
|
afe2de7521
|
Web: Added new translations.
|
2022-09-06 11:04:16 +03:00 |
|
|
|
150060faff
|
Web: Refactoring, added downgrade plan button.
|
2022-09-06 10:52:02 +03:00 |
|
|
|
3ba7052e2f
|
Web: Added downgrade plan dialog.
|
2022-09-06 10:50:11 +03:00 |
|
mushka
|
0a2318ea59
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 20:53:35 +03:00 |
|
mushka
|
f0956da7d0
|
translated keys in /Files to russian (for context options)
|
2022-09-05 18:02:56 +03:00 |
|
|
|
b034f904f9
|
Web: It was hid cost calculation in grace and expired periods.
|
2022-09-05 17:30:07 +03:00 |
|
|
|
7b623c4e30
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/common/store/AuthStore.js
# packages/components/slider/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2022-09-05 10:19:52 +03:00 |
|
|
|
89f9e10f84
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-09-02 01:24:12 +03:00 |
|
|
|
de00a24e3a
|
Web: Added pay button.
|
2022-09-01 17:52:47 +03:00 |
|
|
|
69b692bd40
|
Web: Added functionality for the expired period.
|
2022-09-01 17:28:08 +03:00 |
|
Artem Tarasov
|
4ac1eb4c5c
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/IndicatorLoader/index.js
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/UploadPanel/SubComponents/LoadingButton.js
# packages/client/src/pages/About/AboutContent.js
# packages/client/src/pages/Confirm/sub-components/activateEmail.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/VersionHistory/Section/Body/VersionBadge.js
# packages/client/src/store/TargetUserStore.js
# packages/common/components/ColorTheme/ColorTheme.js
# packages/common/components/FilterInput/sub-components/FilterBlockItem.js
# packages/common/components/FilterInput/sub-components/FilterButton.js
# packages/common/components/FloatingButton/FloatingButton.js
# packages/common/components/Navigation/sub-components/item.js
# packages/common/store/AuthStore.js
# packages/components/badge/index.js
# packages/components/button/index.js
# packages/components/calendar/index.js
# packages/components/catalog-item/index.js
# packages/components/combobox/sub-components/combo-button.js
# packages/components/input-block/index.js
# packages/components/main-button/index.js
# packages/components/submenu/index.js
# packages/components/tabs-container/index.js
# packages/components/text-input/text-input.js
# packages/components/textarea/index.js
# packages/components/toggle-button/index.js
# packages/login/src/Login.jsx
|
2022-08-31 16:25:55 +03:00 |
|
|
|
33fa1dd087
|
Web: Added sales department request dialog.
|
2022-08-31 12:55:34 +03:00 |
|
Artem Tarasov
|
0621fd9c86
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/dialogs/ConnectDialog/index.js
# packages/login/src/Login.jsx
# packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# yarn.lock
|
2022-08-30 18:38:12 +03:00 |
|
|
|
605aee5529
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 11:55:19 +05:00 |
|
|
|
dc3ba67fea
|
Web: Client: added DownloadReportBtn ru translation
|
2022-08-30 11:53:06 +05:00 |
|
|
|
c794bf5308
|
Web: Fixed warnings.
|
2022-08-29 17:51:10 +03:00 |
|
|
|
8ab27efaef
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-29 17:19:16 +03:00 |
|
mushka
|
435e15b217
|
added enw translation keys for dropzone
|
2022-08-29 13:49:43 +03:00 |
|
|
|
9154b971c0
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
# packages/common/api/settings/index.js
# packages/common/components/Loaders/index.js
|
2022-08-29 13:06:44 +03:00 |
|
|
|
e3e47364e0
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-29 13:36:09 +05:00 |
|
|
|
17a557e96a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-28 00:12:05 +03:00 |
|
Artem Tarasov
|
0a3ebbc436
|
Web: Login: translations for InvalidError moved to login
|
2022-08-27 01:48:29 +03:00 |
|
mushka
|
56c2cd64c5
|
Merge branch 'develop' into feature/create-room
|
2022-08-26 19:28:06 +03:00 |
|
|
|
2bfa12f8b6
|
Web: Changed translations, deleted useless translations.
|
2022-08-26 17:54:50 +03:00 |
|
|
|
80e83b0b2b
|
Web: Client: added ru translation for security history
|
2022-08-26 19:10:16 +05:00 |
|
|
|
ac47004401
|
Web: Fixed translations.
|
2022-08-26 10:25:56 +03:00 |
|
|
|
8998c9ee5b
|
Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup
|
2022-08-26 10:21:08 +03:00 |
|
|
|
084cea375a
|
Web: Fixed translation for module documents.
|
2022-08-26 10:18:54 +03:00 |
|
|
|
63ba97d982
|
Web: Fixed styles.
|
2022-08-26 08:14:44 +03:00 |
|
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
|
|
1354b95534
|
Client: delete useless translates
|
2022-08-25 13:00:22 +03:00 |
|
mushka
|
2b936a8879
|
added new roomType translation in russian
|
2022-08-24 19:50:09 +03:00 |
|
|
|
61ff3cfd15
|
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe
|
2022-08-24 18:00:33 +03:00 |
|
|
|
4f666dfe25
|
Web: Added portal unavailable page.
|
2022-08-24 14:59:21 +03:00 |
|
|
|
6c331a3074
|
Web: Added functionality for the grace period.
|
2022-08-24 10:25:08 +03:00 |
|
|
|
95a41119f6
|
Client: move translates
|
2022-08-23 13:21:37 +03:00 |
|
|
|
737359b21a
|
Merge branch 'develop' into feature/stripe
|
2022-08-23 12:05:06 +03:00 |
|
|
|
52a008ca61
|
Web: Fixed translations,icons.
|
2022-08-22 16:16:49 +03:00 |
|
|
|
80f0e53912
|
Web: Fixed translation.
|
2022-08-22 13:22:58 +03:00 |
|
|
|
8c0e685f29
|
Web: Fixed translations.
|
2022-08-22 12:54:54 +03:00 |
|
|
|
3854d484a4
|
Web: Added an alert about a free tariff.
|
2022-08-22 11:59:18 +03:00 |
|
|
|
514b874124
|
Web: Added tooltip for payer.
|
2022-08-18 18:46:02 +03:00 |
|
|
|
9ea79e41a1
|
Web: Added payer container.
|
2022-08-18 18:44:56 +03:00 |
|
|
|
7b7218a4c1
|
Web: Added tooltip.
|
2022-08-18 15:22:03 +03:00 |
|
|
|
a47c4c09fb
|
Web: Added due date, added date conversion according to page language.
|
2022-08-18 13:47:33 +03:00 |
|
|
|
8fefd3debb
|
Merge branch 'develop' into feature/create-room
|
2022-08-18 11:25:02 +03:00 |
|
|
|
b65b7c75e5
|
Move translates from NavMenu to Login
|
2022-08-16 16:26:00 +03:00 |
|
|
|
e3d7f4cee8
|
Web: Added translations.
|
2022-08-15 17:03:55 +03:00 |
|
mushka
|
4379a34bcf
|
Merge branch 'develop' into feature/create-room
|
2022-08-15 16:01:20 +03:00 |
|
mushka
|
a2ef8d46b5
|
updated and edited translations
|
2022-08-15 15:49:43 +03:00 |
|
|
|
6c2b49470c
|
WEb: Fixed after merge.
|
2022-08-12 13:25:29 +03:00 |
|
|
|
cf0e9e05a1
|
SSO: fix translate
|
2022-08-04 14:42:59 +03:00 |
|
mushka
|
4272c1f661
|
small stranslation fix
|
2022-08-03 16:34:14 +03:00 |
|
mushka
|
507979d9cc
|
added translation keys for storageLocation and MakePrivate secondary infos
|
2022-08-03 14:55:59 +03:00 |
|
mushka
|
50c6a82c8c
|
added translation keys for room types
|
2022-08-03 14:47:30 +03:00 |
|
mushka
|
ea8aa736c4
|
merge with develop
|
2022-08-02 14:11:41 +03:00 |
|
|
|
03b03ed910
|
Merge branch 'develop' into feature/sso
# Conflicts:
# packages/client/public/images/actions.upload.react.svg
# packages/client/public/images/empty_screen_privacy.png
# packages/client/public/locales/en/SingleSignOn.json
# packages/client/public/locales/ru/SingleSignOn.json
# packages/client/src/helpers/constants.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerItem.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerModalDialog.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerToggle.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/modalDialogContainer.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
# packages/client/src/pages/PortalSettings/categories/integration/thirdPartyServicesSettings.js
# packages/client/src/store/SsoFormStore.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
|
2022-08-02 12:05:15 +03:00 |
|
|
|
53737a06e8
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/editor/src/client/components/DynamicComponent.js
# packages/editor/src/client/components/Editor.js
# packages/editor/src/client/components/SelectFileDialog.js
# packages/editor/src/client/components/SelectFolderDialog.js
# packages/editor/src/client/components/SharingDialog.js
# packages/editor/src/client/helpers/utils.js
# packages/editor/src/client/helpers/withDialogs.js
# packages/editor/src/server/lib/helpers/index.js
|
2022-07-28 10:38:29 +03:00 |
|
|
|
f9640a400c
|
Web: Moved 'People' images and translations to 'Client'
|
2022-07-25 10:29:16 +03:00 |
|
|
|
c956d8b696
|
Web: Merged 'Files' module with 'Client' and fixed paths
|
2022-07-24 19:57:03 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
