Commit Graph

15 Commits

Author SHA1 Message Date
e531654c54 Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
#	common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
#	common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
#	config/nginx/onlyoffice.conf
#	packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/common/api/files/index.js
#	packages/components/.storybook/preview.js
#	packages/components/package.json
#	packages/editor/src/server/lib/helpers/index.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-08-11 12:47:44 +03:00
8ba1099358 Web: Optimize fonts import 2023-08-03 21:54:09 +04:00
c48ba03028 Web: Components: Remove applying RTL to storybook docs 2023-07-11 19:09:56 +02:00
76ceddc6cc Web: Components: Fix RTL switcher after merging develop 2023-06-30 11:04:03 +02:00
063a95c889 Merge branch 'develop' into feature/rtl-interface-direction
# Conflicts:
#	packages/components/.storybook/globals/index.js
#	packages/components/.storybook/preview.js
#	packages/components/email-chips/styled-emailchips.js
#	packages/components/email-chips/sub-components/chip.js
#	packages/components/filling-status-line/styled-filling-status-line.js
#	packages/components/selector/StyledSelector.js
#	packages/components/selector/sub-components/Item/index.tsx
#	packages/components/selector/sub-components/SelectAll/index.tsx
2023-06-30 10:49:17 +02:00
Vladimir Khvan
75ae0c24c9 logo was fixed 2023-06-22 18:12:22 +05:00
Vladimir Khvan
c309186a52 theming was changed 2023-06-21 16:33:47 +05:00
c239f7a67d Web: Components: Add RTL-switcher to new Storybook 2023-06-02 11:08:39 +02:00
DmitrySychugov
3fccdff213 Web: Components: added dark mode switcher for storybook docs 2023-05-30 20:13:14 +05:00
DmitrySychugov
f393945385 Web: Components: fixed before initialization errors 2023-05-30 16:49:53 +05:00
DmitrySychugov
f2509a1b81 Web: Components: code refactoring 2023-05-05 17:10:45 +05:00
DmitrySychugov
5b32659dd8 Web: Components: fixed bug with themes, changed context to global types 2023-05-04 20:08:02 +05:00
DmitrySychugov
ef1658652c Web: Components: hidden docs tab 2023-04-25 12:54:30 +05:00
DmitrySychugov
c8dd1a6915 Web: Common: added fonts in storybook 2023-03-13 16:57:47 +05:00
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00