Commit Graph

18178 Commits

Author SHA1 Message Date
Timofey Boyko
d02b67e41f Web:Files:Settings: fix content-width for conntected clouds settings 2022-03-28 12:36:23 +03:00
Timofey Boyko
4161b16817 Web:Files:Settings: fix horizontal scroll of tabs when settings is mount 2022-03-28 12:21:25 +03:00
Timofey Boyko
bdea1715a4 Web:Files:Settings: fix content-width 2022-03-28 11:58:57 +03:00
Timofey Boyko
b13336a8be Web:Files:Settings: fix bug when forcesave show old value 2022-03-28 11:51:54 +03:00
Timofey Boyko
66bb0df3a5 Web:Files:Settings: fix bugs when storeForcesave show old value 2022-03-28 11:48:54 +03:00
Timofey Boyko
d2e192d048 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-28 11:15:47 +03:00
Timofey Boyko
2e1055c1f6 Web:Components:Themes: change hover color of tabs container in base theme 2022-03-28 11:15:24 +03:00
Timofey Boyko
e2fa31d9a4 Web:Files:Settings: add tabs for page; move AdminSettings, CommonSettings to functional components; move StyledSettings to separate file 2022-03-28 11:14:31 +03:00
Timofey Boyko
a9c3d66f0d Web:Files:Article: disable mobile main button for settings page 2022-03-28 11:12:15 +03:00
Timofey Boyko
fe34571a8b Web:Components:TabsContainer: update component when length of elements changed 2022-03-28 11:11:27 +03:00
Timofey Boyko
3418cb1ca7 Web:Files: add new keys 'Admin' and 'Common' for settings of eu and ru locales 2022-03-28 11:10:22 +03:00
1a8ee8c78b Web: Components: Themes: fix slider margin 2022-03-26 15:20:43 +03:00
31c37dfc46 Web: Files: Tile: fix checked style 2022-03-26 15:05:56 +03:00
bbd199bf6d Web: Files: DownloadAppList: use theme 2022-03-26 13:59:22 +03:00
35114d973d Web: Components: Themes: add colors for downloadAppList 2022-03-26 13:58:50 +03:00
7cb19512bb Web:Studio:Removed redundant content. 2022-03-25 11:07:33 +03:00
95f841369b Web:Components:Added theme for unsaved-changes. 2022-03-25 11:06:57 +03:00
68b5a46647 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-25 10:47:48 +03:00
f5b7efe5d7 Web:Studio:Fix styles. 2022-03-25 10:39:27 +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
bc68ffe870 Web:Studio: fixed selected options of group and people selector, fix bugs with display admin selector 2022-03-25 10:10:49 +03:00
Timofey Boyko
7248641545 Web:People: fixed selected options of group and people selector 2022-03-25 10:10:17 +03:00
Timofey Boyko
5fea741e80 Web:People:Components: add 'total' property to state and add it to advanced selector 2022-03-25 10:09:39 +03:00
Timofey Boyko
9c331af8dd Web:People:Components: change getting selected options from state to props 2022-03-25 10:08:53 +03:00
Timofey Boyko
7f6461e3b9 Web:Files:Panels: add selected options for group and people selector 2022-03-25 10:07:17 +03:00
Timofey Boyko
e8ee2c1fa4 Web:Common:AdvancedSelector: add auto-select group header for group selector 2022-03-25 10:06:39 +03:00
72fdbe5295 Web:Studio:Fix functions checkInnerWidth and checkHeightSettingsBlock. 2022-03-25 00:56:05 +03:00
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