|
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 |
|
|
f4f4ae28db
|
Web: Components: Added link to figma
|
2023-08-07 16:01:38 +04:00 |
|
|
2ed45502a2
|
Web: Components: ProgressBar refactoring
|
2023-08-07 15:41:03 +04:00 |
|
|
2465c07f47
|
Web: Components: Applied new styles
(cherry picked from commit 06b9e44cfd )
|
2023-08-07 14:07:13 +04:00 |
|
|
cb027610a7
|
Create index.js
(cherry picked from commit 5e4eb5a599 )
|
2023-08-07 14:07:02 +04:00 |
|
|
52a80b9304
|
Web: Components: Restored old progress-bar
(cherry picked from commit e6e02945f4 )
|
2023-08-07 14:06:40 +04:00 |
|
|
638807a0e0
|
Merge branch 'develop' into feature/deep-link
|
2023-08-04 19:01:14 +04:00 |
|
|
8ba1099358
|
Web: Optimize fonts import
|
2023-08-03 21:54:09 +04:00 |
|
|
31c0629bc5
|
Merge branch 'develop' into feature/rtl-interface-direction
|
2023-08-02 10:49:16 +02:00 |
|
|
12558b8520
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# packages/client/src/components/Article/Body/index.js
# packages/client/src/components/panels/OperationsPanel/index.js
# packages/client/src/pages/About/AboutContent.js
# packages/client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# yarn.lock
|
2023-08-01 17:56:22 +03:00 |
|
Subhonbek
|
982d2f41ec
|
Merge branch 'develop' into feature/rtl-interface-direction
|
2023-08-01 16:19:35 +03:00 |
|
|
51fb13d035
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/pages/Files.jsx
# packages/common/components/Navigation/Navigation.js
# packages/common/components/Navigation/sub-components/control-btn.js
# packages/common/components/Navigation/sub-components/plus-btn.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/Server/Api/OperationController.cs
# yarn.lock
|
2023-08-01 14:39:31 +03:00 |
|
|
48da6bb520
|
Web: Client: Components: Move id to top div of Scrollbar component. Add class to wrapper element of Scrollbar
|
2023-07-31 17:18:05 +02:00 |
|
|
30c4e4bbaa
|
Web: bump version to v1.1.2
|
2023-07-28 21:03:52 +04:00 |
|
|
e99ce6d9d8
|
Web: Components: Avoid using unnecessary callbacks when autoHide is disabled
|
2023-07-28 14:17:56 +02:00 |
|
|
dddd935eed
|
Web: Components: Avoid using unnecessary callbacks when autoHide is disabled
|
2023-07-28 12:35:19 +02:00 |
|
|
634422e4a3
|
Web: Components: Fix position of buttons in TableGroupMenu
|
2023-07-28 10:31:53 +02:00 |
|
|
8e4c7d96d1
|
Web: Components: Refactor scrollbar
|
2023-07-28 10:05:53 +02:00 |
|
|
f11870f6f8
|
Web: Components: Add scroll-body position to make children calculate width from scroll-body
|
2023-07-27 14:54:31 +02:00 |
|
|
ef56084b68
|
Web: Components: Fix getting wrong scroll element in InfiniteLoader
|
2023-07-27 12:56:17 +02:00 |
|
|
37efdc292a
|
Merge branch 'develop' into feature/rtl-interface-direction
# Conflicts:
# packages/client/src/components/panels/HotkeysPanel/index.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/components/date-time-picker/index.js
# packages/components/selected-item/styled-selected-item.js
|
2023-07-26 17:47:13 +02:00 |
|
|
9acbcfb45c
|
Web: Components: Fix scrollbar crash when clientX 0
|
2023-07-26 15:23:42 +02:00 |
|
|
3afb08e154
|
Web: Components: Refactor scrollbar component
|
2023-07-26 14:20:33 +02:00 |
|
|
63ee6c4c65
|
Web: Client: Refactor tab position functions
|
2023-07-26 13:09:22 +02:00 |
|
|
28b8bc346e
|
Merge branch 'develop' into feature/rtl-interface-direction
# Conflicts:
# .gitignore
# packages/common/store/SettingsStore.js
# packages/components/file-input/styled-file-input.js
# packages/components/modal-dialog/styled-modal-dialog.js
# yarn.lock
|
2023-07-25 14:01:29 +02:00 |
|
|
35b5b1c560
|
Web: Components: Adapt drag and drop component to RTL
|
2023-07-25 13:53:32 +02:00 |
|
|
f3765018f1
|
Web: bump version
|
2023-07-25 14:02:50 +04:00 |
|
|
7d727e0842
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/components/dialogs/index.js
# packages/client/src/components/panels/UploadPanel/index.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/FilesStore.js
|
2023-07-25 13:01:21 +03:00 |
|
Viktor Fomin
|
09a50c84a5
|
Merge branch 'develop' into feature/deep-link
|
2023-07-25 12:54:36 +03:00 |
|
|
6ee5dc0263
|
Merge remote-tracking branch 'origin/feature/rtl-interface-direction' into feature/rtl-interface-direction
|
2023-07-24 13:53:25 +02:00 |
|
|
55b6297928
|
Web: Components: Fix scroll when file element is not visible
|
2023-07-24 13:40:56 +02:00 |
|
Subhonbek
|
a2d6b0baf2
|
web component rtl fix arrow selector
|
2023-07-24 14:15:24 +03:00 |
|
|
124afc4a05
|
Web: Components: Fix 0 height scrollbar block in EmailChips
|
2023-07-21 17:15:33 +02:00 |
|
|
b41c5c278f
|
Web: Components: Add autohide ability to scrollbar
|
2023-07-21 15:57:56 +02:00 |
|
|
1aaa1666c7
|
Web: Components: Fix event touch error in rtl mode when clientX equals 0
|
2023-07-21 13:40:41 +02:00 |
|
|
bab27d2c2f
|
Web: Components: Fix TabsContainer primary tab position
|
2023-07-20 22:43:18 +02:00 |
|
|
bf24041594
|
Web: Components: Fix TabsContainer autoscrolling
|
2023-07-20 22:33:31 +02:00 |
|
|
490a438d83
|
Web: Components: Remove duplicate scroll padding setting
|
2023-07-20 21:51:31 +02:00 |
|
|
1e30e9e3e8
|
Web: Components: Change scrollbar (part 3)
|
2023-07-20 21:46:36 +02:00 |
|
|
e98f269776
|
Web: Components: Change scrollbar (part 2)
|
2023-07-20 18:33:34 +02:00 |
|
|
236a1d5221
|
Web: Components: Change scrollbar (part 1)
|
2023-07-20 16:53:59 +02:00 |
|
|
08f1149e66
|
Web: Components: install react-scrollbars-custom lib
|
2023-07-20 12:55:45 +02:00 |
|
|
f74e19d5e1
|
Web:Components:Slider: fix props
|
2023-07-19 18:38:23 +03:00 |
|
|
a2ddfb54f1
|
Web: Files: added LINKS_LIMIT_COUNT, fixed bugs
|
2023-07-19 16:43:21 +03:00 |
|
|
17be338ccf
|
Web: Files: fixed empty links context-menu
|
2023-07-19 15:24:05 +03:00 |
|
Vladimir Khvan
|
af744d3dff
|
Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room
|
2023-07-19 16:10:47 +05:00 |
|
Vladimir Khvan
|
1d342e6cfc
|
incorrect time reset was fixed
|
2023-07-19 16:10:17 +05:00 |
|
|
183fc90d99
|
Web: Files: fixed LimitTimeBlock
|
2023-07-19 14:03:12 +03:00 |
|
Vladimir Khvan
|
732f94560b
|
Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room
|
2023-07-19 15:51:58 +05:00 |
|
Vladimir Khvan
|
aa3fe0dc1d
|
wrong prop was substituted with initialTime
|
2023-07-19 15:50:43 +05:00 |
|