|
|
831f70f817
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-24 21:06:02 +03:00 |
|
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
|
|
01e283d2cc
|
Web: Fix Wizard opening
|
2022-03-24 20:54:35 +03:00 |
|
|
|
ec215d8e93
|
Web:Studio:Refactoring the Customization component.
Added to state heightSettingsBlock, heightScrollBody. Refactoring the checkHeightSettingsBlock function.
|
2022-03-24 20:50:01 +03:00 |
|
|
|
53feaa5a33
|
Web:Components:Styling SaveCancelButtons.
|
2022-03-24 20:47:22 +03:00 |
|
|
|
f8fce82bdd
|
Web:Components:Removed props hasChanged.
|
2022-03-24 20:46:53 +03:00 |
|
Timofey Boyko
|
bb5c1f2cf9
|
Web:Common:AdvancedSelector: fix display
|
2022-03-24 18:00:18 +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 |
|
|
|
e61a45436d
|
Merge pull request #585 from ONLYOFFICE/feature/backup
Feature/backup
|
2022-03-24 13:49:51 +03:00 |
|
|
|
73928303cf
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2022-03-24 13:26:28 +03:00 |
|
|
|
2bd421994e
|
Web: Fixed import.
|
2022-03-24 13:26:20 +03:00 |
|
|
|
9d838b265d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-23 22:12:59 +03:00 |
|
|
|
c00cbf667d
|
Web:Studio:Refactoring the LanguageAndTimeZone component.
|
2022-03-23 22:12:19 +03:00 |
|
|
|
c3af9b1998
|
Web:Studio:Refactoring the Customization component.
|
2022-03-23 22:11:15 +03:00 |
|
|
|
9660b325e9
|
Web:Components:Styling CustomizationNavbar.
|
2022-03-23 22:10:19 +03:00 |
|
|
|
0fcd1eca29
|
Web:Components:Styling SaveCancelButtons.
|
2022-03-23 22:10:01 +03:00 |
|
|
|
d7775bffa7
|
Web:Components:Removed sectionWidth.
|
2022-03-23 22:09:48 +03:00 |
|
|
|
a13d1ccf3b
|
Merge branch 'develop' into feature/backup
|
2022-03-23 18:12:01 +03:00 |
|
|
|
ff54e42a27
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-03-23 17:59:05 +03:00 |
|
|
|
cee4ca3a4e
|
Files: fix recent
|
2022-03-23 14:53:49 +03:00 |
|
|
|
75eb820b68
|
Merge pull request #574 from ONLYOFFICE/feature/confirm-test
Feature/confirm test
|
2022-03-23 14:39:54 +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 |
|
|
|
cc5e397a9c
|
Web: Client: Tests: update screenshots
|
2022-03-23 12:21:28 +03:00 |
|
|
|
4840745843
|
Web: Client: Tests: add fake qr image
|
2022-03-23 11:54:01 +03:00 |
|
|
|
d8bfe32537
|
Web: Client: Confirm: fix inputWidth
|
2022-03-23 11:46:57 +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 |
|
|
|
c0fc2eafd0
|
Web: Client: Confirm: hide qr code on tablet/mobile
|
2022-03-23 11:43:25 +03:00 |
|
|
|
4eb25bcab5
|
Web: Client: Confirm: fix withLoader
|
2022-03-23 11:39:07 +03:00 |
|
Timofey Boyko
|
57ec3f4e34
|
Web:Common:AdvancedSelector: refactoring and remove useless code
|
2022-03-23 11:18:59 +03:00 |
|
|
|
07e3e7b1b2
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-test
|
2022-03-23 10:54:23 +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
|
f021fd06b9
|
Web:Components: wrap checkbox component in react.memo
|
2022-03-23 10:35:15 +03:00 |
|
Timofey Boyko
|
48f80742c4
|
Web:Components: wrap text component in react.memo
|
2022-03-23 10:35:01 +03:00 |
|
|
|
e05b78bef4
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-22 21:18:27 +03:00 |
|
|
|
702c140560
|
Web:Components:Styling SaveCancelButtons.
|
2022-03-22 21:18:11 +03:00 |
|
|
|
626988a987
|
Web:Studio:Scrollbar styling.
|
2022-03-22 21:17:30 +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 |
|
|
|
51b44186a8
|
Web: Client: About: fix personal logo color
|
2022-03-22 18:00:09 +03:00 |
|
|
|
33ae3ba6c5
|
Web: Components: Themes: add personal logo color
|
2022-03-22 17:59:45 +03:00 |
|
|
|
a2ad2b450f
|
Web: Components: CampaignsBanner: fix style
|
2022-03-22 17:43:28 +03:00 |
|
|
|
4bc1689a5f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-22 17:20:01 +03:00 |
|
|
|
0ff67e1f92
|
Web: Files: Article: fix crash on personal
|
2022-03-22 17:19:52 +03:00 |
|
|
|
64cd23a7bf
|
Files: fix download as
|
2022-03-22 16:54:54 +03:00 |
|
|
|
f9f3eedf7d
|
Web:Components:Added className "settings-mobile" StyledSpacer.
|
2022-03-22 13:50:52 +03:00 |
|
Timofey Boyko
|
1e1e57cf91
|
Web:Components: add memo for heading component
|
2022-03-22 13:46:42 +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 |
|
