Commit Graph

8666 Commits

Author SHA1 Message Date
Timofey Boyko
cd2bb74012 Web:Studio:Shell: fix render banner when module changed 2022-04-01 17:56:08 +03:00
Timofey Boyko
f4bafb03a0 Web:Studio: fix scroll page over 100vh 2022-04-01 17:24:56 +03:00
Timofey Boyko
b105a92239 Web:Studio: delete useless code from layout component 2022-04-01 12:39:33 +03:00
Timofey Boyko
3b2ead5568 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-30 18:17:50 +03:00
5a5b388e0f Web: Client: fixed skip maintenance render 2022-03-30 17:40:40 +05:00
00e9176dbf Web: Login: Added new test: Test fix wrong login 2022-03-30 15:04:17 +03:00
d6659bb206 Web: Login: fix login after correction input 2022-03-30 14:22:29 +03:00
Timofey Boyko
bf87c78046 Web:Studio: change position nav menu 2022-03-30 11:34:51 +03:00
3558dde0a2 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-29 22:35:14 +03:00
f7e95db28f Web:Studio:Added mock timezones data. 2022-03-29 22:33:30 +03:00
9fdddf09ea Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-29 22:02:30 +03:00
ab05212f59 Web:Studio:Added Change language and Change time zone tests. 2022-03-29 21:45:21 +03:00
357bfc216f Merge branch 'feature/virtual-rooms-1.2' of https://github.com/ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-29 11:52:43 +03:00
Timofey Boyko
a38283c33f Web:Client: remove page scrolling for tablet devices and move it to section 2022-03-29 10:34:43 +03:00
0efe18f99f Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-28 22:26:23 +03:00
0bc5bc13f6 Web:Studio:Moved the checkScrollSettingsBlock function to a separate utils.js file. 2022-03-28 22:24:21 +03:00
fe65e040cb Web:Studio:Refactoring of the Customization component. Added SettingsPageLayout, SettingsPageMobileView components. 2022-03-28 22:22:29 +03:00
1b6a7ab2ba Web:Studio:Added SettingsPageLayout, SettingsPageMobileView components. 2022-03-28 22:18:16 +03:00
51039fa773 Web:Studio:Removed CustomizationNavbar component. 2022-03-28 22:16:36 +03:00
2112d4d02a Web:Studio:Created a settingsCustomization folder. Moved the CustomTitles, LanguageAndTimeZone, PortalRenaming components there. 2022-03-28 22:15:41 +03:00
66c5d14883 Web:Studio:Added isMobileViewLanguageTimeSettings to LanguageAndTimeZone component. Added the checkScrollSettingsBlock function to the LanguageAndTimeZone component. 2022-03-28 22:14:34 +03:00
c0251f71f3 Web: Client: Home: fix tiles align 2022-03-28 18:21:17 +03:00
cbfbc4faae Web: Login: fix warning 2022-03-28 18:09:08 +03:00
d6aaabdd34 Web: Client: removed commented code 2022-03-28 17:39:59 +05:00
bd6753df91 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-28 14:17:59 +03:00
fc68063599 Web: Client: fixed margin top in home page 2022-03-28 14:26:58 +05:00
9264302ec4 Thumbnail: async operations. Changed thumbnails format requested from editors to jpg. 1879 issue 2022-03-28 11:38:50 +03:00
7abe990d96 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-28 12:36:11 +05:00
7cb19512bb Web:Studio:Removed redundant content. 2022-03-25 11:07:33 +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
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
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
2bd421994e Web: Fixed import. 2022-03-24 13:26:20 +03:00
f464eb6e35 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-24 12:08:58 +05: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
643bf726b3 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-23 16:10:11 +05: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
c0fc2eafd0 Web: Client: Confirm: hide qr code on tablet/mobile 2022-03-23 11:43:25 +03:00