Commit Graph

5 Commits

Author SHA1 Message Date
073aa9943f Fix WrongTranslationVariablesTest issues + added missing files and key sorting 2022-10-25 14:52:15 +03:00
c026e186a7 Confirm: add translates 2022-08-19 22:43:46 +03:00
74b7e3886b Client: add translates 2022-08-18 16:54:38 +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
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00