Timofey Boyko
|
a4f8687af9
|
Web:Client: add flag to enable or disable image thumbnails
|
2023-06-01 15:05:49 +03:00 |
|
Timofey Boyko
|
6cb8a714b2
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-06-01 14:30:06 +03:00 |
|
|
|
4549abad2f
|
Merge branch 'develop' into feature/filling-status-line
|
2023-05-30 15:18:14 +04:00 |
|
|
|
44d21119b1
|
Web:Client:Fix warning currentColorScheme.
|
2023-05-30 12:40:38 +03:00 |
|
|
|
4214470b2c
|
Merge branch 'develop' into feature/filling-status-line
|
2023-05-30 13:16:26 +04: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 |
|
|
|
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 |
|
|
|
2e76723f1f
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-26 18:58:33 +04:00 |
|
|
|
80a8a983aa
|
Fix undefined selectedItemTag
|
2023-05-26 18:58:11 +04: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 |
|
|
|
d0eae2dac2
|
Web:Components:Add currentColorScheme in readme.
|
2023-05-26 16:42:32 +03:00 |
|
|
|
c5b2a6ed47
|
Web:Fix name.
|
2023-05-26 16:40:38 +03:00 |
|
|
|
d37f9f7d16
|
Web:Added an example of a color theme for the story.
|
2023-05-26 16:38:41 +03:00 |
|
|
|
8e5b341dc3
|
web: fix margin in third-party modal
|
2023-05-26 16:59:38 +04:00 |
|
Subhonbek
|
f996a162ac
|
fix badge
|
2023-05-26 15:42:30 +03:00 |
|
Subhonbek
|
f33cf6015d
|
fix bg
|
2023-05-26 15:26:31 +03:00 |
|
Subhonbek
|
0ee45ec52f
|
fix line-height
|
2023-05-26 14:59:22 +03:00 |
|
|
|
1a2d5f3d5a
|
Web:Adding history for FloatingButton in the Components module.
|
2023-05-26 14:39:19 +03:00 |
|
Subhonbek
|
0d61a10a8d
|
fix border
|
2023-05-26 14:28:50 +03:00 |
|
Subhonbek
|
29b255f257
|
del padding
|
2023-05-26 13:41:39 +03:00 |
|
Subhonbek
|
cfebcd0dab
|
Merge branch 'develop' into feature/type-badge
|
2023-05-26 13:39:35 +03:00 |
|
|
|
b4615ff33b
|
Web:Components:Add PropTypes, stories for tags components.
|
2023-05-26 13:34:22 +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 |
|
Subhonbek
|
a542e89576
|
fix height
|
2023-05-26 11:51:29 +03:00 |
|
|
|
a1392f94df
|
Web:Components:Changed the file to mdx extension.
|
2023-05-26 11:26:37 +03: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 |
|
|
|
e4f9e1fe5c
|
Web:Components:Fix import FloatingButton.
|
2023-05-25 16:46:08 +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 |
|
Subhonbek
|
35a3898ed3
|
fix padding badge
|
2023-05-25 14:19:03 +03:00 |
|
|
|
c0e720bfc2
|
Merge branch 'develop' into bugfix/fix-color-theme-import-cycle
|
2023-05-25 13:47:04 +04:00 |
|
Elyor Djalilov
|
b5f0b25515
|
Web: Components: filling-status-line
|
2023-05-25 14:44:37 +05:00 |
|
|
|
c663949814
|
Web:Moved styles to one file StyledLoadingButton.
|
2023-05-25 12:44:08 +03:00 |
|
|
|
599f36867f
|
Merge pull request #1431 from ONLYOFFICE/features/ProtectUsers
add ProtectUsers in EditorController
|
2023-05-25 13:38:26 +04:00 |
|
|
|
e9fb560511
|
Web: Editor: Fix display list of protected users
|
2023-05-25 13:36:39 +04:00 |
|
|
|
1166ec87c6
|
Web:Delete name portalTheme.
|
2023-05-25 12:07:03 +03:00 |
|
|
|
a75e919a6e
|
Web:Common:Delete StyledWrapper.
|
2023-05-25 12:02:05 +03:00 |
|
|
|
3bd4a18f6b
|
Web:Components:Moved StyledPreparationPortalProgress to a separate file.
|
2023-05-25 12:01:50 +03:00 |
|
|
|
2388213fba
|
Web:Components:Moved StyledCircleWrapLoadingButton to a separate file.
|
2023-05-25 12:01:27 +03:00 |
|
|
|
ae5b3667ac
|
Web:Moved LoginContainer to a separate file.
|
2023-05-25 12:00:05 +03:00 |
|
|
|
51500850ae
|
Web:Components:Moved StyledInfoPanelToggleWrapper to a separate file.
|
2023-05-25 11:59:09 +03:00 |
|
|
|
e9a26b813c
|
Web: Editor: Fix setup usersInRoom
|
2023-05-25 12:59:06 +04:00 |
|
