DmitrySychugov
|
1105568509
|
Merge branch 'develop' into feature/storybook-update
|
2023-05-31 18:20:37 +05:00 |
|
|
|
44d21119b1
|
Web:Client:Fix warning currentColorScheme.
|
2023-05-30 12:40:38 +03:00 |
|
|
|
fdcac6f4da
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-30 11:56:18 +04:00 |
|
|
|
a22dbea67f
|
Web: Client: Filter: Restored SSO filter after merge master
|
2023-05-29 14:49:08 +03: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 |
|
DmitrySychugov
|
1c257bc3bc
|
Merge branch 'develop' into feature/storybook-update
|
2023-05-26 19:46:23 +05:00 |
|
|
|
9599a68e2b
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-26 18:39:55 +04:00 |
|
Vlada Gazizova
|
e4d5442f76
|
Merge branch 'develop' into bugfix/fix-color-theme-import-cycle
|
2023-05-26 16:44:12 +03:00 |
|
|
|
8e5b341dc3
|
web: fix margin in third-party modal
|
2023-05-26 16:59:38 +04:00 |
|
|
|
1a2d5f3d5a
|
Web:Adding history for FloatingButton in the Components module.
|
2023-05-26 14:39:19 +03:00 |
|
Elyor Djalilov
|
ae8dece086
|
Fix Bug 62769 - Rooms.Files. An edit icon for a file that is available for viewing.
|
2023-05-26 14:32:31 +05:00 |
|
|
|
76493d1dc1
|
Web: Refactoring.
|
2023-05-26 10:50:32 +03:00 |
|
|
|
fd85996c72
|
Web: Fixed bug when going back through history to rooms.
|
2023-05-25 18:43:24 +03:00 |
|
|
|
ff5ad1c5e4
|
Web:Moved the FloatingButton component from the Common module to the Components module.
|
2023-05-25 16:36:54 +03:00 |
|
|
|
6e723a37a1
|
Web:Moved the Tags component from the Common module to the Components module.
|
2023-05-25 16:12:45 +03:00 |
|
|
|
e08f381074
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-25 15:29:21 +04:00 |
|
DmitrySychugov
|
153fa8f6d3
|
Web: row rename callback function
|
2023-05-25 14:58:22 +05:00 |
|
DmitrySychugov
|
b225abacc9
|
Web: snackbar rename callback function
|
2023-05-25 14:57:38 +05:00 |
|
|
|
c663949814
|
Web:Moved styles to one file StyledLoadingButton.
|
2023-05-25 12:44:08 +03:00 |
|
|
|
1166ec87c6
|
Web:Delete name portalTheme.
|
2023-05-25 12:07:03 +03:00 |
|
|
|
1ef9ad529c
|
Web: Changed adding a theme using a class, moved the picture to a component, removed it from Common.
|
2023-05-25 11:53:52 +03:00 |
|
|
|
b2a623a91e
|
Web: Moved StyledIcon to separate file.
|
2023-05-25 11:52:04 +03:00 |
|
|
|
7779ba638b
|
Merge branch 'develop' into bugfix/fix-color-theme-import-cycle
|
2023-05-24 19:47:22 +03:00 |
|
|
|
95c834ed6b
|
Web: Moving style components, adding a class to get rid of the import of components from the Common module in the ColorTheme components.
|
2023-05-24 18:30:20 +03:00 |
|
|
|
b72b96c8c9
|
Web: Replacing import "@docspace/common/components/ColorTheme" with "@docspace/components/ColorTheme".
|
2023-05-24 18:28:06 +03:00 |
|
|
|
3850b71db5
|
Web:Client:Add currentColorScheme in ThemeProvider.
|
2023-05-24 18:09:16 +03:00 |
|
|
|
a7fb914361
|
Merge pull request #1368 from ONLYOFFICE/bugfix/fix-three-line-comment
bugfix/fix-three-line-comment
|
2023-05-24 18:59:04 +04:00 |
|
|
|
95b3600408
|
Web:Client:Corrected fo react fragment.
|
2023-05-24 15:30:23 +03:00 |
|
|
|
87675e18ab
|
Web:Client:Removed props check in InfiniteGrid component.
|
2023-05-24 10:11:12 +03:00 |
|
|
|
62a29eccf9
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2023-05-23 18:10:58 +03:00 |
|
|
|
811ecf9f99
|
Web:Client:Fixed page crash in tile view, when deleting files, also when moving files and going to the folder where the files will be moved.
|
2023-05-23 18:09:48 +03:00 |
|
|
|
7285f6950b
|
Web: Fix static version crash in My Documents
|
2023-05-23 14:53:09 +04:00 |
|
Viktor Fomin
|
7c71076ec1
|
Fix Bug 62703: After moving/copying the list of files scrolls up
|
2023-05-23 12:55:17 +03:00 |
|
|
|
d9807ceff1
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2023-05-22 15:44:22 +03:00 |
|
|
|
811c6275c0
|
Web:Client:Fixed displaying EmptyContainer for a short time in the folder where files were moved or restored from the recycle bin because isEmptyFilesList becomes empty.
|
2023-05-22 15:43:18 +03:00 |
|
Mushka Nikita
|
c42d7c4315
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-22 13:39:54 +03:00 |
|
Mushka Nikita
|
191de3e991
|
added filter by room to trash
|
2023-05-22 12:27:09 +03:00 |
|
|
|
7afb752640
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-19 17:23:25 +03:00 |
|
|
|
8f1e35b818
|
added translations
|
2023-05-19 17:23:00 +03:00 |
|
Viktor Fomin
|
1c5537f57d
|
Fix Bug 62678: Sorting by name does not work when you click on name
|
2023-05-19 15:24:53 +03:00 |
|
Viktor Fomin
|
7b3d8f84c4
|
Client: Components: MainBar: fix style for huge mobile
|
2023-05-19 13:55:58 +03:00 |
|
Viktor Fomin
|
1e2b87cceb
|
Client: Components: MainBar: fix style
|
2023-05-19 13:46:40 +03:00 |
|
Akmal Isomadinov
|
ca151d51b1
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-18 18:23:46 +05:00 |
|
Akmal Isomadinov
|
7379dbe970
|
Web:MainButtonMobile Fixed count uploaded file and count
|
2023-05-18 18:23:26 +05:00 |
|
Viktor Fomin
|
b54b2ff3f0
|
Client: AccountsHome: deselect text by click
|
2023-05-18 16:18:43 +03:00 |
|
DmitrySychugov
|
88be362765
|
Merge branch 'develop' into feature/storybook-update
|
2023-05-18 18:07:39 +05:00 |
|
|
|
5da3700a2d
|
Web:Client:Added support for other browsers.
|
2023-05-18 12:19:57 +03:00 |
|
Viktor Fomin
|
e6e7d8a537
|
Client: Components: ItemIcon: disable user select
|
2023-05-17 21:37:13 +03:00 |
|
Viktor Fomin
|
57e7c81dd5
|
Client: Components: SelectionPanel: disable user select
|
2023-05-17 21:36:15 +03:00 |
|
Viktor Fomin
|
5e4058e9df
|
Client: Home: deselect text after unmount
|
2023-05-17 21:24:23 +03:00 |
|
