Commit Graph

14 Commits

Author SHA1 Message Date
DmitrySychugov
100d5ef173 Web: fixed tags folder name for storybook 2023-05-31 18:31:52 +05:00
19e8b2210a Merge branch 'master' into develop
# Conflicts:
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/Home/index.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/common/components/Section/index.js
#	packages/components/floating-button/styled-floating-button.js
#	packages/login/src/client/App.tsx
#	packages/login/src/client/components/Invalid/index.tsx
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	yarn.lock
2023-05-29 14:36:12 +03:00
6e723a37a1 Web:Moved the Tags component from the Common module to the Components module. 2023-05-25 16:12:45 +03:00
b72b96c8c9 Web: Replacing import "@docspace/common/components/ColorTheme" with "@docspace/components/ColorTheme". 2023-05-24 18:28:06 +03:00
Viktor Fomin
b8a5bca3ca Fix Bug 62520: Uninformative message when trying to load an unsupported file format 2023-05-10 17:38:37 +03:00
Viktor Fomin
df4c90d838 Components: ImageEditor: add error handler 2023-05-02 14:22:28 +03:00
0b911b0d36 Web: Moved SizeImageLarge translation key to Common 2023-03-14 14:44:57 +04:00
eb86665d70 Web: Fix some translations issues 2023-03-14 14:30:58 +04:00
Elyor Djalilov
289dbab023 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-27 19:54:48 +05:00
Elyor Djalilov
14c0d8ce09 Fix Bug - Accounts. Upload multiple image 2023-01-27 19:54:41 +05:00
Timofey Boyko
baa30e0305 Web:Common/Client/Components: add PUBLIC_DIR alias 2023-01-27 17:08:30 +03:00
Timofey Boyko
6b8afcaa33 Web: add import svg with url 2023-01-11 18:08:01 +03:00
Timofey Boyko
25818e9ad0 Web: delete equal md5 equal name duplicates images 2023-01-10 17:29:12 +03:00
Akmal Isomadinov
49bfcf917a Web: Combining avatar Editor and IconEditor components into one component and removing avatarEditor and IconEditor components 2023-01-04 15:28:52 +05:00