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 |
|
|
|
9e0bc49c6f
|
Merge branch 'develop' into feature/portal-deactivation
|
2022-10-20 15:04:54 +03:00 |
|
|
|
42d9a6682c
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-19 17:54:58 +03:00 |
|
|
|
b99bde994e
|
Web: Files: fixed LanguageTimeSettingsTooltip translation
|
2022-10-19 16:01:32 +03:00 |
|
|
|
8146e9aef4
|
Merge branch 'develop' into feature/portal-deactivation
|
2022-10-15 13:43:10 +05:00 |
|
|
|
28d918464f
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-13 15:48:31 +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 |
|
|
|
9071278cfe
|
Web:Client:Fix translation "BreakpointWarningTextPrompt", "CompanyInfoSettingsDescription".
|
2022-09-14 18:11:00 +03:00 |
|
|
|
7decafcdc0
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-14 10:18: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 |
|
|
|
9614fcab32
|
Web:Client:Add "TheBrandingSettings" translation.
|
2022-09-13 14:08:32 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
8df94b6af1
|
i18n: Translations: fix project files + sorting
|
2022-09-09 18:02:39 +03:00 |
|
|
|
b8f5438c19
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-09 17:10:04 +03:00 |
|
|
|
310a189a66
|
Web:Client:Add locales "AdditionalResourcesDescription","DocSpaceMenu".
|
2022-09-09 12:34:31 +03:00 |
|
|
|
cd99a3b7b9
|
Web:Client:Add translation "BrandingSectionDescription", "CompanyInfoSettingsDescription".
|
2022-09-07 18:18:51 +03:00 |
|
|
|
f96784ba5d
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Errors.json
|
2022-09-06 00:22:24 +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 |
|
|
|
e84ba1ff80
|
Merge branch 'develop' into feature/dns-settings
|
2022-09-02 13:05:58 +03:00 |
|
|
|
3d5447bfa2
|
Web:Added translations for dns.
|
2022-09-02 12:37:00 +03:00 |
|
|
|
1116843315
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Settings.json
|
2022-09-02 01:25:30 +03:00 |
|
|
|
89f9e10f84
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-09-02 01:24:12 +03:00 |
|
|
|
778b27ed5c
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 12:55:38 +03:00 |
|
|
|
547c1782f1
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
|
2022-08-30 12:34:48 +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 |
|
|
|
eaa4bf40b3
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-28 00:18:48 +03:00 |
|
|
|
17a557e96a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-28 00:12:05 +03:00 |
|
Vlada Gazizova
|
302e2e655a
|
Merge branch 'develop' into feature/settings-common
|
2022-08-27 12:17:44 +03:00 |
|
|
|
a9b8a64e61
|
Web: Added translation for rooms module.
|
2022-08-26 18:59:28 +03:00 |
|
|
|
2bfa12f8b6
|
Web: Changed translations, deleted useless translations.
|
2022-08-26 17:54:50 +03:00 |
|
|
|
92d4cba5c1
|
Web: Client: added en translation for security history
|
2022-08-26 19:06:14 +05:00 |
|
|
|
ac47004401
|
Web: Fixed translations.
|
2022-08-26 10:25:56 +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 |
|
|
|
a8142c3446
|
Client: add translates
|
2022-08-25 19:24:20 +03:00 |
|
|
|
543c6a222d
|
Client: add translates
|
2022-08-25 13:35:15 +03:00 |
|
|
|
5e3a65cce3
|
Client: add translates, remove duplicate
|
2022-08-23 14:05:56 +03:00 |
|
|
|
06cf08c4f5
|
Web:Client:Added translations "AdditionalResources", "CompanyInfoSettings", change "TimeZone".
|
2022-08-23 13:42:37 +03:00 |
|
|
|
95a41119f6
|
Client: move translates
|
2022-08-23 13:21:37 +03:00 |
|
|
|
52a008ca61
|
Web: Fixed translations,icons.
|
2022-08-22 16:16:49 +03:00 |
|
|
|
ffb684cddf
|
Web:Client:Added translations "Appearance", "Branding".
|
2022-08-18 12:01:14 +03:00 |
|
|
|
d99293bdff
|
Web: Fixed translation, added icon.
|
2022-08-16 17:54:44 +03:00 |
|
|
|
e3d7f4cee8
|
Web: Added translations.
|
2022-08-15 17:03:55 +03:00 |
|
