mushka
|
b0dd8d1077
|
fixed content gaps and deleted loaders
|
2022-03-25 18:58:07 +03:00 |
|
mushka
|
fcff7d4354
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-03-25 16:20:48 +03:00 |
|
mushka
|
9de69a3ff6
|
some tweaks
|
2022-03-25 12:10:23 +03:00 |
|
Timofey Boyko
|
fe3f9b59e8
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-25 10:11:00 +03:00 |
|
Timofey Boyko
|
e8ee2c1fa4
|
Web:Common:AdvancedSelector: add auto-select group header for group selector
|
2022-03-25 10:06:39 +03:00 |
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
mushka
|
cd82919062
|
merge with feature/virtual-rooms-1.2
|
2022-03-24 18:00:31 +03:00 |
|
Timofey Boyko
|
bb5c1f2cf9
|
Web:Common:AdvancedSelector: fix display
|
2022-03-24 18:00:18 +03:00 |
|
mushka
|
1d80eb1a9d
|
refactored open/close behaviour + redesigned checkbox header
|
2022-03-24 17:57:36 +03:00 |
|
Timofey Boyko
|
6a9806117b
|
Web:Common:AdvancedSelector: fix bugs with re-render list, add onSelectAll function, move to functional components renders option and group list, create group header component, change props isChecked and isIndeterminate for groups, fix default styles for advanced selector with aside view
|
2022-03-24 17:52:21 +03:00 |
|
|
9174a20871
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/api/portal/index.js
# packages/asc-web-common/components/Loaders/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/file-input/index.js
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/save-cancel-buttons/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/store/ContextOptionsStore.js
# public/locales/de/Common.json
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
# web/ASC.Web.Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2022-03-24 14:39:52 +03:00 |
|
Timofey Boyko
|
b67fedc538
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-23 14:32:35 +03:00 |
|
Timofey Boyko
|
60cee8e7c9
|
Web:Common:AdvancedSelector: fix padding right and show scroll for big options list
|
2022-03-23 11:44:29 +03:00 |
|
Timofey Boyko
|
57ec3f4e34
|
Web:Common:AdvancedSelector: refactoring and remove useless code
|
2022-03-23 11:18:59 +03:00 |
|
Timofey Boyko
|
f410b195dc
|
Web:Common: move renderOption and renderGroup function to functional component
|
2022-03-23 10:35:57 +03:00 |
|
Timofey Boyko
|
4396906827
|
Web:Common: remove useless code from AdvancedSelector
|
2022-03-22 18:22:31 +03:00 |
|
Timofey Boyko
|
9ea4e02914
|
Web:Common: create header component of advanced selector
|
2022-03-22 18:21:43 +03:00 |
|
Timofey Boyko
|
84d137730c
|
Web:Common: remove useless code
|
2022-03-22 18:18:09 +03:00 |
|
Timofey Boyko
|
d23ef4baaa
|
Web:Common: create Search component and move SearchInput from selector
|
2022-03-22 18:17:50 +03:00 |
|
mushka
|
bd20587a2b
|
fixed context menu and added first-close-disable interaction
|
2022-03-22 14:59:34 +03:00 |
|
|
f9f3eedf7d
|
Web:Components:Added className "settings-mobile" StyledSpacer.
|
2022-03-22 13:50:52 +03:00 |
|
|
62afb4800a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-22 13:46:03 +03:00 |
|
|
e4253bc3ce
|
Web:Common:Added className "settings-mobile" to StyledSpacer.
|
2022-03-22 13:26:35 +03:00 |
|
mushka
|
c4b470f98a
|
bugfixes
|
2022-03-21 18:42:23 +03:00 |
|
|
1219f9de38
|
Web: Common: FloatingButton: fix style
|
2022-03-21 18:34:09 +03:00 |
|
Timofey Boyko
|
8355fa388d
|
Web:Common: remove old filter component, update import and change themes
|
2022-03-21 13:56:42 +03:00 |
|
Timofey Boyko
|
a73a6b8bc7
|
Web:Common: fix padding of section-wrapper-content for row/table view
|
2022-03-21 13:39:05 +03:00 |
|
mushka
|
f659632108
|
fixed exception warning
|
2022-03-21 13:12:45 +03:00 |
|
Timofey Boyko
|
133dfa3426
|
Web: fix article main button view (now correct display mobile main button when view port is increased/decreased)
|
2022-03-21 11:40:40 +03:00 |
|
mushka
|
61aac91d07
|
fix arrow keys not working with showCurrentFolder === true
|
2022-03-21 11:28:40 +03:00 |
|
mushka
|
c51d920092
|
vr-1.2 actualization
|
2022-03-21 11:13:56 +03:00 |
|
mushka
|
3e951462d8
|
fixes with unexpcted info loading
|
2022-03-21 10:24:43 +03:00 |
|
Timofey Boyko
|
a72ca37013
|
Web:Common: fix article header margin-left
|
2022-03-18 13:00:38 +03:00 |
|
Timofey Boyko
|
cc7bba5635
|
Web:Common: fix article header margin-left
|
2022-03-18 12:58:34 +03:00 |
|
Timofey Boyko
|
d7ec8b7540
|
Web:Common: fix article main button padding and margin
|
2022-03-18 12:39:30 +03:00 |
|
Timofey Boyko
|
27fab6de23
|
Merge branch 'feature/virtual-rooms-1.2' into feature/refactoring-pagelayout
|
2022-03-18 11:05:58 +03:00 |
|
|
7f019492b4
|
Web: Common: Fixed color of border-bottom of people selector.
|
2022-03-18 10:33:58 +03:00 |
|
Timofey Boyko
|
24c20b3e5f
|
Web:Common: fix article header component padding bottom
|
2022-03-17 18:00:03 +03:00 |
|
Timofey Boyko
|
01f5f85966
|
Web:Common: fix article header loader padding
|
2022-03-17 17:59:36 +03:00 |
|
mushka
|
2d452e18da
|
fixed after-merge room-info button deletion and configured new showCurrentFolderInfo feature
|
2022-03-17 17:16:21 +03:00 |
|
Timofey Boyko
|
42e68a65b3
|
Web:Common: fix width article header for mobile devices
|
2022-03-17 16:18:47 +03:00 |
|
|
fd8567fd17
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-17 15:31:26 +03:00 |
|
|
5e5b7c3d3e
|
Web: Common: FilterInput: fix button size
|
2022-03-17 15:04:27 +03:00 |
|
Timofey Boyko
|
5df365a59a
|
Web:Common: rename page layout component to section component and update stories, readme and sub-components
|
2022-03-16 15:22:48 +03:00 |
|
|
0cd4cb49ed
|
Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/themes/dark.js
# public/locales/de/Common.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Login/src/Login.jsx
|
2022-03-16 11:03:07 +03:00 |
|
Timofey Boyko
|
b4709b87a2
|
Web:Common:Loaders: update article loaders
|
2022-03-15 17:41:37 +03:00 |
|
Timofey Boyko
|
bd85e558dc
|
Web:Common: rename 'catalog' to 'article' and update exports
|
2022-03-15 17:18:07 +03:00 |
|
Timofey Boyko
|
87bd5b9c29
|
Web:Common:Loaders: fix width for catalog loaders for people
|
2022-03-15 14:20:43 +03:00 |
|
|
cc293f60c2
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-03-15 14:11:00 +03:00 |
|
|
a61ba5697c
|
Web: Common: Added constants.
|
2022-03-15 12:14:41 +03:00 |
|