Commit Graph

32 Commits

Author SHA1 Message Date
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
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
310a189a66 Web:Client:Add locales "AdditionalResourcesDescription","DocSpaceMenu". 2022-09-09 12:34:31 +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
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
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
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
e3d7f4cee8 Web: Added translations. 2022-08-15 17:03:55 +03:00
b82a4206e0 Merge branch 'develop' into feature/settings-common 2022-08-12 18:04:11 +03:00
6c2b49470c WEb: Fixed after merge. 2022-08-12 13:25:29 +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
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00