mushka
|
9de69a3ff6
|
some tweaks
|
2022-03-25 12:10:23 +03:00 |
|
mushka
|
cd82919062
|
merge with feature/virtual-rooms-1.2
|
2022-03-24 18:00:31 +03:00 |
|
mushka
|
1d80eb1a9d
|
refactored open/close behaviour + redesigned checkbox header
|
2022-03-24 17:57:36 +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 |
|
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 |
|
|
bce9e824c8
|
Web: Deleted useless code.
|
2022-03-15 08:13:23 +03:00 |
|
mushka
|
57f75cd8a5
|
merge with feature/virtual-rooms-1.2
|
2022-03-14 18:53:15 +03:00 |
|
mushka
|
25ad35ab6a
|
added Normal Touchscreen/Desktop differentiation
|
2022-03-11 13:41:48 +03:00 |
|
Timofey Boyko
|
3ae4b92ad7
|
Web:Common: moved out catalog from page layout and refactoring page layout
|
2022-03-11 11:04:09 +03:00 |
|
mushka
|
c3c59ceaff
|
changed size names in app buttons
|
2022-03-10 15:59:04 +03:00 |
|
Timofey Boyko
|
eb11e51576
|
Web:Common: enable add button when navigation is open
|
2022-03-10 14:00:15 +03:00 |
|
Timofey Boyko
|
cdda6f3d73
|
Web:Common:NewFilterInput: add support i18next for 'AddFilter' button
|
2022-03-05 19:12:48 +03:00 |
|
Timofey Boyko
|
32a7a41f87
|
Web:Files: add support i18next for 'view'
|
2022-03-05 19:04:53 +03:00 |
|
Timofey Boyko
|
8c95b9bd92
|
Web:Common:PageLayout: fix catalog position on mobile devices
|
2022-03-05 16:56:24 +03:00 |
|
mushka
|
384a92c30f
|
finished merging
|
2022-03-04 12:52:34 +03:00 |
|
Timofey Boyko
|
35302c22a2
|
Web:Common:Components: fix key error for sort button
|
2022-03-03 16:46:45 +03:00 |
|
Timofey Boyko
|
61a1a7fbd3
|
Web:Files:Filter: disable sort in recent and favorites folder
|
2022-03-03 16:25:34 +03:00 |
|
mushka
|
bb69417dbf
|
fix kafka code formatting and ContextMenu - InfoPanel layering interaction
|
2022-03-03 16:23:45 +03:00 |
|
Timofey Boyko
|
0743c5bf83
|
Web:Files:Filter: disable sort in recent and favorites folder
|
2022-03-03 16:10:03 +03:00 |
|
mushka
|
807fe75b72
|
change code formatting 3
|
2022-03-03 14:25:10 +03:00 |
|