Mushka Nikita
|
d19c5cf810
|
added alert component
|
2023-06-06 03:54:33 +03:00 |
|
|
|
2dae5a3a4a
|
Merge branch 'develop' into feature/image-thumbnail
|
2023-06-02 13:16:21 +04:00 |
|
|
|
f8ba50e462
|
Merge branch 'develop' into feature/storybook-update
|
2023-06-02 11:41:42 +04:00 |
|
Timofey Boyko
|
a4f8687af9
|
Web:Client: add flag to enable or disable image thumbnails
|
2023-06-01 15:05:49 +03:00 |
|
|
|
bc8a9ca637
|
Merge branch 'develop' into feature/history-timeout
|
2023-06-01 15:56:03 +04:00 |
|
|
|
8bba856ec4
|
Merge branch 'develop' into feature/redirect-after-access-denied
# Conflicts:
# packages/client/src/pages/Home/index.js
# packages/client/src/routes/client.js
|
2023-06-01 14:41:43 +03:00 |
|
Timofey Boyko
|
6cb8a714b2
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-06-01 14:30:06 +03:00 |
|
DmitrySychugov
|
1105568509
|
Merge branch 'develop' into feature/storybook-update
|
2023-05-31 18:20:37 +05:00 |
|
Mushka Nikita
|
5e201b4414
|
Merge branch 'develop' into feature/history-timeout
|
2023-05-30 11:29:48 +03:00 |
|
|
|
fdcac6f4da
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-30 11:56:18 +04:00 |
|
|
|
20a4343e7c
|
Merge pull request #1444 from ONLYOFFICE/bugfix/fix-floating-button
bugfix/fix-floating-button
|
2023-05-30 11:52:35 +04:00 |
|
|
|
73e707a3f6
|
Web: Added check for filter instead of "instanceof".
|
2023-05-29 17:14:50 +03:00 |
|
|
|
1df9df59d6
|
Web:Common:Add showTwoProgress props.
|
2023-05-29 16:32:58 +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 |
|
|
|
1a2d5f3d5a
|
Web:Adding history for FloatingButton in the Components module.
|
2023-05-26 14:39:19 +03:00 |
|
Mushka Nikita
|
92f94e38af
|
Merge branch 'hotfix/v1.0.1' into feature/history-timeout
|
2023-05-26 14:29:28 +03:00 |
|
Mushka Nikita
|
19d5f0db38
|
removed suspense, update file/folder flicking fix
|
2023-05-26 14:29:07 +03:00 |
|
Mushka Nikita
|
6b2943da07
|
moved history instance to infoPanelStore, moved parseHistory to HistoryHelper, implemented useTransition, fixed file/folder flicking bug, removed timers
|
2023-05-26 14:28:53 +03:00 |
|
Mushka Nikita
|
96b3be2ac0
|
added AbortController to history
|
2023-05-26 14:28:23 +03:00 |
|
Mushka Nikita
|
dfccf6526e
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-26 13:57:58 +03:00 |
|
|
|
ff5ad1c5e4
|
Web:Moved the FloatingButton component from the Common module to the Components module.
|
2023-05-25 16:36:54 +03:00 |
|
|
|
e94962fa75
|
Merge branch 'bugfix/fix-color-theme-import-cycle' of github.com:ONLYOFFICE/AppServer into bugfix/fix-color-theme-import-cycle
|
2023-05-25 16:13:39 +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 |
|
|
|
c0e720bfc2
|
Merge branch 'develop' into bugfix/fix-color-theme-import-cycle
|
2023-05-25 13:47:04 +04:00 |
|
|
|
a75e919a6e
|
Web:Common:Delete StyledWrapper.
|
2023-05-25 12:02:05 +03:00 |
|
|
|
ae5b3667ac
|
Web:Moved LoginContainer to a separate file.
|
2023-05-25 12:00:05 +03:00 |
|
|
|
334da537a6
|
Web:Delete StyledCircleWrap.
|
2023-05-25 11:56:19 +03:00 |
|
|
|
7907e6563f
|
Web:Moved StyledCircleWrapFloatingButton to separate file.
|
2023-05-25 11:55:29 +03:00 |
|
|
|
bcf9c9c65f
|
Web:Moved StyledFilterBlockItemTag to separate file.
|
2023-05-25 11:54:48 +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 |
|
|
|
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 |
|
|
|
47fe313f9d
|
Web:Moving style components to colorTheme components to get rid of component imports from the Common module. Moving the colorTheme components to the Components module.
|
2023-05-24 18:21:37 +03:00 |
|
|
|
ff174d6b9c
|
Web:Common:Delete ColorTheme from Common.
|
2023-05-24 18:16:20 +03:00 |
|
|
|
47dc8b63fc
|
Web: Editor: Added new API method getProtectUsers
|
2023-05-22 22:42:13 +04:00 |
|
Viktor Fomin
|
e1dbfe08ca
|
Fix Bug 62130: If you set a filter with a very long tag, a horizontal scrollbar appears
|
2023-05-22 13:34:47 +03:00 |
|
Mushka Nikita
|
191de3e991
|
added filter by room to trash
|
2023-05-22 12:27:09 +03:00 |
|
|
|
0e047b71b6
|
Merge pull request #1421 from ONLYOFFICE/feature/pdf-viewer
Feature/pdf viewer
|
2023-05-19 18:42:35 +04:00 |
|
Akmal Isomadinov
|
4374c31d28
|
Web:Viewer Disabled text selection on the toolbar
|
2023-05-19 19:33:41 +05:00 |
|
Akmal Isomadinov
|
a345f4b4d0
|
Web:viewer Fixed error handler and refactoring
|
2023-05-19 14:38:13 +05:00 |
|
DmitrySychugov
|
88be362765
|
Merge branch 'develop' into feature/storybook-update
|
2023-05-18 18:07:39 +05:00 |
|
|
|
6e0cee2f74
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2023-05-18 15:40:58 +03:00 |
|
|
|
ccd5da84ce
|
Web:Common:Fixed when several file operations are running at the same time (deleting files and downloading) the floating download button ceases to be iterative, does not click.
|
2023-05-18 15:39:57 +03:00 |
|
Akmal Isomadinov
|
a5669a14eb
|
Web: Fixed upload indicator
|
2023-05-18 16:45:36 +05:00 |
|
Akmal Isomadinov
|
034a22a991
|
Web:Viewer Fixed pdf viewer crash after removed react-pdf
|
2023-05-17 20:01:13 +05:00 |
|
Akmal Isomadinov
|
b18d641331
|
Web Removed react-pdf
|
2023-05-17 19:47:47 +05:00 |
|
Akmal Isomadinov
|
68707b7489
|
Web:Viewer Text selection mode is enabled
|
2023-05-17 19:40:38 +05:00 |
|
