Commit Graph

2079 Commits

Author SHA1 Message Date
TimofeyBoyko
b8a5f121e3 Web:Client: add new translation keys for accounts empty screen page 2022-08-17 14:49:53 +03:00
TimofeyBoyko
c8cf18030e Web:Client: add new key for en locale 'Manager' 2022-08-16 18:43:04 +03:00
d99293bdff Web: Fixed translation, added icon. 2022-08-16 17:54:44 +03:00
24d19b37ee Web: Transferred page into settings. 2022-08-16 17:49:44 +03:00
0238498377 Web: Added description if people count is more then limit. 2022-08-16 17:02:54 +03:00
b65b7c75e5 Move translates from NavMenu to Login 2022-08-16 16:26:00 +03:00
3309e68cd8 Web: Added disabling the component if the person does not have access rights. 2022-08-16 14:26:50 +03:00
12a83327b0 Web: Added payments page. 2022-08-16 10:49:34 +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
mushka
868ca37341 added svg for icon-croppper grid 2022-08-15 15:49:19 +03:00
0fb9979ee0 Client: add translation 2022-08-15 14:17:30 +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
048237dffc Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
#	packages/client/src/pages/Confirm/sub-components/deactivatePortal.js
#	packages/client/src/pages/Confirm/sub-components/removePortal.js
#	packages/client/src/pages/PortalSettings/categories/data-management/index.js
#	packages/client/src/pages/PortalSettings/categories/delete-data/DeleteDataLoader.js
#	packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js
#	packages/client/src/pages/PortalSettings/categories/delete-data/index.js
#	packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js
#	packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/src/components/pages/Confirm/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
2022-08-11 21:47:39 +03:00
b252732ed2 SSO: add translate 2022-08-08 13:55:23 +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
c8c4395d4c SSO: fix modal style 2022-08-02 17:35:19 +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
af5cfe6553 Web: Rename translation file on 'en' 2022-08-01 18:03:27 +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